Update prover to v7.0.0 fork 11. Update zk counters to fork 11 limits

0xPolygonHermez · Jul 10, 2024 · c77527d · c77527d
1 parent edc9a5f
commit c77527d
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 60 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -556,27 +556,35 @@ func Test_Defaults(t *testing.T) {
 		},
 		{
 			path:          "State.Batch.Constraints.MaxKeccakHashes",
-			expectedValue: uint32(2145),
+			expectedValue: uint32(9268),
 		},
 		{
 			path:          "State.Batch.Constraints.MaxPoseidonHashes",
-			expectedValue: uint32(252357),
+			expectedValue: uint32(1090693),
 		},
 		{
 			path:          "State.Batch.Constraints.MaxPoseidonPaddings",
-			expectedValue: uint32(135191),
+			expectedValue: uint32(584300),
 		},
 		{
 			path:          "State.Batch.Constraints.MaxMemAligns",
-			expectedValue: uint32(236585),
+			expectedValue: uint32(1022525),
 		},
 		{
 			path:          "State.Batch.Constraints.MaxArithmetics",
-			expectedValue: uint32(236585),
+			expectedValue: uint32(1022525),
 		},
 		{
 			path:          "State.Batch.Constraints.MaxBinaries",
-			expectedValue: uint32(473170),
+			expectedValue: uint32(2045051),
+		},
+		{
+			path:          "State.Batch.Constraints.MaxSteps",
+			expectedValue: uint32(32720619),
+		},
+		{
+			path:          "State.Batch.Constraints.MaxSHA256Hashes",
+			expectedValue: uint32(7269),
 		},
 	}
 	file, err := os.CreateTemp("", "genesisConfig")

diff --git a/config/default.go b/config/default.go
@@ -25,14 +25,14 @@ Outputs = ["stderr"]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
 		MaxCumulativeGasUsed = 1125899906842624
-		MaxKeccakHashes = 2145
-		MaxPoseidonHashes = 252357
-		MaxPoseidonPaddings = 135191
-		MaxMemAligns = 236585
-		MaxArithmetics = 236585
-		MaxBinaries = 473170
-		MaxSteps = 7570538
-		MaxSHA256Hashes = 1596
+		MaxKeccakHashes = 9268
+		MaxPoseidonHashes = 1090693
+		MaxPoseidonPaddings = 584300
+		MaxMemAligns = 1022525
+		MaxArithmetics = 1022525
+		MaxBinaries = 2045051
+		MaxSteps = 32720619
+		MaxSHA256Hashes = 7269
 
 [Pool]
 IntervalToRefreshBlockedAddresses = "5m"

diff --git a/config/environments/local/local.node.config.toml b/config/environments/local/local.node.config.toml
@@ -20,14 +20,14 @@ Outputs = ["stderr"]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
 		MaxCumulativeGasUsed = 1125899906842624
-		MaxKeccakHashes = 2145
-		MaxPoseidonHashes = 252357
-		MaxPoseidonPaddings = 135191
-		MaxMemAligns = 236585
-		MaxArithmetics = 236585
-		MaxBinaries = 473170
-		MaxSteps = 7570538
-		MaxSHA256Hashes = 1596
+		MaxKeccakHashes = 9268
+		MaxPoseidonHashes = 1090693
+		MaxPoseidonPaddings = 584300
+		MaxMemAligns = 1022525
+		MaxArithmetics = 1022525
+		MaxBinaries = 2045051
+		MaxSteps = 32720619
+		MaxSHA256Hashes = 7269
 
 [Pool]
 IntervalToRefreshBlockedAddresses = "5m"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -107,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:v6.0.0
+    image: hermeznetwork/zkevm-prover:v7.0.0-RC14-fork.11
     depends_on:
       zkevm-state-db:
         condition: service_healthy

diff --git a/pool/pool_test.go b/pool/pool_test.go
@@ -88,15 +88,15 @@ var (
 	bc         = state.BatchConstraintsCfg{
 		MaxTxsPerBatch:       300,
 		MaxBatchBytesSize:    120000,
-		MaxCumulativeGasUsed: 30000000,
-		MaxKeccakHashes:      2145,
-		MaxPoseidonHashes:    252357,
-		MaxPoseidonPaddings:  135191,
-		MaxMemAligns:         236585,
-		MaxArithmetics:       236585,
-		MaxBinaries:          473170,
-		MaxSteps:             7570538,
-		MaxSHA256Hashes:      1596,
+		MaxCumulativeGasUsed: 1125899906842624,
+		MaxKeccakHashes:      9268,
+		MaxPoseidonHashes:    1090693,
+		MaxPoseidonPaddings:  584300,
+		MaxMemAligns:         1022525,
+		MaxArithmetics:       1022525,
+		MaxBinaries:          2045051,
+		MaxSteps:             32720619,
+		MaxSHA256Hashes:      7269,
 	}
 	ip = "101.1.50.20"
 )

