diff --git a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml index 53bd2e917..2b609448f 100644 --- a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml +++ b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml @@ -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 diff --git a/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml index 5e33cb87d..0528e0874 100644 --- a/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml +++ b/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml @@ -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 diff --git a/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml index fc8174412..456e69722 100644 --- a/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml +++ b/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml @@ -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 diff --git a/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml index 326b2a11c..cc2738b26 100644 --- a/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml +++ b/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml @@ -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: diff --git a/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml index 87a7c89ac..93bebe26c 100644 --- a/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml +++ b/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml @@ -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: diff --git a/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml index 1f8c57025..6a1429f00 100644 --- a/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml +++ b/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml @@ -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 + 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: diff --git a/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml index c01cbe666..b8bc57700 100644 --- a/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml +++ b/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml @@ -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 + 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: diff --git a/.github/tests/forks/fork11.yml b/.github/tests/forks/fork11.yml index 548143d99..1d0f69895 100644 --- a/.github/tests/forks/fork11.yml +++ b/.github/tests/forks/fork11.yml @@ -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 diff --git a/.github/tests/forks/fork12.yml b/.github/tests/forks/fork12.yml index a92216a95..7c2c824aa 100644 --- a/.github/tests/forks/fork12.yml +++ b/.github/tests/forks/fork12.yml @@ -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 diff --git a/.github/tests/forks/fork13.yml b/.github/tests/forks/fork13.yml index 10db59666..e473371b8 100644 --- a/.github/tests/forks/fork13.yml +++ b/.github/tests/forks/fork13.yml @@ -6,7 +6,7 @@ args: zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC1-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 diff --git a/.gitignore b/.gitignore index 59b0c14b8..d3d4a7ddb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ node_modules/ temp_dir/ package-lock.json package.json + +# prod values +*secret* \ No newline at end of file diff --git a/CDK_VERSION_MATRIX.MD b/CDK_VERSION_MATRIX.MD index f7293eb25..1f514843d 100644 --- a/CDK_VERSION_MATRIX.MD +++ b/CDK_VERSION_MATRIX.MD @@ -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-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.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) diff --git a/input_parser.star b/input_parser.star index 044664d02..da7aec5dd 100644 --- a/input_parser.star +++ b/input_parser.star @@ -31,7 +31,7 @@ DEFAULT_DEPLOYMENT_STAGES = { DEFAULT_IMAGES = { "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.5", # https://github.com/agglayer/agglayer/pkgs/container/agglayer-rs "cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.1.2", # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags - "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.4.0-beta5", # https://github.com/0xpolygon/cdk/pkgs/container/cdk + "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.4.0-beta8", # https://github.com/0xpolygon/cdk/pkgs/container/cdk "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk", # https://hub.docker.com/r/0xpolygon/cdk-validium-node/tags "zkevm_bridge_proxy_image": "haproxy:3.0-bookworm", # https://hub.docker.com/_/haproxy/tags "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1", # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags diff --git a/templates/cdk-erigon/config.yml b/templates/cdk-erigon/config.yml index 765e60b77..0506afc53 100644 --- a/templates/cdk-erigon/config.yml +++ b/templates/cdk-erigon/config.yml @@ -505,9 +505,9 @@ zkevm.l2-datastreamer-url: {{.zkevm_datastreamer_url}} # Maximum time to wait for data from the datastreamer before reporting an error. # Balances between allowing for network delays and detecting genuine connection issues. -# Set to 0s to disable the timeout check (not recommended for production use). +# Any setting below 500ms will be adjusted to 3s. # Default: 0s -zkevm.l2-datastreamer-timeout: 5s +zkevm.l2-datastreamer-timeout: 0s # --------------------------------------------------------------------------------------------------