fix tests

aggregator/aggregator.go

@@ -182,8 +182,8 @@ func (a *Aggregator) Channel(stream pb.AggregatorService_ChannelServer) error {
 
 	// Check if prover supports the required Fork ID
 	if !prover.SupportsForkID(a.cfg.ForkId) {
-		log.Warn("Prover does not support required fork ID.")
-		return errors.New("prover does not support required fork ID")
+		log.Warnf("Prover does not support required fork ID: %d.", a.cfg.ForkId)
+		return fmt.Errorf("prover does not support required fork ID: %d", a.cfg.ForkId)
 	}
 
 	for {

aggregator/config.go

@@ -60,7 +60,7 @@ type Config struct {
 	ChainID uint64
 
 	// ForkID is the L2 ForkID provided by the Network Config
-	ForkId uint64
+	ForkId uint64 `mapstructure:"ForkId"`
 
 	// SenderAddress defines which private key the eth tx manager needs to use
 	// to sign the L1 txs

config/default.go

@@ -60,7 +60,7 @@ DefaultSenderAddress = "0x1111111111111111111111111111111111111111"
 [Synchronizer]
 SyncInterval = "0s"
 SyncChunkSize = 100
-GenBlockNumber = 66
+GenBlockNumber = 67
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"
@@ -109,6 +109,7 @@ DefaultPrice = "2000"
 [Aggregator]
 Host = "0.0.0.0"
 Port = 50081
+ForkId = 2
 RetryTime = "5s"
 VerifyProofInterval = "90s"
 TxProfitabilityCheckerType = "acceptall"

config/environments/local/local.node.config.toml

@@ -51,7 +51,7 @@ DefaultSenderAddress = "0x1111111111111111111111111111111111111111"
 [Synchronizer]
 SyncInterval = "1s"
 SyncChunkSize = 100
-GenBlockNumber = 66
+GenBlockNumber = 67
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"
@@ -96,6 +96,7 @@ MaxAllowedFailedCounter = 50
 [Aggregator]
 Host = "0.0.0.0"
 Port = 50081
+ForkId = 2
 RetryTime = "5s"
 VerifyProofInterval = "30s"
 TxProfitabilityCheckerType = "acceptall"

sequencer/finalizer_test.go

@@ -298,7 +298,7 @@ func TestFinalizer_syncWithState(t *testing.T) {
 		getWIPBatchErr        error
 		openBatchErr          error
 		isBatchClosedErr      error
-		getLastBatchNumErr    error
+		getLastBatchErr       error
 		expectedProcessingCtx state.ProcessingContext
 		expectedBatch         *WipBatch
 		expectedErr           error
@@ -330,6 +330,7 @@ func TestFinalizer_syncWithState(t *testing.T) {
 			name:          "Success-Open Batch",
 			lastBatchNum:  &one,
 			isBatchClosed: false,
+			batches:       batches,
 			ger:           common.Hash{},
 			expectedBatch: &WipBatch{
 				batchNumber:        one,
@@ -348,13 +349,13 @@ func TestFinalizer_syncWithState(t *testing.T) {
 			},
 		},
 		{
-			name:               "Error-Failed to get last batch number",
-			lastBatchNum:       nil,
-			batches:            batches,
-			isBatchClosed:      true,
-			ger:                oldHash,
-			getLastBatchNumErr: testErr,
-			expectedErr:        fmt.Errorf("failed to get last batch number, err: %w", testErr),
+			name:            "Error-Failed to get last batch",
+			lastBatchNum:    nil,
+			batches:         batches,
+			isBatchClosed:   true,
+			ger:             oldHash,
+			getLastBatchErr: testErr,
+			expectedErr:     fmt.Errorf("failed to get last batch, err: %w", testErr),
 		},
 		{
 			name:             "Error-Failed to check if batch is closed",
@@ -395,20 +396,21 @@ func TestFinalizer_syncWithState(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			// arrange
 			if tc.lastBatchNum == nil {
-				dbManagerMock.Mock.On("GetLastBatchNumber", ctx).Return(one, tc.getLastBatchNumErr).Once()
+				dbManagerMock.Mock.On("GetLastBatch", ctx).Return(tc.batches[0], tc.getLastBatchErr).Once()
+			} else {
+				dbManagerMock.On("GetBatchByNumber", ctx, *tc.lastBatchNum, nil).Return(tc.batches[0], nilErr).Once()
 			}
 
-			if tc.getLastBatchNumErr == nil {
+			if tc.getLastBatchErr == nil {
 				dbManagerMock.Mock.On("IsBatchClosed", ctx, *tc.lastBatchNum).Return(tc.isBatchClosed, tc.isBatchClosedErr).Once()
 			}
 
 			if tc.isBatchClosed {
-				if tc.getLastBatchNumErr == nil && tc.isBatchClosedErr == nil {
-					dbManagerMock.On("GetLastNBatches", ctx, uint(2)).Return(tc.batches, nilErr).Once()
+				if tc.getLastBatchErr == nil && tc.isBatchClosedErr == nil {
 					dbManagerMock.On("OpenBatch", ctx, tc.expectedProcessingCtx, dbTxMock).Return(tc.openBatchErr).Once()
 				}
 
-				if tc.getLastBatchNumErr == nil && tc.isBatchClosedErr == nil {
+				if tc.getLastBatchErr == nil && tc.isBatchClosedErr == nil {
 					dbManagerMock.Mock.On("GetLatestGer", ctx, f.cfg.GERFinalityNumberOfBlocks).Return(state.GlobalExitRoot{GlobalExitRoot: tc.ger}, testNow(), nil).Once()
 					dbManagerMock.On("BeginStateTransaction", ctx).Return(dbTxMock, nil).Once()
 					if tc.openBatchErr == nil {

test/config/debug.node.config.toml

@@ -51,7 +51,7 @@ DefaultSenderAddress = "0x1111111111111111111111111111111111111111"
 [Synchronizer]
 SyncInterval = "5s"
 SyncChunkSize = 100
-GenBlockNumber = 66
+GenBlockNumber = 67
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"
@@ -96,6 +96,7 @@ MaxAllowedFailedCounter = 50
 [Aggregator]
 Host = "0.0.0.0"
 Port = 50081
+ForkId = 2
 RetryTime = "5s"
 VerifyProofInterval = "30s"
 TxProfitabilityCheckerType = "acceptall"

test/config/test.node.config.toml

@@ -51,7 +51,7 @@ DefaultSenderAddress = "0x1111111111111111111111111111111111111111"
 [Synchronizer]
 SyncInterval = "1s"
 SyncChunkSize = 100
-GenBlockNumber = 66
+GenBlockNumber = 67
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"
@@ -96,6 +96,7 @@ MaxAllowedFailedCounter = 50
 [Aggregator]
 Host = "0.0.0.0"
 Port = 50081
+ForkId = 2
 RetryTime = "5s"
 VerifyProofInterval = "30s"
 TxProfitabilityCheckerType = "acceptall"

test/docker-compose.yml

@@ -293,7 +293,7 @@ services:
 
   zkevm-mock-l1-network:
     container_name: zkevm-mock-l1-network
-    image: hermeznetwork/geth-zkevm-contracts:test
+    image: hermeznetwork/geth-zkevm-contracts:test-fork
     ports:
       - 8545:8545
       - 8546:8546

tools/executor/main.go

@@ -133,7 +133,7 @@ func runTestCase(ctx context.Context, genesis []genesisItem, tc testCase) error
 		log.Infof("CntBinaries: %v", res.CntBinaries)
 		log.Infof("CntSteps: %v", res.CntSteps)
 		for i, txRes := range res.Responses {
-			log.Infof("======> TX #%d", i)
+			log.Infof("=====> TX #%d", i)
 			if "0x"+hex.EncodeToString(txRes.TxHash) != txs[i].Hash().Hex() {
 				log.Warnf("TxHash missmatch:\nexecutor: %s\ndecoded: %s", "0x"+hex.EncodeToString(txRes.TxHash), txs[i].Hash().Hex())
 			} else {