feat: run the l1 info tree syncer with safe block finality (#1148)

## 🔄 Changes Summary
- Change the L1 Info Tree Syncer block finality to `safe`, in order to
make `aggoracle` runs faster. Re-introduce `BlockFinality` in the
`L1InfoTreeSyncer` config and consequently the `ReorgDetector`.
- Simplify `keccak256` hash calculations, by relying on go ethereum
library.
- Remove `URLRPCL1` config parameters from `Aggoracle` and
`L1InfoTreeSync`, since they are unused.
- Introduce abstractions for merkle trees, in order to test l1 info tree
syncer processor more deeply:
- `ReadTreer` – provides read-only access to tree data (roots, leaves,
proofs).
- `LeafWriter` – defines write operations for adding new leaves to the
tree.
- `ReorganizeTreer` – extends ReadTreer with the ability to handle
blockchain reorgs.
- `FullTreer` – combines all capabilities (`ReadTreer`, `LeafWriter`,
`ReorganizeTreer`), representing a fully functional, mutable Merkle
tree.

## ⚠️ Breaking Changes
N/A

## 📋 Config Updates
- Re-introduce `L1InfoTreeSync.BlockFinality` config param.
- Remove `Aggoracle.URLRPCL1` config param.
- Remove `L1InfoTreeSync.URLRPCL1` config param.

## ✅ Testing
- 🤖 **Automatic**: [Optional: Enumerate E2E tests]
- 🖱️ **Manual**: [Optional: Steps to verify]

## 🐞 Issues
- Closes #1170 

## 🔗 Related PRs
N/A

## 📝 Notes
N/A

---------

Co-authored-by: Copilot <[email protected]>

Author: Stefan-Ethernal

.mockery.yaml

@@ -135,4 +135,7 @@ packages:
       filename: "mock_{{ .InterfaceName | snakecase }}.go"
       mockname: "{{ .InterfaceName }}Mock"
       all: true
-      
+  github.com/agglayer/aggkit/tree/types:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+      all: true

agglayer/types/types_test.go

@@ -1487,10 +1487,11 @@ func TestImportedBridgeExit_VerifyProofs(t *testing.T) {
 			DestinationAddress: common.HexToAddress(fmt.Sprintf("0x%040x", i+1)),
 			Amount:             big.NewInt(int64(i+1) * 1000),
 		}
-		require.NoError(t, rollupExitTree.AddLeaf(tx, uint64(i), 0, types.Leaf{
+		_, err := rollupExitTree.PutLeaf(tx, uint64(i), 0, types.Leaf{
 			Index: uint32(i),
 			Hash:  bridgeExits[i].Hash(),
-		}))
+		})
+		require.NoError(t, err)
 	}
 
 	require.NoError(t, tx.Commit())
@@ -1514,10 +1515,11 @@ func TestImportedBridgeExit_VerifyProofs(t *testing.T) {
 			},
 		}
 
-		require.NoError(t, l1InfoTree.AddLeaf(tx, uint64(i), 0, types.Leaf{
+		_, err = l1InfoTree.PutLeaf(tx, uint64(i), 0, types.Leaf{
 			Index: uint32(i),
 			Hash:  l1Leaves[i].Hash(),
-		}))
+		})
+		require.NoError(t, err)
 	}
 
 	require.NoError(t, tx.Commit())

aggoracle/config.go

