cherry pick: 3451 synchronizer accept old forkids (#3468)

* Synchronizer accept forkids that are the same as in database (#3452)

* #3451 accept same forkid from L1
* if same forkid recived and is the last one and same FromBatchNumber update blockNumber

* fix conflicts

Author: joanestebanr

state/interfaces.go

@@ -121,7 +121,8 @@ type storage interface {
 	GetBatchByForcedBatchNum(ctx context.Context, forcedBatchNumber uint64, dbTx pgx.Tx) (*Batch, error)
 	AddForkID(ctx context.Context, forkID ForkIDInterval, dbTx pgx.Tx) error
 	GetForkIDs(ctx context.Context, dbTx pgx.Tx) ([]ForkIDInterval, error)
-	UpdateForkID(ctx context.Context, forkID ForkIDInterval, dbTx pgx.Tx) error
+	UpdateForkIDToBatchNumber(ctx context.Context, forkID ForkIDInterval, dbTx pgx.Tx) error
+	UpdateForkIDBlockNumber(ctx context.Context, forkdID uint64, newBlockNumber uint64, updateMemCache bool, dbTx pgx.Tx) error
 	GetNativeBlockHashesInRange(ctx context.Context, fromBlock, toBlock uint64, dbTx pgx.Tx) ([]common.Hash, error)
 	GetDSGenesisBlock(ctx context.Context, dbTx pgx.Tx) (*DSL2Block, error)
 	GetDSBatches(ctx context.Context, firstBatchNumber, lastBatchNumber uint64, readWIPBatch bool, dbTx pgx.Tx) ([]*DSBatch, error)

state/mocks/mock_storage.go

@@ -51,7 +51,7 @@ func (p *PostgresStorage) GetForkIDs(ctx context.Context, dbTx pgx.Tx) ([]state.
 }
 
 // UpdateForkID updates the forkID stored in db
-func (p *PostgresStorage) UpdateForkID(ctx context.Context, forkID state.ForkIDInterval, dbTx pgx.Tx) error {
+func (p *PostgresStorage) UpdateForkIDToBatchNumber(ctx context.Context, forkID state.ForkIDInterval, dbTx pgx.Tx) error {
 	const updateForkIDSQL = "UPDATE state.fork_id SET to_batch_num = $1 WHERE fork_id = $2"
 	e := p.getExecQuerier(dbTx)
 	if _, err := e.Exec(ctx, updateForkIDSQL, forkID.ToBatchNumber, forkID.ForkId); err != nil {
@@ -60,6 +60,25 @@ func (p *PostgresStorage) UpdateForkID(ctx context.Context, forkID state.ForkIDI
 	return nil
 }
 
+// UpdateForkID updates the forkID stored in db
+func (p *PostgresStorage) UpdateForkIDBlockNumber(ctx context.Context, forkdID uint64, newBlockNumber uint64, updateMemCache bool, dbTx pgx.Tx) error {
+	const sql = "UPDATE state.fork_id SET block_num = $1 WHERE fork_id = $2"
+	e := p.getExecQuerier(dbTx)
+	if _, err := e.Exec(ctx, sql, forkdID, newBlockNumber); err != nil {
+		return err
+	}
+	if updateMemCache {
+		log.Debugf("Updating forkID %d in memory", forkdID)
+		forkIDs, err := p.GetForkIDs(ctx, dbTx)
+		if err != nil {
+			log.Error("error getting oldForkIDs. Error: ", err)
+			return err
+		}
+		p.UpdateForkIDIntervalsInMemory(forkIDs)
+	}
+	return nil
+}
+
 // UpdateForkIDIntervalsInMemory updates the forkID intervals in memory
 func (p *PostgresStorage) UpdateForkIDIntervalsInMemory(intervals []state.ForkIDInterval) {
 	log.Infof("Updating forkIDs. Setting %d forkIDs", len(intervals))
@@ -88,7 +107,7 @@ func (p *PostgresStorage) AddForkIDInterval(ctx context.Context, newForkID state
 			return err
 		}
 		forkIDs[len(forkIDs)-1].ToBatchNumber = newForkID.FromBatchNumber - 1
-		err := p.UpdateForkID(ctx, forkIDs[len(forkIDs)-1], dbTx)
+		err := p.UpdateForkIDToBatchNumber(ctx, forkIDs[len(forkIDs)-1], dbTx)
 		if err != nil {
 			log.Errorf("error updating forkID: %d. Error: %v", forkIDs[len(forkIDs)-1].ForkId, err)
 			return err

state/pgstatestorage/forkid.go

@@ -658,7 +658,7 @@ func TestForkIDs(t *testing.T) {
 		require.Equal(t, forks[i].Version, forkId.Version)
 	}
 	forkID3.ToBatchNumber = 18446744073709551615
-	err = testState.UpdateForkID(ctx, forkID3, dbTx)
+	err = testState.UpdateForkIDToBatchNumber(ctx, forkID3, dbTx)
 	require.NoError(t, err)
 
 	forkIDs, err = testState.GetForkIDs(ctx, dbTx)