feat: allow to configure the finality to use for l1infotree

Author: joanestebanr

aggsender/aggsender.go

@@ -182,7 +182,7 @@ func newAggsender(
 		return nil, fmt.Errorf("error creating verifier flow: %w", err)
 	}
 
-	l1InfoTreeQuerier, err := query.NewL1InfoTreeDataQuerier(l1Client, cfg.GlobalExitRootL1Addr, l1InfoTreeSyncer)
+	l1InfoTreeQuerier, err := query.NewL1InfoTreeDataQuerier(l1Client, cfg.GlobalExitRootL1Addr, l1InfoTreeSyncer, cfg.BlockFinalityForL1InfoTree)
 	if err != nil {
 		return nil, fmt.Errorf("error creating L1 Info tree data querier: %w", err)
 	}

aggsender/config/config.go

@@ -11,6 +11,7 @@ import (
 	"github.com/agglayer/aggkit/common"
 	"github.com/agglayer/aggkit/config/types"
 	"github.com/agglayer/aggkit/grpc"
+	aggkittypes "github.com/agglayer/aggkit/types"
 	signertypes "github.com/agglayer/go_signer/signer/types"
 	ethCommon "github.com/ethereum/go-ethereum/common"
 )
@@ -96,6 +97,8 @@ type Config struct {
 	CommitteeOverride query.CommitteeOverride `mapstructure:"CommitteeOverride"`
 	// AgglayerBridgeL2Addr is the address of the bridge L2 sovereign contract on L2 sovereign chain
 	AgglayerBridgeL2Addr ethCommon.Address `mapstructure:"AgglayerBridgeL2Addr"`
+	// BlockFinalityForL1InfoTree indicates the block finality to use when querying for L1InfoRoot to use
+	BlockFinalityForL1InfoTree aggkittypes.BlockNumberFinality `jsonschema:"enum=LatestBlock, enum=SafeBlock, enum=PendingBlock, enum=FinalizedBlock, enum=EarliestBlock" mapstructure:"BlockFinalityForL1InfoTree"` //nolint:lll
 }
 
 func (c Config) CheckCertConfigBriefString() string {
@@ -118,7 +121,8 @@ func (c Config) String() string {
 		"SovereignRollupAddr: " + c.SovereignRollupAddr.Hex() + "\n" +
 		"RequireNoFEPBlockGap: " + fmt.Sprintf("%t", c.RequireNoFEPBlockGap) + "\n" +
 		"RetriesToBuildAndSendCertificate: " + c.RetriesToBuildAndSendCertificate.String() + "\n" +
-		"StorageRetainCertificatesPolicy: " + c.StorageRetainCertificatesPolicy.String() + "\n"
+		"StorageRetainCertificatesPolicy: " + c.StorageRetainCertificatesPolicy.String() + "\n" +
+		"BlockFinalityForL1InfoTree: " + c.BlockFinalityForL1InfoTree.String() + "\n"
 }
 
 // Validate checks if the configuration is valid
@@ -138,5 +142,8 @@ func (c Config) Validate() error {
 	if err := c.StorageRetainCertificatesPolicy.Validate(); err != nil {
 		return fmt.Errorf("invalid StorageRetainCertificatesPolicy config: %w", err)
 	}
+	if err := c.BlockFinalityForL1InfoTree.Validate(); err != nil {
+		return fmt.Errorf("invalid BlockFinalityForL1InfoTree configuration: %w", err)
+	}
 	return nil
 }

aggsender/flows/builder_flow_factory.go

@@ -52,6 +52,7 @@ func NewBuilderFlow(
 			cfg.RequireCommitteeMembershipCheck,
 			cfg.AgglayerBridgeL2Addr,
 			cfg.GlobalExitRootL1Addr,
+			cfg.BlockFinalityForL1InfoTree,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create common flow components: %w", err)
@@ -100,6 +101,7 @@ func NewBuilderFlow(
 			cfg.RequireCommitteeMembershipCheck,
 			cfg.AgglayerBridgeL2Addr,
 			cfg.GlobalExitRootL1Addr,
+			cfg.BlockFinalityForL1InfoTree,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create common flow components: %w", err)
@@ -166,6 +168,7 @@ func CreateCommonFlowComponents(
 	requireCommitteeMembershipCheck bool,
 	agglayerBridgeL2Addr ethCommon.Address,
 	globalExitRootL1Addr ethCommon.Address,
+	blockFinalityForL1InfoTree aggkittypes.BlockNumberFinality,
 ) (*CommonFlowComponents, error) {
 	l2ChainID, err := rollupDataQuerier.GetRollupChainID()
 	if err != nil {
@@ -184,7 +187,7 @@ func CreateCommonFlowComponents(
 	}
 
 	l2BridgeQuerier := query.NewBridgeDataQuerier(logger, l2Syncer, delayBetweenRetries, agglayerBridgeL2Reader)
-	l1InfoTreeQuerier, err := query.NewL1InfoTreeDataQuerier(l1Client, globalExitRootL1Addr, l1InfoTreeSyncer)
+	l1InfoTreeQuerier, err := query.NewL1InfoTreeDataQuerier(l1Client, globalExitRootL1Addr, l1InfoTreeSyncer, blockFinalityForL1InfoTree)
 	if err != nil {
 		return nil, fmt.Errorf("error creating L1 Info tree data querier: %w", err)
 	}

aggsender/flows/verifier_flow_factory.go

@@ -38,6 +38,7 @@ func NewVerifierFlow(
 			cfg.RequireCommitteeMembershipCheck,
 			cfg.AgglayerBridgeL2Addr,
 			cfg.GlobalExitRootL1Addr,
+			cfg.BlockFinalityForL1InfoTree,
 		)
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to create common flow components: %w", err)
@@ -67,6 +68,7 @@ func NewVerifierFlow(
 			cfg.RequireCommitteeMembershipCheck,
 			cfg.AgglayerBridgeL2Addr,
 			cfg.GlobalExitRootL1Addr,
+			cfg.BlockFinalityForL1InfoTree,
 		)
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to create common flow components: %w", err)

aggsender/prover/proof_generation_tool.go

@@ -97,7 +97,7 @@ func NewAggchainProofGenerationTool(
 		return nil, fmt.Errorf("failed to create bridge L2 sovereign reader: %w", err)
 	}
 
-	l1InfoTreeQuerier, err := query.NewL1InfoTreeDataQuerier(l1Client, cfg.GlobalExitRootL1Addr, l1InfoTreeSyncer)
+	l1InfoTreeQuerier, err := query.NewL1InfoTreeDataQuerier(l1Client, cfg.GlobalExitRootL1Addr, l1InfoTreeSyncer, aggkittypes.FinalizedBlock)
 	if err != nil {
 		return nil, fmt.Errorf("error creating L1 Info tree data querier: %w", err)
 	}

aggsender/query/l1info_tree_data_query.go

@@ -15,30 +15,31 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-var finalizedBlockBigInt = big.NewInt(int64(aggkittypes.Finalized))
-
 var _ types.L1InfoTreeDataQuerier = (*L1InfoTreeDataQuerier)(nil)
 
 // L1InfoTreeDataQuerier is a struct that holds the logic to query the L1 Info tree data
 type L1InfoTreeDataQuerier struct {
-	l1Client         aggkittypes.BaseEthereumClienter
-	l1GERManager     *agglayerger.Agglayerger
-	l1InfoTreeSyncer types.L1InfoTreeSyncer
+	l1Client                   aggkittypes.BaseEthereumClienter
+	l1GERManager               *agglayerger.Agglayerger
+	l1InfoTreeSyncer           types.L1InfoTreeSyncer
+	blockFinalityForL1InfoTree aggkittypes.BlockNumberFinality
 }
 
 // NewL1InfoTreeDataQuerier returns a new instance of the L1InfoTreeDataQuery
 func NewL1InfoTreeDataQuerier(
 	l1Client aggkittypes.BaseEthereumClienter,
 	l1GERAddr common.Address,
-	l1InfoTreeSyncer types.L1InfoTreeSyncer) (*L1InfoTreeDataQuerier, error) {
+	l1InfoTreeSyncer types.L1InfoTreeSyncer,
+	blockFinalityForL1InfoTree aggkittypes.BlockNumberFinality) (*L1InfoTreeDataQuerier, error) {
 	l1GERManager, err := agglayerger.NewAgglayerger(l1GERAddr, l1Client)
 	if err != nil {
 		return nil, err
 	}
 	return &L1InfoTreeDataQuerier{
-		l1Client:         l1Client,
-		l1GERManager:     l1GERManager,
-		l1InfoTreeSyncer: l1InfoTreeSyncer,
+		l1Client:                   l1Client,
+		l1GERManager:               l1GERManager,
+		l1InfoTreeSyncer:           l1InfoTreeSyncer,
+		blockFinalityForL1InfoTree: blockFinalityForL1InfoTree,
 	}, nil
 }
 
@@ -143,7 +144,7 @@ func (l *L1InfoTreeDataQuerier) GetProofForGER(
 
 // getLatestProcessedFinalizedBlock returns the latest processed finalized block from the l1infotreesyncer
 func (l *L1InfoTreeDataQuerier) getLatestProcessedFinalizedBlock(ctx context.Context) (uint64, error) {
-	lastFinalizedL1Block, err := l.l1Client.HeaderByNumber(ctx, finalizedBlockBigInt)
+	lastFinalizedL1Block, err := l.blockFinalityForL1InfoTree.BlockHeader(ctx, l.l1Client)
 	if err != nil {
 		return 0, fmt.Errorf("error getting latest finalized L1 block: %w", err)
 	}

aggsender/validator/config.go

@@ -8,6 +8,7 @@ import (
 	aggkitcommon "github.com/agglayer/aggkit/common"
 	"github.com/agglayer/aggkit/config/types"
 	aggkitgrpc "github.com/agglayer/aggkit/grpc"
+	aggkittypes "github.com/agglayer/aggkit/types"
 	signertypes "github.com/agglayer/go_signer/signer/types"
 	ethCommon "github.com/ethereum/go-ethereum/common"
 )
@@ -48,6 +49,9 @@ type Config struct {
 	AgglayerBridgeL2Addr ethCommon.Address `mapstructure:"AgglayerBridgeL2Addr"`
 	// GlobalExitRootL1Addr is the address of the GlobalExitRootManager contract on L1
 	GlobalExitRootL1Addr ethCommon.Address `mapstructure:"GlobalExitRootL1Addr"`
+	// BlockFinalityForL1InfoTree indicates the block finality to use when querying for L1InfoRoot to use
+	BlockFinalityForL1InfoTree aggkittypes.BlockNumberFinality `jsonschema:"enum=LatestBlock, enum=SafeBlock, enum=PendingBlock, enum=FinalizedBlock, enum=EarliestBlock" mapstructure:"BlockFinalityForL1InfoTree"` //nolint:lll
+
 }
 
 type PPConfig struct {
@@ -90,5 +94,9 @@ func (c *Config) Validate() error {
 		return fmt.Errorf("invalid agglayer client config: %w", err)
 	}
 
+	if err := c.BlockFinalityForL1InfoTree.Validate(); err != nil {
+		return fmt.Errorf("invalid BlockFinalityForL1InfoTree configuration: %w", err)
+	}
+
 	return nil
 }

config/default.go

@@ -212,6 +212,7 @@ MaxL2BlockNumber = 0
 StopOnFinishedSendingAllCertificates = false
 RequireCommitteeMembershipCheck = false
 AgglayerBridgeL2Addr = "{{L2Config.BridgeAddr}}"
+BlockFinalityForL1InfoTree = "FinalizedBlock"
 	[AggSender.RetriesToBuildAndSendCertificate]
 		RetryMode = "delays"
 		Delays = [ "1m", "1m", "2m", "5m", "5m", "8m" ]
@@ -293,6 +294,7 @@ Mode = "{{AggSender.Mode}}"
 RequireCommitteeMembershipCheck = {{AggSender.RequireCommitteeMembershipCheck}}
 AgglayerBridgeL2Addr = "{{L2Config.BridgeAddr}}"
 GlobalExitRootL1Addr = "{{L1Config.polygonZkEVMGlobalExitRootAddress}}"
+BlockFinalityForL1InfoTree = "{{AggSender.BlockFinalityForL1InfoTree}}"
 [Validator.ServerConfig]
 	Host = "0.0.0.0"
 	Port = 5578