@@ -17,7 +17,6 @@ var (
 
 type Config struct {
 	TargetChainType          TargetChainType          `mapstructure:"TargetChainType"`
-	URLRPCL1                 string                   `mapstructure:"URLRPCL1"`
 	WaitPeriodNextGER        types.Duration           `mapstructure:"WaitPeriodNextGER"`
 	EVMSender                chaingersender.EVMConfig `mapstructure:"EVMSender"`
 	EnableAggOracleCommittee bool                     `mapstructure:"EnableAggOracleCommittee"`

aggoracle/e2e_test.go

@@ -46,7 +46,7 @@ func TestEVM_GERInjection(t *testing.T) {
 			cfg.AggOracleCommitteeCfg.EnableAggOracleCommittee = tt.enableAggOracleCommittee
 			l1, l2 := helpers.NewSimulatedEVMEnvironment(t, cfg)
 
-			for i := 0; i < 10; i++ {
+			for i := range 10 {
 				rootHash := common.HexToHash(strconv.Itoa(i))
 				_, err := l1.GERContract.UpdateExitRoot(l1.Auth, rootHash)
 				require.NoError(t, err)

aggoracle/oracle.go

@@ -14,7 +14,7 @@ import (
 
 // L1InfoTreeSyncer is an interface that defines the methods required to interact with the L1 info tree syncer
 type L1InfoTreeSyncer interface {
-	GetLatestL1InfoLeaf(ctx context.Context) (*l1infotreesync.L1InfoTreeLeaf, error)
+	GetLatestL1InfoGER(ctx context.Context) (common.Hash, error)
 }
 
 // ChainSender is an interface that defines the methods required to send Global Exit Roots (GERs) to the chain
@@ -76,15 +76,13 @@ func (a *AggOracle) processLatestGER(ctx context.Context) error {
 	a.logger.Debugf("checking for new GERs...")
 	metrics.IncGERProcessCount()
 	// Fetch the latest GER
-	latestL1InfoLeaf, err := a.l1Info.GetLatestL1InfoLeaf(ctx)
+	latestGER, err := a.l1Info.GetLatestL1InfoGER(ctx)
 	if err != nil {
 		metrics.IncGERProcessErrCount()
 		return err
 	}
 
-	a.logger.Debugf("latest l1 info leaf retrieved: %s", latestL1InfoLeaf.String())
-
-	latestGER := latestL1InfoLeaf.GlobalExitRoot
+	a.logger.Debugf("latest GER retrieved: %s", latestGER.String())
 
 	go func() {
 		start := time.Now()

bridgesync/processor.go

@@ -839,7 +839,7 @@ func (p *processor) ProcessBlock(ctx context.Context, block sync.Block) error {
 		}
 
 		if event.Bridge != nil {
-			if err = p.exitTree.AddLeaf(tx, block.Num, event.Bridge.BlockPos, types.Leaf{
+			if _, err = p.exitTree.PutLeaf(tx, block.Num, event.Bridge.BlockPos, types.Leaf{
 				Index: event.Bridge.DepositCount,
 				Hash:  event.Bridge.Hash(),
 			}); err != nil {

cmd/run.go

@@ -40,6 +40,7 @@ import (
 	"github.com/agglayer/aggkit/pprof"
 	"github.com/agglayer/aggkit/prometheus"
 	"github.com/agglayer/aggkit/reorgdetector"
+	aggkitsync "github.com/agglayer/aggkit/sync"
 	aggkittypes "github.com/agglayer/aggkit/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -107,7 +108,7 @@ func start(cliCtx *cli.Context) error {
 	// Create WaitGroup for backfill goroutines synchronization
 	var backfillWg sync.WaitGroup
 	var rpcServices []jRPC.Service
-	l1InfoTreeSync := runL1InfoTreeSyncerIfNeeded(ctx, components, *cfg, l1Client)
+	l1InfoTreeSync := runL1InfoTreeSyncerIfNeeded(ctx, components, *cfg, reorgDetectorL1, l1Client)
 	if l1InfoTreeSync != nil {
 		rpcServices = append(rpcServices, l1InfoTreeSync.GetRPCServices()...)
 	}
@@ -374,14 +375,14 @@ func createAggSender(
 }
 
 func createAggoracle(
-	ethermanClient *etherman.RollupDataQuerier,
+	rollupDataQuerier *etherman.RollupDataQuerier,
 	cfg config.Config,
-	l1Client,
+	l1Client aggkittypes.BaseEthereumClienter,
 	l2Client aggkittypes.BaseEthereumClienter,
-	l1InfoTreeSyncer *l1infotreesync.L1InfoTreeSync,
+	l1InfoTreeSyncer aggoracle.L1InfoTreeSyncer,
 ) *aggoracle.AggOracle {
 	logger := log.WithFields("module", aggkitcommon.AGGORACLE)
-	l2ChainID, err := ethermanClient.GetRollupChainID()
+	l2ChainID, err := rollupDataQuerier.GetRollupChainID()
 	if err != nil {
 		logger.Errorf("Failed to retrieve L2ChainID: %v", err)
 	}
@@ -515,6 +516,7 @@ func runL1InfoTreeSyncerIfNeeded(
 	ctx context.Context,
 	components []string,
 	cfg config.Config,
+	reorgDetectorL1 aggkitsync.ReorgDetector,
 	l1Client aggkittypes.BaseEthereumClienter,
 ) *l1infotreesync.L1InfoTreeSync {
 	if !isNeeded([]string{
@@ -526,10 +528,9 @@ func runL1InfoTreeSyncerIfNeeded(
 	l1InfoTreeSync, err := l1infotreesync.New(
 		ctx,
 		cfg.L1InfoTreeSync,
-		aggkittypes.FinalizedBlock,
 		l1Client,
+		reorgDetectorL1,
 		l1infotreesync.FlagNone,
-		aggkittypes.FinalizedBlock,
 	)
 	if err != nil {
 		log.Fatal(err)
@@ -595,12 +596,14 @@ func runReorgDetectorL1IfNeeded(
 	cfg *reorgdetector.Config,
 ) (*reorgdetector.ReorgDetector, chan error) {
 	if !isNeeded([]string{
-		aggkitcommon.BRIDGE, aggkitcommon.L1BRIDGESYNC},
+		aggkitcommon.AGGORACLE, aggkitcommon.AGGSENDER, aggkitcommon.AGGSENDERVALIDATOR,
+		aggkitcommon.BRIDGE, aggkitcommon.L1BRIDGESYNC, aggkitcommon.L1INFOTREESYNC,
+		aggkitcommon.L2GERSYNC, aggkitcommon.AGGCHAINPROOFGEN},
 		components) {
 		return nil, nil
 	}
-	rd := newReorgDetector(cfg, l1Client, reorgdetector.L1)
 
+	rd := newReorgDetector(cfg, l1Client, reorgdetector.L1)
 	errChan := make(chan error)
 	go func() {
 		if err := rd.Start(ctx); err != nil {
@@ -674,7 +677,7 @@ func runBridgeSyncL1IfNeeded(
 	ctx context.Context,
 	components []string,
 	cfg bridgesync.Config,
-	reorgDetectorL1 *reorgdetector.ReorgDetector,
+	reorgDetectorL1 bridgesync.ReorgDetector,
 	l1Client aggkittypes.EthClienter,
 	rollupID uint32,
 	wg *sync.WaitGroup,

config/config.go

@@ -66,14 +66,14 @@ const (
 	delayBetweenRetriesHint               = "AggSender.DelayBeetweenRetries is deprecated, " +
 		"use AggSender.DelayBetweenRetries instead"
 	aggOracleBlockFinalityDeprecated       = "AggOracle.BlockFinality is deprecated, remove it from configuration"
-	l1InfoTreeSyncBlockFinalityDeprecated  = "L1InfoTreeSync.BlockFinality is deprecated, remove it from configuration"
 	lastGERSyncDeprecatedHint              = "LastGERSync is deprecated, use L2GERSync instead"
 	lastGERSyncSyncModeDeprecatedHint      = "LastGERSync.SyncMode is deprecated, remove it from configuration"
 	l1NetworkConfigURLDeprecatedHint       = "L1NetworkConfig.URL is deprecated, use L1NetworkConfig.RPC.URL instead"
 	requireValidatorCallDeprecatedHint     = "RequireValidatorCall is deprecated, remove it from configuration"
 	maxSubmitCertificateRateDeprecatedHint = "AggSender.MaxSubmitCertificateRate is deprecated, " +
 		"remove it from configuration, instead use AggSender.AgglayerClient.APIRateLimits"
 	networkIDDeprecatedHint = "Common.NetworkID is deprecated, remove it from configuration"
+	urlRPCL1DeprecatedHint  = "URLRPCL1 field is deprecated, remove it from configuration"
 )
 
 type DeprecatedFieldsError struct {
@@ -191,10 +191,6 @@ var (
 			FieldNamePattern: "AggOracle.BlockFinality",
 			Reason:           aggOracleBlockFinalityDeprecated,
 		},
-		{
-			FieldNamePattern: "L1InfoTreeSync.BlockFinality",
-			Reason:           l1InfoTreeSyncBlockFinalityDeprecated,
-		},
 		{
 			FieldNamePattern: "LastGERSync.SyncMode",
 			Reason:           lastGERSyncSyncModeDeprecatedHint,
@@ -227,6 +223,18 @@ var (
 			FieldNamePattern: "Common.NetworkID",
 			Reason:           networkIDDeprecatedHint,
 		},
+		{
+			FieldNamePattern: "Common.NetworkID",
+			Reason:           networkIDDeprecatedHint,
+		},
+		{
+			FieldNamePattern: "AggOracle.URLRPCL1",
+			Reason:           urlRPCL1DeprecatedHint,
+		},
+		{
+			FieldNamePattern: "L1InfoTreeSync.URLRPCL1",
+			Reason:           urlRPCL1DeprecatedHint,
+		},
 	}
 )
 

config/config_test.go

@@ -155,9 +155,6 @@ func TestLoadConfigWithDeprecatedFields(t *testing.T) {
 	PolAddr="{{L1Config.polTokenAddress}}"
 	ZkEVMAddr="{{L1Config.polygonZkEVMAddress}}"
 
-	[L1InfoTreeSync]
-	BlockFinality = "LatestBlock"
-
 	[Etherman]
 	URL = "{{L1URL}}"
 	[Etherman.EthermanConfig]
@@ -171,6 +168,10 @@ func TestLoadConfigWithDeprecatedFields(t *testing.T) {
 
 	[AggOracle]
 	BlockFinality = "FinalizedBlock"
+	URLRPCL1 = "http://localhost:8545"
+	
+	[L1InfoTreeSync]
+	URLRPCL1 = "http://localhost:8545"
 
 	[LastGERSync]
 	SyncMode = "Legacy"
@@ -198,10 +199,10 @@ func TestLoadConfigWithDeprecatedFields(t *testing.T) {
 	require.ErrorContains(t, err, l1NetworkConfigUseRollupAddrHint)
 	require.ErrorContains(t, err, delayBetweenRetriesHint)
 	require.ErrorContains(t, err, aggOracleBlockFinalityDeprecated)
-	require.ErrorContains(t, err, l1InfoTreeSyncBlockFinalityDeprecated)
 	require.ErrorContains(t, err, lastGERSyncDeprecatedHint)
 	require.ErrorContains(t, err, lastGERSyncSyncModeDeprecatedHint)
 	require.ErrorContains(t, err, l1NetworkConfigURLDeprecatedHint)
 	require.ErrorContains(t, err, requireValidatorCallDeprecatedHint)
 	require.ErrorContains(t, err, maxSubmitCertificateRateDeprecatedHint)
+	require.ErrorContains(t, err, urlRPCL1DeprecatedHint)
 }

config/default.go

@@ -93,8 +93,8 @@ FinalizedBlock = "LatestBlock"
 DBPath = "{{PathRWData}}/L1InfoTreeSync.sqlite"
 GlobalExitRootAddr = "{{L1NetworkConfig.GlobalExitRootManagerAddr}}"
 RollupManagerAddr = "{{L1NetworkConfig.RollupManagerAddr}}"
+BlockFinality = "SafeBlock"
 SyncBlockChunkSize = 100
-URLRPCL1 = "{{L1URL}}"
 WaitForNewBlocksPeriod = "100ms"
 InitialBlock = {{genesisBlockNumber}}
 RetryAfterErrorPeriod = "1s"
@@ -103,7 +103,6 @@ RequireStorageContentCompatibility = {{RequireStorageContentCompatibility}}
 
 [AggOracle]
 TargetChainType = "EVM"
-URLRPCL1 = "{{L1URL}}"
 WaitPeriodNextGER = "10s"
 EnableAggOracleCommittee = false
 	[AggOracle.EVMSender]