fix forkID (0xPolygonHermez#1729)

* fix forkID * linter * fix test
dellwatson · Mar 3, 2023 · ad4f825 · ad4f825
1 parent ebb4bd6
commit ad4f825
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 30 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -283,7 +283,6 @@ func newState(ctx context.Context, c *config.Config, l2ChainID uint64, currentFo
 	stateCfg := state.Config{
 		MaxCumulativeGasUsed: c.Sequencer.MaxCumulativeGasUsed,
 		ChainID:              l2ChainID,
-		CurrentForkID:        currentForkID,
 		ForkIDIntervals:      forkIDIntervals,
 	}
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -92,7 +92,7 @@ services:
 
   zkevm-prover:
     container_name: zkevm-prover
-    image: hermeznetwork/zkevm-prover:ab739f6
+    image: hermeznetwork/zkevm-prover:798d9e0
     ports:
       - 50061:50061 # MT
       - 50071:50071 # Executor

diff --git a/pool/pool_test.go b/pool/pool_test.go
@@ -983,7 +983,12 @@ func newState(sqlDB *pgxpool.Pool) *state.State {
 	executorClient, _, _ := executor.NewExecutorClient(ctx, executorServerConfig)
 	stateDBClient, _, _ := merkletree.NewMTDBServiceClient(ctx, mtDBServerConfig)
 	stateTree := merkletree.NewStateTree(stateDBClient)
-	st := state.NewState(state.Config{MaxCumulativeGasUsed: 800000, ChainID: chainID.Uint64(), CurrentForkID: 1}, stateDb, executorClient, stateTree)
+	st := state.NewState(state.Config{MaxCumulativeGasUsed: 800000, ChainID: chainID.Uint64(), ForkIDIntervals: []state.ForkIDInterval{{
+		FromBatchNumber: 0,
+		ToBatchNumber:   math.MaxUint64,
+		ForkId:          0,
+		Version:         "",
+	}}}, stateDb, executorClient, stateTree)
 	return st
 }
 

diff --git a/state/config.go b/state/config.go
@@ -8,9 +8,6 @@ type Config struct {
 	// ChainID is the L2 ChainID provided by the Network Config
 	ChainID uint64
 
-	// Current ForkId is the current fork id used by the network
-	CurrentForkID uint64
-
 	// ForkIdIntervals is the list of fork id intervals
 	ForkIDIntervals []ForkIDInterval
 }
diff --git a/state/state.go b/state/state.go
@@ -266,6 +266,7 @@ func (s *State) EstimateGas(transaction *types.Transaction, senderAddress common
 			return false, false, gasUsed, err
 		}
 
+		forkID := GetForkIDByBatchNumber(s.cfg.ForkIDIntervals, lastBatch.BatchNumber)
 		// Create a batch to be sent to the executor
 		processBatchRequest := &pb.ProcessBatchRequest{
 			OldBatchNum:      lastBatch.BatchNumber,
@@ -278,7 +279,7 @@ func (s *State) EstimateGas(transaction *types.Transaction, senderAddress common
 			Coinbase:         lastBatch.Coinbase.String(),
 			UpdateMerkleTree: cFalse,
 			ChainId:          s.cfg.ChainID,
-			ForkId:           s.cfg.CurrentForkID,
+			ForkId:           forkID,
 		}
 
 		log.Debugf("EstimateGas[processBatchRequest.OldBatchNum]: %v", processBatchRequest.OldBatchNum)
@@ -473,6 +474,7 @@ func (s *State) ProcessBatch(ctx context.Context, request ProcessRequest, update
 		updateMT = cTrue
 	}
 
+	forkID := GetForkIDByBatchNumber(s.cfg.ForkIDIntervals, request.BatchNumber)
 	// Create Batch
 	processBatchRequest := &pb.ProcessBatchRequest{
 		OldBatchNum:      request.BatchNumber - 1,
@@ -484,7 +486,7 @@ func (s *State) ProcessBatch(ctx context.Context, request ProcessRequest, update
 		EthTimestamp:     request.Timestamp,
 		UpdateMerkleTree: updateMT,
 		ChainId:          s.cfg.ChainID,
-		ForkId:           s.cfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 	res, err := s.sendBatchRequestToExecutor(ctx, processBatchRequest, request.Caller)
 	if err != nil {
@@ -603,6 +605,7 @@ func (s *State) processBatch(
 	if lastBatch.BatchNumber != batchNumber {
 		return nil, ErrInvalidBatchNumber
 	}
+	forkID := GetForkIDByBatchNumber(s.cfg.ForkIDIntervals, lastBatch.BatchNumber)
 	// Create Batch
 	processBatchRequest := &pb.ProcessBatchRequest{
 		OldBatchNum:      lastBatch.BatchNumber - 1,
@@ -614,7 +617,7 @@ func (s *State) processBatch(
 		EthTimestamp:     uint64(lastBatch.Timestamp.Unix()),
 		UpdateMerkleTree: cTrue,
 		ChainId:          s.cfg.ChainID,
-		ForkId:           s.cfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	res, err := s.sendBatchRequestToExecutor(ctx, processBatchRequest, caller)
@@ -1227,6 +1230,7 @@ func (s *State) internalProcessUnsignedTransaction(ctx context.Context, tx *type
 		return nil, err
 	}
 
+	forkID := GetForkIDByBatchNumber(s.cfg.ForkIDIntervals, lastBatch.BatchNumber)
 	// Create Batch
 	processBatchRequest := &pb.ProcessBatchRequest{
 		OldBatchNum:      lastBatch.BatchNumber,
@@ -1239,7 +1243,7 @@ func (s *State) internalProcessUnsignedTransaction(ctx context.Context, tx *type
 		Coinbase:         lastBatch.Coinbase.String(),
 		UpdateMerkleTree: cFalse,
 		ChainId:          s.cfg.ChainID,
-		ForkId:           s.cfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	if noZKEVMCounters {

diff --git a/state/state_test.go b/state/state_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"math"
 	"math/big"
 	"os"
 	"path/filepath"
@@ -51,8 +52,14 @@ var (
 	stateCfg   = state.Config{
 		MaxCumulativeGasUsed: 800000,
 		ChainID:              1000,
-		CurrentForkID:        1,
-	}
+		ForkIDIntervals: []state.ForkIDInterval{{
+			FromBatchNumber: 0,
+			ToBatchNumber:   math.MaxUint64,
+			ForkId:          0,
+			Version:         "",
+		}},
+	}
+	forkID                             uint64 = 2
 	executorClient                     executorclientpb.ExecutorServiceClient
 	mtDBServiceClient                  mtDBclientpb.StateDBServiceClient
 	executorClientConn, mtDBClientConn *grpc.ClientConn
@@ -491,7 +498,7 @@ func TestExecuteTransaction(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 1,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	log.Debugf("%v", processBatchRequest)
@@ -878,7 +885,7 @@ func TestExecutor(t *testing.T) {
 		UpdateMerkleTree: 0,
 		Db:               db,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -958,7 +965,7 @@ func TestExecutorRevert(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 0,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -1080,7 +1087,7 @@ func TestExecutorLogs(t *testing.T) {
 		UpdateMerkleTree: 0,
 		Db:               genesisDB,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -1159,7 +1166,7 @@ func TestExecutorTransfer(t *testing.T) {
 		EthTimestamp:     uint64(0),
 		UpdateMerkleTree: 1,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	// Read Sender Balance before execution
@@ -1306,7 +1313,7 @@ func TestExecutorTxHashAndRLP(t *testing.T) {
 			EthTimestamp:     uint64(0),
 			UpdateMerkleTree: 1,
 			ChainId:          stateCfg.ChainID,
-			ForkId:           stateCfg.CurrentForkID,
+			ForkId:           forkID,
 		}
 
 		// Process batch
@@ -1415,7 +1422,7 @@ func TestExecutorInvalidNonce(t *testing.T) {
 				EthTimestamp:     uint64(0),
 				UpdateMerkleTree: 1,
 				ChainId:          stateCfg.ChainID,
-				ForkId:           stateCfg.CurrentForkID,
+				ForkId:           forkID,
 			}
 
 			// Process batch
@@ -2014,7 +2021,7 @@ func TestExecutorUniswapOutOfCounters(t *testing.T) {
 				EthTimestamp:     uint64(0),
 				UpdateMerkleTree: 1,
 				ChainId:          stateCfg.ChainID,
-				ForkId: 		 stateCfg.CurrentForkID,
+				ForkId: 		 forkID,
 			}
 
 			// Process batch
@@ -2151,7 +2158,7 @@ func TestExecutorEstimateGas(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 0,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2298,7 +2305,7 @@ func TestExecutorGasRefund(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 1,
 		ChainId:          stateCfg.ChainID,
-		ForkId: 		 stateCfg.CurrentForkID,
+		ForkId: 		 forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2364,7 +2371,7 @@ func TestExecutorGasRefund(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 1,
 		ChainId:          stateCfg.ChainID,
-		ForkId: stateCfg.CurrentForkID,
+		ForkId: forkID,
 	}
 
 	processBatchResponse, err = executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2499,7 +2506,7 @@ func TestExecutorGasEstimationMultisig(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 1,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2583,7 +2590,7 @@ func TestExecutorGasEstimationMultisig(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 1,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err = executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2724,7 +2731,7 @@ func TestStoreDebugInfo(t *testing.T) {
 		UpdateMerkleTree: 0,
 		Db:               db,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	_, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2791,7 +2798,7 @@ func TestExecuteWithoutUpdatingMT(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 0,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err := executorClient.ProcessBatch(ctx, processBatchRequest)
@@ -2850,7 +2857,7 @@ func TestExecuteWithoutUpdatingMT(t *testing.T) {
 		EthTimestamp:     uint64(time.Now().Unix()),
 		UpdateMerkleTree: 0,
 		ChainId:          stateCfg.ChainID,
-		ForkId:           stateCfg.CurrentForkID,
+		ForkId:           forkID,
 	}
 
 	processBatchResponse, err = executorClient.ProcessBatch(ctx, processBatchRequest)

diff --git a/test/config/test.prover.config.json b/test/config/test.prover.config.json
@@ -72,7 +72,10 @@
     "databaseURL": "postgresql://prover_user:prover_pass@zkevm-state-db:5432/prover_db",
     "dbNodesTableName": "state.nodes",
     "dbProgramTableName": "state.program",
-    "dbAsyncWrite": false,
+    "dbMultiWrite": true,
+    "dbFlushInParallel": false,
+    "dbMTCacheSize": 1024,
+    "dbProgramCacheSize": 1024,
     "cleanerPollingPeriod": 600,
     "requestsPersistence": 3600,
     "maxExecutorThreads": 20,

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -301,7 +301,7 @@ services:
 
   zkevm-prover:
     container_name: zkevm-prover
-    image: hermeznetwork/zkevm-prover:fix-aggr-client
+    image: hermeznetwork/zkevm-prover:798d9e0
     ports:
       # - 50051:50051 # Prover
       - 50052:50052 # Mock prover