Feature/#1506 forced batch (#1523)

* ForceBatch unit test

* SequenceForceBatch unit test

* Fix forcedBatch check

* linter

* Fix reset forcedBatch

* batch and forcedbatch table modified

* fix

db/migrations/state/0003.sql

@@ -0,0 +1,15 @@
+-- +migrate Up
+ALTER TABLE state.forced_batch
+DROP COLUMN IF EXISTS batch_num;
+
+ALTER TABLE state.batch
+ADD COLUMN forced_batch_num BIGINT;
+ALTER TABLE state.batch
+ADD FOREIGN KEY (forced_batch_num) REFERENCES state.forced_batch(forced_batch_num);
+
+-- +migrate Down
+ALTER TABLE state.batch
+DROP COLUMN IF EXISTS forced_batch_num;
+
+ALTER TABLE state.forced_batch
+ADD COLUMN batch_num BIGINT;

sequencer/broadcast/interfaces.go

@@ -14,6 +14,5 @@ type stateInterface interface {
 	GetLastBatch(ctx context.Context, dbTx pgx.Tx) (*state.Batch, error)
 	GetBatchByNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (*state.Batch, error)
 	GetEncodedTransactionsByBatchNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (encoded []string, err error)
-	GetForcedBatchByBatchNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (*state.ForcedBatch, error)
 	GetExitRootByGlobalExitRoot(ctx context.Context, ger common.Hash, dbTx pgx.Tx) (*state.GlobalExitRoot, error)
 }

sequencer/broadcast/server.go

@@ -92,14 +92,6 @@ func (s *Server) genericGetBatch(ctx context.Context, batch *state.Batch) (*pb.G
 		}
 	}
 
-	var forcedBatchNum uint64
-	forcedBatch, err := s.state.GetForcedBatchByBatchNumber(ctx, batch.BatchNumber, nil)
-	if err == nil {
-		forcedBatchNum = forcedBatch.ForcedBatchNumber
-	} else if err != state.ErrNotFound {
-		return nil, err
-	}
-
 	var mainnetExitRoot, rollupExitRoot string
 	ger, err := s.state.GetExitRootByGlobalExitRoot(ctx, batch.GlobalExitRoot, nil)
 	if err == nil {
@@ -108,6 +100,10 @@ func (s *Server) genericGetBatch(ctx context.Context, batch *state.Batch) (*pb.G
 	} else if err != state.ErrNotFound {
 		return nil, err
 	}
+	var fb uint64
+	if batch.ForcedBatchNum != nil {
+		fb = *batch.ForcedBatchNum
+	}
 
 	return &pb.GetBatchResponse{
 		BatchNumber:       batch.BatchNumber,
@@ -119,7 +115,7 @@ func (s *Server) genericGetBatch(ctx context.Context, batch *state.Batch) (*pb.G
 		RollupExitRoot:    rollupExitRoot,
 		Timestamp:         uint64(batch.Timestamp.Unix()),
 		Transactions:      transactions,
-		ForcedBatchNumber: forcedBatchNum,
+		ForcedBatchNumber: fb,
 	}, nil
 }
 

sequencer/broadcast/server_test.go

@@ -145,7 +145,6 @@ func TestBroadcastServerGetBatch(t *testing.T) {
 			}
 			st.On("GetBatchByNumber", mock.AnythingOfType("*context.valueCtx"), tc.inputBatchNumber, nil).Return(tc.expectedBatch, err)
 			st.On("GetEncodedTransactionsByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.inputBatchNumber, nil).Return(tc.expectedEncodedTxs, err)
-			st.On("GetForcedBatchByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.inputBatchNumber, nil).Return(tc.expectedForcedBatch, err)
 			if tc.expectedBatch != nil {
 				st.On("GetExitRootByGlobalExitRoot", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.GlobalExitRoot, nil).Return(tc.expectedGER, err)
 			}
@@ -217,7 +216,6 @@ func TestBroadcastServerGetLastBatch(t *testing.T) {
 			st.On("GetLastBatch", mock.AnythingOfType("*context.valueCtx"), nil).Return(tc.expectedBatch, err)
 			if tc.expectedBatch != nil {
 				st.On("GetEncodedTransactionsByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.BatchNumber, nil).Return(tc.expectedEncodedTxs, err)
-				st.On("GetForcedBatchByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.BatchNumber, nil).Return(tc.expectedForcedBatch, err)
 				st.On("GetExitRootByGlobalExitRoot", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.GlobalExitRoot, nil).Return(tc.expectedGER, err)
 			}
 

state/batch.go

@@ -18,6 +18,7 @@ type Batch struct {
 	Timestamp      time.Time
 	Transactions   []types.Transaction
 	GlobalExitRoot common.Hash
+	ForcedBatchNum *uint64
 }
 
 // ProcessingContext is the necessary data that a batch needs to provide to the runtime,
@@ -27,6 +28,7 @@ type ProcessingContext struct {
 	Coinbase       common.Address
 	Timestamp      time.Time
 	GlobalExitRoot common.Hash
+	ForcedBatchNum *uint64
 }
 
 // ProcessingReceipt indicates the outcome (StateRoot, AccInputHash) of processing a batch

state/forcedbatch.go

@@ -9,7 +9,6 @@ import (
 // ForcedBatch represents a ForcedBatch
 type ForcedBatch struct {
 	BlockNumber       uint64
-	BatchNumber       *uint64
 	ForcedBatchNumber uint64
 	Sequencer         common.Address
 	GlobalExitRoot    common.Hash