Merge branch 'main' into minhd-vu/fund-l2-accounts

0xPolygon · Oct 25, 2024 · 7b5bfe3 · 7b5bfe3
2 parents 938d2ca + 65abea9
commit 7b5bfe3
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 41 deletions.
diff --git a/.github/tests/combinations.yml b/.github/tests/combinations.yml
@@ -21,3 +21,10 @@ combinations:
     components:
      - new-cdk-stack
 
+  - fork: 13
+    da-modes:
+      - cdk-validium
+      - rollup
+    components:
+     - new-cdk-stack
+
diff --git 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.3-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer

diff --git 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.3-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer

diff --git 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.3-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer

diff --git 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-RC13-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   additional_services:
     - tx_spammer
   data_availability_mode: cdk-validium

diff --git 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-RC13-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml
@@ -0,0 +1,8 @@
+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.2.0-RC3
+  additional_services:
+    - tx_spammer
+  data_availability_mode: cdk-validium
+  sequencer_type: erigon
diff --git a/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml
@@ -0,0 +1,8 @@
+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.2.0-RC3
+  additional_services:
+    - tx_spammer
+  data_availability_mode: rollup
+  sequencer_type: erigon
diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:

diff --git a/.github/tests/combine-ymls.sh b/.github/tests/combine-ymls.sh
@@ -19,18 +19,27 @@ mkdir -p "$COMBINATIONS_FOLDER"
 for fork in "${forks[@]}"; do
     for da in "${data_availability[@]}"; do
         for comp in "${components[@]}"; do
-            # Skipping tests for:
-            # - cdk-validium-node with fork 11 and fork 12, as they are not currently not supported.
-            # - zkevm-node with fork 12, as it is also not supported.
-            if [ "$(extract_base_name "$comp")" == "legacy-zkevm-stack" ] && {
-                {
-                    [ "$(extract_base_name "$fork")" == "fork11" ] && [ "$(extract_base_name "$da")" == "cdk-validium" ]
-                } || [ "$(extract_base_name "$fork")" == "fork12" ];
-            }; then
+            base_fork="$(extract_base_name "$fork")"
+            base_da="$(extract_base_name "$da")"
+            base_comp="$(extract_base_name "$comp")"
+
+
+            # The legacy stack doesn't work with fork 12
+            if [[ "$base_fork" == "fork12" && "$base_comp" == "legacy-zkevm-stack" ]]; then
+                continue
+            fi
+
+            # The legacy stack also doesn't work with fork 13
+            if [[ "$base_fork" == "fork13" && "$base_comp" == "legacy-zkevm-stack" ]]; then
+                continue
+            fi
+
+            # The combination of fork 11 with the zkevm stack with validium mode does not work
+            if [[ "$base_fork" == "fork11" && "$base_comp" == "legacy-zkevm-stack" && "$base_da" == "cdk-validium" ]]; then
                 continue
             fi
 
-            output_file="$COMBINATIONS_FOLDER/$(extract_base_name "$fork")-$(extract_base_name "$comp")-$(extract_base_name "$da").yml"
+            output_file="$COMBINATIONS_FOLDER/$base_fork-$base_comp-$base_da.yml"
             yq --slurp ".[0] * .[1] * .[2]" "$fork" "$da" "$comp" --yaml-output > "$output_file"
             echo "- $output_file"
         done

diff --git a/.github/tests/forks/fork11.yml b/.github/tests/forks/fork11.yml
@@ -1,11 +1,13 @@
 args:
   # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.11
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  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:ab3013d
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
+
   # 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
@@ -3,10 +3,10 @@ args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v8
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
+  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:ab3013d
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
 
   additional_services:
     - tx_spammer
diff --git a/.github/tests/forks/fork13.yml b/.github/tests/forks/fork13.yml
@@ -0,0 +1,12 @@
+args:
+  # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.12
+  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
+
+  # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.2.0-RC3
+
+  additional_services:
+    - tx_spammer
diff --git a/.github/tests/forks/fork9.yml b/.github/tests/forks/fork9.yml
@@ -1,13 +1,16 @@
 args:
   # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.9
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
+
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v6
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
 
   # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.1
