feat: add validation logic on the validator

Author: goran-ethernal

aggsender/aggsender.go

@@ -182,6 +182,13 @@ func newAggsender(
 		return nil, fmt.Errorf("error creating verifier flow: %w", err)
 	}
 
+	l1GERQuerier, err := query.NewL1GERDataQuerier(
+		cfg.GlobalExitRootL1Addr, aggkittypes.LatestBlock, l1Client, // TODO configurable finality
+	)
+	if err != nil {
+		return nil, fmt.Errorf("error creating L1GER data querier: %w", err)
+	}
+
 	localValidator := validator.NewLocalValidator(
 		logger,
 		storage,
@@ -191,6 +198,7 @@ func newAggsender(
 			query.NewL1InfoTreeDataQuerier(l1Client, l1InfoTreeSyncer),
 			certQuerier,
 			query.NewLERDataQuerier(cfg.RollupCreationBlockL1, rollupDataQuerier),
+			l1GERQuerier,
 		),
 	)
 

aggsender/aggsender_validator.go

@@ -30,14 +30,15 @@ func NewAggsenderValidator(ctx context.Context,
 	logger aggkitcommon.Logger,
 	cfg validator.Config,
 	flow types.AggsenderVerifierFlow,
-	l1InfoTreeDataQuerier validator.L1InfoTreeRootByLeafQuerier,
+	l1InfoTreeDataQuerier types.L1InfoTreeDataQuerier,
 	aggLayerClient agglayer.AggLayerClientCertificateIDQuerier,
 	certQuerier types.CertificateQuerier,
 	aggchainFEPQuerier types.AggchainFEPRollupQuerier,
 	lerQuerier types.LERQuerier,
+	l1GERQuerier types.L1GERQuerier,
 	signer signertypes.Signer) (*AggsenderValidator, error) {
 	validatorCert := validator.NewAggsenderValidator(
-		logger, flow, l1InfoTreeDataQuerier, certQuerier, lerQuerier)
+		logger, flow, l1InfoTreeDataQuerier, certQuerier, lerQuerier, l1GERQuerier)
 	grpcServer, err := grpc.NewServer(cfg.ServerConfig)
 	if err != nil {
 		return nil, err

aggsender/config/config.go

@@ -60,6 +60,8 @@ type Config struct {
 	// GlobalExitRootL2Addr is the address of the GlobalExitRootManager contract on l2 sovereign chain
 	// this address is needed for the AggchainProof mode of the AggSender
 	GlobalExitRootL2Addr ethCommon.Address `mapstructure:"GlobalExitRootL2"`
+	// GlobalExitRootL1Addr is the address of the GlobalExitRootManager contract on l1 chain
+	GlobalExitRootL1Addr ethCommon.Address `mapstructure:"GlobalExitRootL1"`
 	// SovereignRollupAddr is the address of the sovereign rollup contract on L1
 	SovereignRollupAddr ethCommon.Address `mapstructure:"SovereignRollupAddr"`
 	// RequireStorageContentCompatibility is true it's mandatory that data stored in the database

aggsender/flows/builder_flow_factory.go

@@ -114,7 +114,7 @@ func NewBuilderFlow(
 			commonFlowComponents.L1InfoTreeDataQuerier,
 			optimisticSigner,
 			commonFlowComponents.BaseFlow,
-			query.NewGERDataQuerier(commonFlowComponents.L1InfoTreeDataQuerier, l2GERReader),
+			query.NewL2GERDataQuerier(commonFlowComponents.L1InfoTreeDataQuerier, l2GERReader),
 			commonFlowComponents.L2BridgeQuerier,
 		)
 

aggsender/mocks/mock_agglayer_ger.go

@@ -111,7 +111,7 @@ func NewAggchainProofGenerationTool(
 		l1InfoTreeQuerier,
 		nil, // optimistic signer is not used in the tool, so we pass nil
 		baseFlow,
-		query.NewGERDataQuerier(l1InfoTreeQuerier, l2GERReader),
+		query.NewL2GERDataQuerier(l1InfoTreeQuerier, l2GERReader),
 		query.NewBridgeDataQuerier(logger, l2Syncer, time.Second, agglayerBridgeL2Reader),
 	)