Update GER on closed batch without txs (0xPolygonHermez#2793) (0xPoly…

…gonHermez#2794) * update GER on closed batch without txs * refactor
okx · Nov 15, 2023 · 522c324 · 522c324
1 parent 59e43db
commit 522c324
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 18 deletions.
diff --git a/sequencer/finalizer.go b/sequencer/finalizer.go
@@ -36,18 +36,21 @@ var (
 
 // finalizer represents the finalizer component of the sequencer.
 type finalizer struct {
-	cfg                     FinalizerCfg
-	closingSignalCh         ClosingSignalCh
-	isSynced                func(ctx context.Context) bool
-	sequencerAddress        common.Address
-	worker                  workerInterface
-	dbManager               dbManagerInterface
-	executor                stateInterface
-	batch                   *WipBatch
-	batchConstraints        state.BatchConstraintsCfg
-	processRequest          state.ProcessRequest
-	sharedResourcesMux      *sync.RWMutex
-	lastGERHash             common.Hash
+	cfg                FinalizerCfg
+	closingSignalCh    ClosingSignalCh
+	isSynced           func(ctx context.Context) bool
+	sequencerAddress   common.Address
+	worker             workerInterface
+	dbManager          dbManagerInterface
+	executor           stateInterface
+	batch              *WipBatch
+	batchConstraints   state.BatchConstraintsCfg
+	processRequest     state.ProcessRequest
+	sharedResourcesMux *sync.RWMutex
+	// GER of the current WIP batch
+	currentGERHash common.Hash
+	// GER of the batch previous to the current WIP batch
+	previousGERHash         common.Hash
 	reprocessFullBatchError atomic.Bool
 	// closing signals
 	nextGER                 common.Hash
@@ -130,7 +133,8 @@ func newFinalizer(
 		batchConstraints:   batchConstraints,
 		processRequest:     state.ProcessRequest{},
 		sharedResourcesMux: new(sync.RWMutex),
-		lastGERHash:        state.ZeroHash,
+		currentGERHash:     state.ZeroHash,
+		previousGERHash:    state.ZeroHash,
 		// closing signals
 		nextGER:                 common.Hash{},
 		nextGERDeadline:         0,
@@ -520,6 +524,33 @@ func (f *finalizer) newWIPBatch(ctx context.Context) (*WipBatch, error) {
 		return nil, fmt.Errorf("failed to close batch, err: %w", err)
 	}
 
+	// Check if the batch is empty and sending a GER Update to the stream is needed
+	if f.streamServer != nil && f.batch.isEmpty() && f.currentGERHash != f.previousGERHash {
+		updateGer := state.DSUpdateGER{
+			BatchNumber:    f.batch.batchNumber,
+			Timestamp:      f.batch.timestamp.Unix(),
+			GlobalExitRoot: f.currentGERHash,
+			Coinbase:       f.sequencerAddress,
+			ForkID:         uint16(f.dbManager.GetForkIDByBatchNumber(f.batch.batchNumber)),
+			StateRoot:      f.batch.stateRoot,
+		}
+
+		err = f.streamServer.StartAtomicOp()
+		if err != nil {
+			log.Errorf("failed to start atomic op for Update GER on batch %v: %v", f.batch.batchNumber, err)
+		}
+
+		_, err = f.streamServer.AddStreamEntry(state.EntryTypeUpdateGER, updateGer.Encode())
+		if err != nil {
+			log.Errorf("failed to add stream entry for Update GER on batch %v: %v", f.batch.batchNumber, err)
+		}
+
+		err = f.streamServer.CommitAtomicOp()
+		if err != nil {
+			log.Errorf("failed to commit atomic op for Update GER on batch  %v: %v", f.batch.batchNumber, err)
+		}
+	}
+
 	// Metadata for the next batch
 	stateRoot := f.batch.stateRoot
 	lastBatchNumber := f.batch.batchNumber
@@ -535,13 +566,14 @@ func (f *finalizer) newWIPBatch(ctx context.Context) (*WipBatch, error) {
 	// Take into consideration the GER
 	f.nextGERMux.Lock()
 	if f.nextGER != state.ZeroHash {
-		f.lastGERHash = f.nextGER
+		f.previousGERHash = f.currentGERHash
+		f.currentGERHash = f.nextGER
 	}
 	f.nextGER = state.ZeroHash
 	f.nextGERDeadline = 0
 	f.nextGERMux.Unlock()
 
-	batch, err := f.openWIPBatch(ctx, lastBatchNumber+1, f.lastGERHash, stateRoot)
+	batch, err := f.openWIPBatch(ctx, lastBatchNumber+1, f.currentGERHash, stateRoot)
 	if err == nil {
 		f.processRequest.Timestamp = batch.timestamp
 		f.processRequest.BatchNumber = batch.batchNumber
@@ -1113,7 +1145,7 @@ func (f *finalizer) processForcedBatch(ctx context.Context, lastBatchNumberInSta
 
 		f.handleForcedTxsProcessResp(ctx, request, response, stateRoot)
 	} else {
-		if f.lastGERHash != forcedBatch.GlobalExitRoot && f.streamServer != nil {
+		if f.streamServer != nil && f.currentGERHash != forcedBatch.GlobalExitRoot {
 			updateGer := state.DSUpdateGER{
 				BatchNumber:    request.BatchNumber,
 				Timestamp:      request.Timestamp.Unix(),
@@ -1141,7 +1173,7 @@ func (f *finalizer) processForcedBatch(ctx context.Context, lastBatchNumberInSta
 	}
 
 	f.nextGERMux.Lock()
-	f.lastGERHash = forcedBatch.GlobalExitRoot
+	f.currentGERHash = forcedBatch.GlobalExitRoot
 	f.nextGERMux.Unlock()
 	stateRoot = response.NewStateRoot
 	lastBatchNumberInState += 1

diff --git a/sequencer/finalizer_test.go b/sequencer/finalizer_test.go
@@ -2545,7 +2545,7 @@ func setupFinalizer(withWipBatch bool) *finalizer {
 		batchConstraints:   bc,
 		processRequest:     state.ProcessRequest{},
 		sharedResourcesMux: new(sync.RWMutex),
-		lastGERHash:        common.Hash{},
+		currentGERHash:     common.Hash{},
 		// closing signals
 		nextGER:                      common.Hash{},
 		nextGERDeadline:              0,