fix stateroot on first run (#1740)

* fix stateroot on first run

* add check stateroot in reprocessfull

* fix

sequencer/dbmanager.go

@@ -161,13 +161,6 @@ func (d *dbManager) DeleteTransactionFromPool(ctx context.Context, txHash common
 func (d *dbManager) storeProcessedTxAndDeleteFromPool() {
 	// TODO: Finish the retry mechanism and error handling
 	for {
-		txToStore := <-d.txsStore.Ch
-		log.Debugf("Storing tx %v", txToStore.txResponse.TxHash)
-		dbTx, err := d.BeginStateTransaction(d.ctx)
-		if err != nil {
-			log.Errorf("StoreProcessedTxAndDeleteFromPool: %v", err)
-		}
-
 		numberOfReorgs, err := d.state.CountReorgs(d.ctx, nil)
 		if err != nil {
 			log.Error("failed to get number of reorgs: %v", err)
@@ -180,6 +173,13 @@ func (d *dbManager) storeProcessedTxAndDeleteFromPool() {
 			continue
 		}
 
+		txToStore := <-d.txsStore.Ch
+		log.Debugf("Storing tx %v", txToStore.txResponse.TxHash)
+		dbTx, err := d.BeginStateTransaction(d.ctx)
+		if err != nil {
+			log.Errorf("StoreProcessedTxAndDeleteFromPool: %v", err)
+		}
+
 		err = d.StoreProcessedTransaction(d.ctx, txToStore.batchNumber, txToStore.txResponse, txToStore.coinbase, txToStore.timestamp, dbTx)
 		if err != nil {
 			err = dbTx.Rollback(d.ctx)

sequencer/finalizer.go

@@ -485,19 +485,27 @@ func (f *finalizer) syncWithState(ctx context.Context, lastBatchNum *uint64) err
 	defer f.sharedResourcesMux.Unlock()
 	f.txsStore.Wg.Wait()
 
+	var lastBatch *state.Batch
 	var err error
 	for !f.isSynced(ctx) {
 		log.Info("wait for synchronizer to sync last batch")
 		time.Sleep(time.Second)
 	}
 	if lastBatchNum == nil {
-		batchNum, err := f.dbManager.GetLastBatchNumber(ctx)
-		for err != nil {
-			return fmt.Errorf("failed to get last batch number, err: %w", err)
+		lastBatch, err = f.dbManager.GetLastBatch(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to get last batch, err: %w", err)
+		}
+	} else {
+		lastBatch, err = f.dbManager.GetBatchByNumber(ctx, *lastBatchNum, nil)
+		if err != nil {
+			return fmt.Errorf("failed to get last batch, err: %w", err)
 		}
-		lastBatchNum = &batchNum
 	}
 
+	batchNum := lastBatch.BatchNumber
+	lastBatchNum = &batchNum
+
 	isClosed, err := f.dbManager.IsBatchClosed(ctx, *lastBatchNum)
 	if err != nil {
 		return fmt.Errorf("failed to check if batch is closed, err: %w", err)
@@ -507,10 +515,8 @@ func (f *finalizer) syncWithState(ctx context.Context, lastBatchNum *uint64) err
 		if err != nil {
 			return fmt.Errorf("failed to get latest ger, err: %w", err)
 		}
-		_, oldStateRoot, err := f.getLastBatchNumAndOldStateRoot(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to get old state root, err: %w", err)
-		}
+
+		oldStateRoot := lastBatch.StateRoot
 		f.batch, err = f.openWIPBatch(ctx, *lastBatchNum+1, ger.GlobalExitRoot, oldStateRoot)
 		if err != nil {
 			return err
@@ -532,6 +538,8 @@ func (f *finalizer) syncWithState(ctx context.Context, lastBatchNum *uint64) err
 		Caller:         state.SequencerCallerLabel,
 	}
 
+	log.Info("synced with state", "lastBatchNum", *lastBatchNum, "stateRoot", f.batch.initialStateRoot.Hex())
+
 	return nil
 }