Skip to content

Commit

Permalink
Merge pull request #377 from 0xPolygon/jhilliard/beta8-bump
Browse files Browse the repository at this point in the history 
Bumping to latest beta versions
  • Loading branch information
@praetoriansentry
praetoriansentry authored Nov 12, 2024
2 parents 8e5c49b + 1b08059 commit 346ee72
Show file tree
Hide file tree
Showing 18 changed files with 370 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork11-new-cdk-stack-rollup.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
additional_services:
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork12-new-cdk-stack-rollup.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
additional_services:
Expand Down
4 changes: 2 additions & 2 deletions .github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC1-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta4
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
additional_services:
Expand Down
4 changes: 2 additions & 2 deletions .github/tests/combinations/fork13-new-cdk-stack-rollup.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC1-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta4
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
additional_services:
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork11.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8

# https://hub.docker.com/r/hermeznetwork/zkevm-node/tags?name=fork11
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork12.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8

# https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
Expand Down
4 changes: 2 additions & 2 deletions .github/tests/forks/fork13.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13

# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v8
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC1-fork.13
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta4
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8

# https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ node_modules/
temp_dir/
package-lock.json
package.json

# prod values
*secret*
6 changes: 3 additions & 3 deletions CDK_VERSION_MATRIX.MD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Which versions of the CDK stack are meant to work together?

Fork ID|CDK Erigon|ZkEVM Prover|ZkEVM Contracts|Data Availability|Bridge
---|---|---|---|---|---
13|[v2.60.0-beta4](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta4)|[v9.0.0-RC1-fork.13](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v9.0.0-RC1)|[v8.1.0-rc.1-fork.13](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.1.0-rc.1-fork.13)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
12|[v2.1.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.1.2)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-rc.4-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-rc.4-fork.12)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
11|[v2.1.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.1.2)|[v7.0.4-fork.11](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v7.0.4)|[v7.0.0-rc.2-fork.11](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v7.0.0-rc.2-fork.11)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
13|[v2.60.0-beta8](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta8)|[v9.0.0-RC2-fork.13](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v9.0.0-RC2)|[v8.1.0-rc.1-fork.13](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.1.0-rc.1-fork.13)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
12|[v2.60.0-beta8](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta8)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-rc.4-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-rc.4-fork.12)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
11|[v2.60.0-beta8](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta8)|[v7.0.4-fork.11](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v7.0.4)|[v7.0.0-rc.2-fork.11](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v7.0.0-rc.2-fork.11)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
9|[v2.1.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.1.2)|[v6.0.8](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v6.0.8)|[v6.0.0-rc.1-fork.9](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v6.0.0-rc.1-fork.9)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
Loading

0 comments on commit 346ee72

Please sign in to comment.