synchronizer: check l1blocks

docs/config-file/node-config-doc.md

@@ -1540,15 +1540,15 @@ PreCheckEnable=true
 
 **Type:** : `enum (of string)`
 
-**Default:** `"latest"`
+**Default:** `"safe"`
 
 **Description:** L1PreSafeBlockPoint is the point that a block is considered safe enough to be checked
 it can be: finalized, safe,pending or latest
 
-**Example setting the default value** ("latest"):
+**Example setting the default value** ("safe"):
 ```
 [Synchronizer.L1BlockCheck]
-L1PreSafeBlockPoint="latest"
+L1PreSafeBlockPoint="safe"
 ```
 
 Must be one of:
@@ -1560,16 +1560,16 @@ Must be one of:
 
 **Type:** : `integer`
 
-**Default:** `-32`
+**Default:** `0`
 
 **Description:** L1PreSafeBlockOffset is the offset to add to L1PreSafeBlockPoint as a safe point
 it can be positive or negative
 Example: L1PreSafeBlockPoint= finalized, L1PreSafeBlockOffset= -10, then the safe block ten blocks before the finalized block
 
-**Example setting the default value** (-32):
+**Example setting the default value** (0):
 ```
 [Synchronizer.L1BlockCheck]
-L1PreSafeBlockOffset=-32
+L1PreSafeBlockOffset=0
 ```
 
 ### <a name="Synchronizer_L1SynchronizationMode"></a>9.8. `Synchronizer.L1SynchronizationMode`

docs/config-file/node-config-schema.json

@@ -572,12 +572,12 @@
 								"latest"
 							],
 							"description": "L1PreSafeBlockPoint is the point that a block is considered safe enough to be checked\nit can be: finalized, safe,pending or latest",
-							"default": "latest"
+							"default": "safe"
 						},
 						"L1PreSafeBlockOffset": {
 							"type": "integer",
 							"description": "L1PreSafeBlockOffset is the offset to add to L1PreSafeBlockPoint as a safe point\nit can be positive or negative\nExample: L1PreSafeBlockPoint= finalized, L1PreSafeBlockOffset= -10, then the safe block ten blocks before the finalized block",
-							"default": -32
+							"default": 0
 						}
 					},
 					"additionalProperties": false,

etherman/etherman.go

@@ -262,7 +262,7 @@ func NewClient(cfg Config, l1Config L1Config) (*Client, error) {
 	rollupID, err := rollupManager.RollupAddressToID(&bind.CallOpts{Pending: false}, l1Config.ZkEVMAddr)
 	if err != nil {
 		log.Debugf("error rollupManager.RollupAddressToID(%s). Error: %w", l1Config.RollupManagerAddr, err)
-		// TODO return error after the upgrade
+		return nil, err
 	}
 	log.Debug("rollupID: ", rollupID)
 
@@ -1512,7 +1512,7 @@ func (etherMan *Client) forceSequencedBatchesEvent(ctx context.Context, vLog typ
 	if err != nil {
 		return err
 	}
-	// TODO completar los datos de forcedBlockHas, forcedGer y forcedTimestamp
+	// TODO complete data forcedBlockHash, forcedGer y forcedTimestamp
 
 	// Read the tx for this batch.
 	tx, err := etherMan.EthClient.TransactionInBlock(ctx, vLog.BlockHash, vLog.TxIndex)

jsonrpc/endpoints_eth.go

@@ -68,8 +68,6 @@ func (e *EthEndpoints) Call(arg *types.TxArgs, blockArg *types.BlockNumberOrHash
 	return e.txMan.NewDbTxScope(e.state, func(ctx context.Context, dbTx pgx.Tx) (interface{}, types.Error) {
 		if arg == nil {
 			return RPCErrorResponse(types.InvalidParamsErrorCode, "missing value for required argument 0", nil, false)
-		} else if blockArg == nil {
-			return RPCErrorResponse(types.InvalidParamsErrorCode, "missing value for required argument 1", nil, false)
 		}
 		block, respErr := e.getBlockByArg(ctx, blockArg, dbTx)
 		if respErr != nil {

state/interfaces.go

@@ -162,4 +162,5 @@ type storage interface {
 	UpdateBatchAsChecked(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) error
 	GetNotCheckedBatches(ctx context.Context, dbTx pgx.Tx) ([]*Batch, error)
 	GetLastL2BlockByBatchNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (*L2Block, error)
+	GetPreviousBlockToBlockNumber(ctx context.Context, blockNumber uint64, dbTx pgx.Tx) (*Block, error)
 }

state/pgstatestorage/block.go

@@ -112,6 +112,26 @@ func (p *PostgresStorage) GetPreviousBlock(ctx context.Context, offset uint64, d
 	return &block, err
 }
 
+// GetPreviousBlockToBlockNumber gets the previous L1 block respect blockNumber.
+func (p *PostgresStorage) GetPreviousBlockToBlockNumber(ctx context.Context, blockNumber uint64, dbTx pgx.Tx) (*state.Block, error) {
+	var (
+		blockHash  string
+		parentHash string
+		block      state.Block
+	)
+	const getPreviousBlockSQL = "SELECT block_num, block_hash, parent_hash, received_at,checked FROM state.block WHERE block_num < $1 ORDER BY block_num DESC LIMIT 1 "
+
+	q := p.getExecQuerier(dbTx)
+
+	err := q.QueryRow(ctx, getPreviousBlockSQL, blockNumber).Scan(&block.BlockNumber, &blockHash, &parentHash, &block.ReceivedAt, &block.Checked)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return nil, state.ErrNotFound
+	}
+	block.BlockHash = common.HexToHash(blockHash)
+	block.ParentHash = common.HexToHash(parentHash)
+	return &block, err
+}
+
 // GetBlockByNumber returns the L1 block with the given number.
 func (p *PostgresStorage) GetBlockByNumber(ctx context.Context, blockNumber uint64, dbTx pgx.Tx) (*state.Block, error) {
 	var (

synchronizer/common/syncinterfaces/async_l1_block_checker.go

@@ -35,7 +35,6 @@ type AsyncL1BlockChecker interface {
 
 type L1BlockCheckerIntegrator interface {
 	OnStart(ctx context.Context) error
-	OnStartL1Sync(ctx context.Context) bool
-	OnStartL2Sync(ctx context.Context) bool
-	OnCheckReorg(ctx context.Context, latestBlock *state.Block) bool
+	OnResetState(ctx context.Context)
+	CheckReorgWrapper(ctx context.Context, reorgFirstBlockOk *state.Block, errReportedByReorgFunc error) (*state.Block, error)
 }