diff --git a/sequencer/finalizer_test.go b/sequencer/finalizer_test.go
@@ -39,15 +39,15 @@ var (
 	bc           = state.BatchConstraintsCfg{
 		MaxTxsPerBatch:       300,
 		MaxBatchBytesSize:    120000,
-		MaxCumulativeGasUsed: 30000000,
-		MaxKeccakHashes:      2145,
-		MaxPoseidonHashes:    252357,
-		MaxPoseidonPaddings:  135191,
-		MaxMemAligns:         236585,
-		MaxArithmetics:       236585,
-		MaxBinaries:          473170,
-		MaxSteps:             7570538,
-		MaxSHA256Hashes:      1596,
+		MaxCumulativeGasUsed: 1125899906842624,
+		MaxKeccakHashes:      9268,
+		MaxPoseidonHashes:    1090693,
+		MaxPoseidonPaddings:  584300,
+		MaxMemAligns:         1022525,
+		MaxArithmetics:       1022525,
+		MaxBinaries:          2045051,
+		MaxSteps:             32720619,
+		MaxSHA256Hashes:      7269,
 	}
 	cfg = FinalizerCfg{
 		ForcedBatchesTimeout: cfgTypes.Duration{

diff --git a/test/config/debug.node.config.toml b/test/config/debug.node.config.toml
@@ -18,15 +18,15 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 30000000
-		MaxKeccakHashes = 2145
-		MaxPoseidonHashes = 252357
-		MaxPoseidonPaddings = 135191
-		MaxMemAligns = 236585
-		MaxArithmetics = 236585
-		MaxBinaries = 473170
-		MaxSteps = 7570538
-		MaxSHA256Hashes = 1596
+		MaxCumulativeGasUsed = 1125899906842624
+		MaxKeccakHashes = 9268
+		MaxPoseidonHashes = 1090693
+		MaxPoseidonPaddings = 584300
+		MaxMemAligns = 1022525
+		MaxArithmetics = 1022525
+		MaxBinaries = 2045051
+		MaxSteps = 32720619
+		MaxSHA256Hashes = 7269
 
 [Pool]
 FreeClaimGasLimit = 1500000

diff --git a/test/config/test.node.config.toml b/test/config/test.node.config.toml
@@ -19,14 +19,14 @@ Outputs = ["stderr"]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
 		MaxCumulativeGasUsed = 1125899906842624
-		MaxKeccakHashes = 2145
-		MaxPoseidonHashes = 252357
-		MaxPoseidonPaddings = 135191
-		MaxMemAligns = 236585
-		MaxArithmetics = 236585
-		MaxBinaries = 473170
-		MaxSteps = 7570538
-		MaxSHA256Hashes = 1596
+		MaxKeccakHashes = 9268
+		MaxPoseidonHashes = 1090693
+		MaxPoseidonPaddings = 584300
+		MaxMemAligns = 1022525
+		MaxArithmetics = 1022525
+		MaxBinaries = 2045051
+		MaxSteps = 32720619
+		MaxSHA256Hashes = 7269
 
 [Pool]
 FreeClaimGasLimit = 1500000

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -512,7 +512,7 @@ services:
 
   zkevm-prover:
     container_name: zkevm-prover
-    image: hermeznetwork/zkevm-prover:v6.0.0
+    image: hermeznetwork/zkevm-prover:v7.0.0-RC14-fork.11
     platform: linux/amd64
     ports:
       - 50061:50061 # MT
@@ -605,7 +605,7 @@ services:
   zkevm-permissionless-prover:
     container_name: zkevm-permissionless-prover
     platform: linux/amd64
-    image: hermeznetwork/zkevm-prover:v6.0.0
+    image: hermeznetwork/zkevm-prover:v7.0.0-RC14-fork.11
     environment:
       - EXPERIMENTAL_DOCKER_DESKTOP_FORCE_QEMU=1
     ports: