Merge pull request #436 from 0xPolygon/jhilliard/reject-low-gas-price

Bumping Erigon Version
0xPolygon · Jan 7, 2025 · c97d876 · c97d876
2 parents 83b9224 + 5bd1965
commit c97d876
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 22 deletions.
diff --git a/.github/tests/attach-second-cdk-pessimistic.yml b/.github/tests/attach-second-cdk-pessimistic.yml
@@ -27,7 +27,7 @@ args:
 
 
   cdk_node_image: ghcr.io/0xpolygon/cdk:0.5.0-beta10
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1
   additional_services: []
   consensus_contract_type: pessimistic

diff --git a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   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
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:

diff --git a/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
   zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml
@@ -2,7 +2,7 @@ args:
   verbosity: debug
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11

diff --git a/.github/tests/fork12-pessimistic.yml b/.github/tests/fork12-pessimistic.yml
@@ -1,5 +1,5 @@
 args:
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
   zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1
   additional_services: []
   consensus_contract_type: pessimistic

diff --git a/.github/tests/forks/fork11.yml b/.github/tests/forks/fork11.yml
@@ -8,7 +8,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.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
 
   # 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
@@ -8,7 +8,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.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
 
   # https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11

diff --git a/.github/tests/forks/fork13.yml b/.github/tests/forks/fork13.yml
@@ -8,7 +8,7 @@ args:
   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
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2
 
   # https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11

diff --git a/.github/tests/forks/fork9.yml b/.github/tests/forks/fork9.yml
@@ -8,7 +8,7 @@ args:
   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:v2.60.0
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-node/tags?name=v0.7
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3

diff --git 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](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
-12|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-fork.12)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
-11|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
-9|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+13|[v2.61.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.2)|[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.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+12|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-fork.12)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+11|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.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.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+9|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.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.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
diff --git a/input_parser.star b/input_parser.star
@@ -34,7 +34,7 @@ DEFAULT_DEPLOYMENT_STAGES = {
 
 DEFAULT_IMAGES = {
     "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.23",  # https://github.com/agglayer/agglayer/tags
-    "cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.60.0",  # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
+    "cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.60.2",  # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
     "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.5.0-beta10",  # 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.1-bookworm",  # https://hub.docker.com/_/haproxy/tags

diff --git a/templates/cdk-erigon/config.yml b/templates/cdk-erigon/config.yml
@@ -128,6 +128,13 @@ zkevm.effective-gas-price-contract-deployment: 1
 # Default: 10000000
 zkevm.default-gas-price: 1000000000
 
+# Reject the sequencer to proceed transactions with low gas price
+# If this is `false` transactions below the default gas price will
+# still be accepted. If you want to reject transactions that are
+# priced at 0 gwei, you'll need to set this as `true
+# Default: false
+zkevm.reject-low-gas-price-transactions: true
+
 # Apply a factor to convert L1 gas prices into L2 gas prices.
 # A value of 1 means no adjustment; values greater than 1 increase L2 costs proportionally.
 # Default: 1