diff --git a/cdk-erigon-sequencer-params.yml b/cdk-erigon-sequencer-params.yml index eea40fd4d..23b84be61 100644 --- a/cdk-erigon-sequencer-params.yml +++ b/cdk-erigon-sequencer-params.yml @@ -50,7 +50,7 @@ args: data_availability_mode: cdk-validium # Docker images and repositories used to spin up services. - zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.3-RC9 + zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.3-RC18 # zkevm_prover_image: hermeznetwork/zkevm-prover:v4.0.19 zkevm_node_image: hermeznetwork/zkevm-node:v0.6.7 cdk_node_image: ghcr.io/0xpolygon/cdk:0.0.8 @@ -62,7 +62,7 @@ args: # zkevm_agglayer_image: 0xpolygon/agglayer:0.1.3 zkevm_agglayer_image: ghcr.io/agglayer/agglayer-rs:main zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.4.2 - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v1.1.5.9 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:2.0.0-beta13 panoptichain_image: minhdvu/panoptichain zkevm_bridge_ui_image: leovct/zkevm-bridge-ui:multi-network zkevm_bridge_proxy_image: haproxy:2.9.7 diff --git a/main.star b/main.star index ac3500e78..3b5d11e8a 100644 --- a/main.star +++ b/main.star @@ -109,6 +109,13 @@ def run( else: plan.print("Skipping the deployment of cdk-erigon sequencer") + # Deploy cdk-erigon node. + if deploy_cdk_erigon_node: + plan.print("Deploying cdk-erigon node") + cdk_erigon_package.run_rpc(plan, args) + else: + plan.print("Skipping the deployment of cdk-erigon node") + plan.print("Deploying cdk central/trusted environment") central_environment_args = dict(args) central_environment_args["genesis_artifact"] = genesis_artifact @@ -118,13 +125,6 @@ def run( else: plan.print("Skipping the deployment of cdk central/trusted environment") - # Deploy cdk-erigon node. - if deploy_cdk_erigon_node: - plan.print("Deploying cdk-erigon node") - cdk_erigon_package.run_rpc(plan, args) - else: - plan.print("Skipping the deployment of cdk-erigon node") - # Deploy cdk/bridge infrastructure. if deploy_cdk_bridge_infra: plan.print("Deploying cdk/bridge infrastructure") diff --git a/templates/cdk-erigon/config-sequencer.yaml b/templates/cdk-erigon/config-sequencer.yaml index 20e91bc31..afe3e0fdb 100644 --- a/templates/cdk-erigon/config-sequencer.yaml +++ b/templates/cdk-erigon/config-sequencer.yaml @@ -23,7 +23,7 @@ zkevm.rpc-ratelimit: 250 txpool.disable: false torrent.port: 42070 zkevm.datastream-version: 2 -zkevm.sequencer-initial-fork-id: 9 +# zkevm.sequencer-initial-fork-id: 9 # zkevm.executor-urls: "zkevm-prover{{.deployment_suffix}}:{{.zkevm_executor_port}}" externalcl: true diff --git a/templates/trusted-node/cdk-node-config.toml b/templates/trusted-node/cdk-node-config.toml index bf0b91f76..dfee685e2 100644 --- a/templates/trusted-node/cdk-node-config.toml +++ b/templates/trusted-node/cdk-node-config.toml @@ -44,7 +44,7 @@ MaxPendingTx = 1 Host = "0.0.0.0" Port = "{{.zkevm_aggregator_port}}" RetryTime = "30s" - VerifyProofInterval = "5m0s" + VerifyProofInterval = "30s" ProofStatePollingInterval = "5s" TxProfitabilityCheckerType = "acceptall" TxProfitabilityMinReward = "1.1"