Update executor with forkID 4 support (#1916)

Update executor and smart contracts for testing --------- Co-authored-by: Alonso <ARR551@protonmail.com> Co-authored-by: tclemos <thiago@iden3.com>
0xPolygonHermez · Apr 3, 2023 · e585b7c · e585b7c
1 parent 39e5ce8
commit e585b7c
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 71 deletions.
diff --git a/config/default.go b/config/default.go
@@ -66,8 +66,8 @@ EnableL2SuggestedGasPricePolling = true
 [Synchronizer]
 SyncInterval = "0s"
 SyncChunkSize = 100
-GenBlockNumber = 67
-trustedSequencerURL = ""
+GenBlockNumber = 74
+TrustedSequencerURL = ""
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"

diff --git a/config/environments/local/local.genesis.config.json b/config/environments/local/local.genesis.config.json
diff --git a/config/environments/local/local.node.config.toml b/config/environments/local/local.node.config.toml
@@ -57,8 +57,8 @@ EnableL2SuggestedGasPricePolling = true
 [Synchronizer]
 SyncInterval = "1s"
 SyncChunkSize = 100
-GenBlockNumber = 79
-trustedSequencerURL = ""
+GenBlockNumber = 74
+TrustedSequencerURL = ""
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"

diff --git a/config/environments/mainnet/public.node.config.toml b/config/environments/mainnet/public.node.config.toml
@@ -56,7 +56,7 @@ EnableL2SuggestedGasPricePolling = false
 SyncInterval = "2s"
 SyncChunkSize = 100
 GenBlockNumber = 16896721
-trustedSequencerURL = ""
+TrustedSequencerURL = ""
 
 [MTClient]
 URI = "zkevm-prover:50061"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,6 +14,12 @@ services:
       zkevm-sync:
         condition: service_started
     image: zkevm-node
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+        reservations:
+          memory: 512M
     ports:
       - 8545:8545
       - 9091:9091 # needed if metrics enabled
@@ -34,6 +40,12 @@ services:
       zkevm-state-db:
         condition: service_healthy
     image: zkevm-node
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+        reservations:
+          memory: 512M
     environment:
       - ZKEVM_NODE_ETHERMAN_URL=${ZKEVM_NODE_ETHERMAN_URL}
     volumes:
@@ -79,12 +91,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 1G
     ports:
       - 5433:5432
     volumes:
@@ -101,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:3476ef0
+    image: hermeznetwork/zkevm-prover:9e70a64
     depends_on:
       zkevm-state-db:
         condition: service_healthy

diff --git a/docs/production-setup.md b/docs/production-setup.md
@@ -10,7 +10,7 @@ Note that sequencing and proving functionalities are not covered in this documen
 ## Requirements
 
 - A machine to run the zkEVM node with the following requirements:
-  - Hardware: 32G RAM, 4 cores, 20G Disk (as the network is super young the current disk requirements are quite low, but they will increase overtime). Currently ARM-based CPUs are not supported
+  - Hardware: 32G RAM, 4 cores, 128G Disk with high IOPS (as the network is super young the current disk requirements are quite low, but they will increase overtime. Also note that this requirement is true if the DBs run on the same machine, but it's recommended to run Postgres on dedicated infra). Currently ARM-based CPUs are not supported
   - Software: Ubuntu 22.04, Docker
 - A L1 node: we recommend using geth, but what it's actually needed is access to a JSON RPC interface for the L1 network (Goerli for zkEVM testnet, Ethereum mainnet for zkEVM mainnet)
 

diff --git a/docs/running_local.md b/docs/running_local.md
@@ -191,10 +191,10 @@ To configure your Metamask to use your local environment, follow these steps:
 
 | Address | Description |
 |---|---|
-| 0xa513E6E4b8f2a923D98304ec87F64353C4D5C853 | Proof of Efficiency |
-| 0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9 | Bridge |
+| 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 | Proof of Efficiency |
+| 0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0 | Bridge |
 | 0x5FbDB2315678afecb367f032d93F642f64180aa3 | Matic token |
-| 0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0 | GlobalExitRootManager |
+| 0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6 | GlobalExitRootManager |
 
 ## Deployer Account
 

diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -564,7 +564,7 @@ func (etherMan *Client) BuildTrustedVerifyBatchesTxData(lastVerifiedBatch, newVe
 
 // GetSendSequenceFee get super/trusted sequencer fee
 func (etherMan *Client) GetSendSequenceFee(numBatches uint64) (*big.Int, error) {
-	f, err := etherMan.PoE.GetCurrentBatchFee(&bind.CallOpts{Pending: false})
+	f, err := etherMan.PoE.BatchFee(&bind.CallOpts{Pending: false})
 	if err != nil {
 		return nil, err
 	}

diff --git a/etherman/etherman_test.go b/etherman/etherman_test.go
@@ -90,7 +90,7 @@ func TestForcedBatchEvent(t *testing.T) {
 	initBlock, err := etherman.EthClient.BlockByNumber(ctx, nil)
 	require.NoError(t, err)
 
-	amount, err := etherman.PoE.GetCurrentBatchFee(&bind.CallOpts{Pending: false})
+	amount, err := etherman.PoE.GetForcedBatchFee(&bind.CallOpts{Pending: false})
 	require.NoError(t, err)
 	rawTxs := "f84901843b9aca00827b0c945fbdb2315678afecb367f032d93f642f64180aa380a46057361d00000000000000000000000000000000000000000000000000000000000000048203e9808073efe1fa2d3e27f26f32208550ea9b0274d49050b816cadab05a771f4275d0242fd5d92b3fb89575c070e6c930587c520ee65a3aa8cfe382fcad20421bf51d621c"
 	data, err := hex.DecodeString(rawTxs)
@@ -137,7 +137,7 @@ func TestSequencedBatchesEvent(t *testing.T) {
 	ger, err := etherman.GlobalExitRootManager.GetLastGlobalExitRoot(nil)
 	require.NoError(t, err)
 
-	amount, err := etherman.PoE.GetCurrentBatchFee(&bind.CallOpts{Pending: false})
+	amount, err := etherman.PoE.GetForcedBatchFee(&bind.CallOpts{Pending: false})
 	require.NoError(t, err)
 	rawTxs := "f84901843b9aca00827b0c945fbdb2315678afecb367f032d93f642f64180aa380a46057361d00000000000000000000000000000000000000000000000000000000000000048203e9808073efe1fa2d3e27f26f32208550ea9b0274d49050b816cadab05a771f4275d0242fd5d92b3fb89575c070e6c930587c520ee65a3aa8cfe382fcad20421bf51d621c"
 	data, err := hex.DecodeString(rawTxs)
@@ -246,7 +246,7 @@ func TestSequenceForceBatchesEvent(t *testing.T) {
 	initBlock, err := etherman.EthClient.BlockByNumber(ctx, nil)
 	require.NoError(t, err)
 
-	amount, err := etherman.PoE.GetCurrentBatchFee(&bind.CallOpts{Pending: false})
+	amount, err := etherman.PoE.GetForcedBatchFee(&bind.CallOpts{Pending: false})
 	require.NoError(t, err)
 	rawTxs := "f84901843b9aca00827b0c945fbdb2315678afecb367f032d93f642f64180aa380a46057361d00000000000000000000000000000000000000000000000000000000000000048203e9808073efe1fa2d3e27f26f32208550ea9b0274d49050b816cadab05a771f4275d0242fd5d92b3fb89575c070e6c930587c520ee65a3aa8cfe382fcad20421bf51d621c"
 	data, err := hex.DecodeString(rawTxs)

diff --git a/etherman/smartcontracts/abi/polygonzkevm.abi b/etherman/smartcontracts/abi/polygonzkevm.abi
@@ -846,7 +846,7 @@
 	},
 	{
 		"inputs": [],
-		"name": "getCurrentBatchFee",
+		"name": "getForcedBatchFee",
 		"outputs": [
 			{
 				"internalType": "uint256",

diff --git a/etherman/smartcontracts/bin/polygonzkevm.bin b/etherman/smartcontracts/bin/polygonzkevm.bin
diff --git a/etherman/smartcontracts/polygonzkevm/polygonzkevm.go b/etherman/smartcontracts/polygonzkevm/polygonzkevm.go
diff --git a/test/config/debug.node.config.toml b/test/config/debug.node.config.toml
@@ -57,8 +57,8 @@ EnableL2SuggestedGasPricePolling = true
 [Synchronizer]
 SyncInterval = "5s"
 SyncChunkSize = 100
-GenBlockNumber = 79
-trustedSequencerURL = ""
+GenBlockNumber = 74
+TrustedSequencerURL = ""
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"

diff --git a/test/config/test.genesis.config.json b/test/config/test.genesis.config.json
diff --git a/test/config/test.node.config.toml b/test/config/test.node.config.toml
@@ -57,8 +57,8 @@ EnableL2SuggestedGasPricePolling = true
 [Synchronizer]
 SyncInterval = "1s"
 SyncChunkSize = 100
-GenBlockNumber = 79
-trustedSequencerURL = ""
+GenBlockNumber = 74
+TrustedSequencerURL = ""
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"

diff --git a/test/config/test.prover.config.json b/test/config/test.prover.config.json
@@ -76,6 +76,7 @@
     "dbFlushInParallel": false,
     "dbMTCacheSize": 1024,
     "dbProgramCacheSize": 1024,
+    "dbNumberOfPoolConnections": 30,
     "cleanerPollingPeriod": 600,
     "requestsPersistence": 3600,
     "maxExecutorThreads": 20,

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -287,7 +287,7 @@ services:
 
   zkevm-mock-l1-network:
     container_name: zkevm-mock-l1-network
-    image: hermeznetwork/geth-zkevm-contracts:v1.0.0-fork.3
+    image: hermeznetwork/geth-zkevm-contracts:v1.1.0-fork.4
     ports:
       - 8545:8545
       - 8546:8546
@@ -315,7 +315,7 @@ services:
 
   zkevm-prover:
     container_name: zkevm-prover
-    image: hermeznetwork/zkevm-prover:5ad1821
+    image: hermeznetwork/zkevm-prover:9e70a64
     ports:
       # - 50051:50051 # Prover
       - 50052:50052 # Mock prover
@@ -401,7 +401,7 @@ services:
 
   zkevm-permissionless-prover:
     container_name: zkevm-permissionless-prover
-    image: hermeznetwork/zkevm-prover:221bafe
+    image: hermeznetwork/zkevm-prover:9e70a64
     ports:
       # - 50058:50058 # Prover
       - 50059:50052 # Mock prover

diff --git a/test/e2e/forcedbatches_test.go b/test/e2e/forcedbatches_test.go
@@ -128,7 +128,7 @@ func sendForcedBatch(t *testing.T, opsman *operations.Manager) (*state.Batch, er
 	log.Debug("currentBlock.Time(): ", currentBlock.Time())
 
 	// Get tip
-	tip, err := zkEvm.GetCurrentBatchFee(&bind.CallOpts{Pending: false})
+	tip, err := zkEvm.BatchFee(&bind.CallOpts{Pending: false})
 	require.NoError(t, err)
 
 	managerAddress, err := zkEvm.GlobalExitRootManager(&bind.CallOpts{Pending: false})

diff --git a/test/e2e/pool_test.go b/test/e2e/pool_test.go
@@ -217,7 +217,7 @@ func Test_FreeClaimRejectedWhenReverted(t *testing.T) {
 	client := operations.MustGetClient(operations.DefaultL2NetworkURL)
 	auth := operations.MustGetAuth(operations.DefaultSequencerPrivateKey, operations.DefaultL2ChainID)
 
-	bridgeAddr := common.HexToAddress("0xDD96FbBe673848c0b2f2B4B8f6e5b9a0665166ca")
+	bridgeAddr := common.HexToAddress("0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0")
 	bridgeSC, err := bridge.NewPolygonzkevmbridge(bridgeAddr, client)
 	require.NoError(t, err)
 

diff --git a/test/scripts/sendForcedBatch/main.go b/test/scripts/sendForcedBatch/main.go
@@ -105,7 +105,7 @@ func sendForcedBatches(cliCtx *cli.Context) error {
 	log.Debug("currentBlock.Time(): ", currentBlock.Time())
 
 	// Get tip
-	tip, err := poe.GetCurrentBatchFee(&bind.CallOpts{Pending: false})
+	tip, err := poe.BatchFee(&bind.CallOpts{Pending: false})
 	if err != nil {
 		log.Error("error getting tip. Error: ", err)
 		return err

diff --git a/test/scripts/sequenceForcedBatch/README.md b/test/scripts/sequenceForcedBatch/README.md
@@ -1,5 +1,5 @@
 
 Command:
 ```
-go run ./scripts/sequenceForcedBatch/main.go send --url http://localhost:8545 --smc 0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6 --ger 0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5 -tx 0x -t 1674730229
+go run ./scripts/sequenceForcedBatch/main.go send --url http://localhost:8545 --smc 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 --ger 0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5 -tx 0x -t 1674730229
 ```