Cahnge getLastGer implementation (#1556)

0xPolygonHermez · Jan 18, 2023 · 5e3ad6c · 5e3ad6c
1 parent a99fb62
commit 5e3ad6c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/sequencer/closingsignalsmanager.go b/sequencer/closingsignalsmanager.go
@@ -30,13 +30,7 @@ func (c *closingSignalsManager) checkGERUpdate() {
 	for {
 		time.Sleep(c.cfg.ClosingSignalsManagerWaitForL1OperationsInSec.Duration * time.Second)
 
-		lastL2BlockHeader, err := c.dbManager.GetLastL2BlockHeader(c.ctx, nil)
-		if err != nil {
-			log.Errorf("error getting last L2 block: %v", err)
-			continue
-		}
-
-		ger, _, err := c.dbManager.GetLatestGer(c.ctx, lastL2BlockHeader.Number.Uint64(), c.cfg.GERFinalityNumberOfBlocks)
+		ger, _, err := c.dbManager.GetLatestGer(c.ctx, c.cfg.GERFinalityNumberOfBlocks)
 		if err != nil {
 			log.Errorf("error checking GER update: %v", err)
 			continue

diff --git a/sequencer/dbmanager.go b/sequencer/dbmanager.go
@@ -380,7 +380,15 @@ func (d *dbManager) GetLastNBatches(ctx context.Context, numBatches uint) ([]*st
 }
 
 // GetLatestGer gets the latest global exit root
-func (d *dbManager) GetLatestGer(ctx context.Context, blockNumber uint64, gerFinalityNumberOfBlocks uint64) (state.GlobalExitRoot, time.Time, error) {
+func (d *dbManager) GetLatestGer(ctx context.Context, gerFinalityNumberOfBlocks uint64) (state.GlobalExitRoot, time.Time, error) {
+	lastL2BlockHeader, err := d.GetLastL2BlockHeader(ctx, nil)
+	if err != nil {
+		log.Errorf("error getting last L2 block: %v", err)
+
+	}
+
+	blockNumber := lastL2BlockHeader.Number.Uint64()
+
 	maxBlockNumber := uint64(0)
 	if gerFinalityNumberOfBlocks <= blockNumber {
 		maxBlockNumber = blockNumber - gerFinalityNumberOfBlocks

diff --git a/sequencer/interfaces.go b/sequencer/interfaces.go
@@ -99,7 +99,7 @@ type dbManagerInterface interface {
 	GetLastClosedBatch(ctx context.Context) (*state.Batch, error)
 	IsBatchClosed(ctx context.Context, batchNum uint64) (bool, error)
 	MarkReorgedTxsAsPending(ctx context.Context)
-	GetLatestGer(ctx context.Context, blockNumber uint64, gerFinalityNumberOfBlocks uint64) (state.GlobalExitRoot, time.Time, error)
+	GetLatestGer(ctx context.Context, gerFinalityNumberOfBlocks uint64) (state.GlobalExitRoot, time.Time, error)
 	ProcessForcedBatch(forcedBatchNum uint64, request state.ProcessRequest) (*state.ProcessBatchResponse, error)
 	GetForcedBatchesSince(ctx context.Context, forcedBatchNumber uint64, dbTx pgx.Tx) ([]*state.ForcedBatch, error)
 	GetLastL2BlockHeader(ctx context.Context, dbTx pgx.Tx) (*types.Header, error)

diff --git a/sequencer/mock_db_manager.go b/sequencer/mock_db_manager.go