+
   # https://hub.docker.com/r/hermeznetwork/zkevm-node/tags?name=v0.7
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
+
   # https://hub.docker.com/r/0xpolygon/cdk-validium-node/tags?name=0.7
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
 

diff --git a/input_parser.star b/input_parser.star
@@ -30,7 +30,7 @@ DEFAULT_DEPLOYMENT_STAGES = {
 DEFAULT_IMAGES = {
     "agglayer_image": "ghcr.io/agglayer/agglayer:feature-storage-adding-epoch-packing",  # https://github.com/agglayer/agglayer/pkgs/container/agglayer-rs
     "cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.1.0",  # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
-    "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0",  # https://github.com/0xpolygon/cdk/pkgs/container/cdk
+    "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.1-rc1",  # 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
     "l2_contracts_image": "leovct/toolbox:0.0.6",  # https://hub.docker.com/r/leovct/toolbox/tags
     "zkevm_bridge_proxy_image": "haproxy:3.0-bookworm",  # https://hub.docker.com/_/haproxy/tags
@@ -224,7 +224,7 @@ DEFAULT_ARGS = (
 )
 
 # A list of fork identifiers currently supported by Kurtosis CDK.
-SUPPORTED_FORK_IDS = [9, 11, 12]
+SUPPORTED_FORK_IDS = [9, 11, 12, 13]
 
 
 def parse_args(plan, args):

diff --git a/templates/cdk-erigon/config.yml b/templates/cdk-erigon/config.yml
@@ -625,7 +625,7 @@ sentry.log-peer-info: false
 
 # Drop useless peers, aka peers that return empty body or header responses.
 # Default: false
-sentry.drop-useless-peers: false
+# sentry.drop-useless-peers: false
 
 # The downloaded address.
 # Format: <host>:<port>

diff --git a/templates/trusted-node/cdk-node-config.toml b/templates/trusted-node/cdk-node-config.toml
@@ -4,7 +4,7 @@ ForkUpgradeNewForkId = 0
 [Common]
 IsValidiumMode = {{.is_cdk_validium}}
 
-{{if eq .zkevm_rollup_fork_id "12"}}
+{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
 ContractVersions = "banana"
 {{else}}
 ContractVersions = "elderberry"
@@ -28,7 +28,7 @@ SequencesTxFileName = "/data/sequencesender.json"
 GasOffset = 80000
 WaitPeriodPurgeTxFile = "15m"
 MaxPendingTx = 1
-{{if eq .zkevm_rollup_fork_id "12"}}
+{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
 MaxBatchesForL1 = 300
 BlockFinality="FinalizedBlock"
 {{end}}
@@ -38,7 +38,7 @@ GetBatchWaitInterval = "10s"
                 FrequencyToMonitorTxs = "1s"
                 WaitTxToBeMined = "2m"
                 ConsolidationL1ConfirmationBlocks = 5
-                {{if eq .zkevm_rollup_fork_id "12"}}
+                {{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
                 FinalizedStatusL1NumberOfBlocks = 10
                 WaitReceiptMaxTime = "250ms"
                 WaitReceiptCheckInterval = "8s"
@@ -108,7 +108,7 @@ GetBatchWaitInterval = "10s"
                 FrequencyToMonitorTxs = "1s"
                 WaitTxToBeMined = "2m"
 
-                {{if eq .zkevm_rollup_fork_id "12"}}
+                {{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
                 WaitReceiptMaxTime = "250ms"
                 WaitReceiptCheckInterval = "1s"
                 {{else}}
@@ -157,7 +157,7 @@ WaitForNewBlocksPeriod = "1s"
 InitialBlock = "{{.zkevm_rollup_manager_block_number}}"
 
 [NetworkConfig.L1]
-{{if eq .zkevm_rollup_fork_id "12"}}
+{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
 L1ChainID = "{{.l1_chain_id}}"
 {{else}}
 ChainID = "{{.l1_chain_id}}"