feat: remove ger, unset claims

.github/test_e2e_cdk_erigon_args_base.json

@@ -25,4 +25,4 @@
     "gas_token_enabled": false,
     "additional_services": []
   }
-}
+}

.github/test_e2e_cdk_erigon_custom_gas_token.json

@@ -3,4 +3,4 @@
     "gas_token_enabled": true,
     "gas_token_address": ""
   }
-}
+}

.github/test_e2e_op_args_base.json

@@ -10,13 +10,11 @@
     "agg_sender_multisig_threshold": 2,
     "agg_sender_validator_total_number": 3,
     "verbosity": "debug",
-    "agglayer_image": "ghcr.io/agglayer/agglayer:0.4.0-rc.18",
-    "additional_services": [
-      "bridge_spammer"
-    ],
+    "aggkit_prover_image": "atanmarko/aggkit-prover:ger-removal",
+    "additional_services": [],
     "binary_name": "aggkit",
     "aggkit_components": "aggsender,aggoracle",
     "zkevm_rollup_chain_id": 20201,
     "zkevm_rollup_id": 1
   }
-}
+}

.github/test_e2e_op_succinct_args_base.json

@@ -9,6 +9,7 @@
     "op_succinct_submission_interval": "1",
     "op_succinct_max_concurrent_proof_requests": "1",
     "op_succinct_max_concurrent_witness_gen": "1",
-    "op_succinct_range_proof_interval": "60"
+    "op_succinct_range_proof_interval": "60",
+    "additional_services": []
   }
-}
+}

.github/workflows/test-e2e.yml

@@ -54,7 +54,7 @@ jobs:
             fi
           else
             # For push/workflow_dispatch, use the fixed commit
-            COMMIT="c32d3805ad1eb45a8b3ef91ec41610c6197c6379"
+            COMMIT="e4a8a1b652e1b66ddf677edc709ea2f8b2196ef3"
             echo "Using fixed kurtosis-cdk commit: ${COMMIT}"
           fi
           echo "commit=${COMMIT}" >> $GITHUB_OUTPUT
@@ -173,19 +173,21 @@ jobs:
     name: Single L2 chain tests (OP, pessimistic)
     needs:
       - build-aggkit-image
+      - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@145cec24f0b94e92572139f63bd2652fd9be5bdb
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@39b7da5006d5a3a518542fec13acfd017e3a7ffc
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 145cec24f0b94e92572139f63bd2652fd9be5bdb
-      kurtosis-cdk-enclave-name: aggkit
+      agglayer-e2e-ref: 39b7da5006d5a3a518542fec13acfd017e3a7ffc
+      kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-pessimistic }}
       test-name: "test-single-l2-network-op-pessimistic"
       event-name: ${{ github.event_name }}
+      aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
 
-  check-single-l2-network-pessimistic-tests-result:
+  check-single-l2-network-op-pessimistic-tests-result:
     name: Check results for single l2 network (OP, pessimistic)
     needs:
       - test-single-l2-network-op-pessimistic
@@ -198,15 +200,17 @@ jobs:
     name: Single L2 chain tests (op-succinct)
     needs:
       - build-aggkit-image
+      - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@145cec24f0b94e92572139f63bd2652fd9be5bdb
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@39b7da5006d5a3a518542fec13acfd017e3a7ffc
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 145cec24f0b94e92572139f63bd2652fd9be5bdb
+      agglayer-e2e-ref: 39b7da5006d5a3a518542fec13acfd017e3a7ffc # main
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct }}
+      aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       test-name: "test-single-l2-network-op-succinct"
       event-name: ${{ github.event_name }}
 
@@ -223,17 +227,19 @@ jobs:
     name: Single L2 chain tests (op-succinct with aggoracle committee)
     needs:
       - build-aggkit-image
+      - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@145cec24f0b94e92572139f63bd2652fd9be5bdb
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@39b7da5006d5a3a518542fec13acfd017e3a7ffc
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 145cec24f0b94e92572139f63bd2652fd9be5bdb
+      agglayer-e2e-ref: 39b7da5006d5a3a518542fec13acfd017e3a7ffc
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct-aggoracle-committee }}
       test-name: "test-single-l2-network-op-succinct-aggoracle-committee"
       event-name: ${{ github.event_name }}
+      aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
 
   check-single-l2-network-op-succinct-aggoracle-committee-tests-result:
     name: Check results for single l2 network (op-succinct with aggoracle committee)
@@ -251,12 +257,12 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@145cec24f0b94e92572139f63bd2652fd9be5bdb
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@39b7da5006d5a3a518542fec13acfd017e3a7ffc
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 145cec24f0b94e92572139f63bd2652fd9be5bdb
-      kurtosis-cdk-enclave-name: aggkit
+      agglayer-e2e-ref: 39b7da5006d5a3a518542fec13acfd017e3a7ffc
+      kurtosis-cdk-enclave-name: op
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-1 }}
       kurtosis-cdk-args-2: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-2 }}
@@ -277,11 +283,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@145cec24f0b94e92572139f63bd2652fd9be5bdb
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@39b7da5006d5a3a518542fec13acfd017e3a7ffc
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 145cec24f0b94e92572139f63bd2652fd9be5bdb
+      agglayer-e2e-ref: 39b7da5006d5a3a518542fec13acfd017e3a7ffc
       kurtosis-cdk-enclave-name: aggkit
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-3 }}

agglayer/types/types.go

@@ -862,10 +862,22 @@ func (l *L1InfoTreeLeaf) Validate() error {
 	return nil
 }
 
+type RemovedGER struct {
+	GlobalExitRoot common.Hash `json:"global_exit_root"`
+	BlockNumber    uint64      `json:"block_number"`
+	LogIndex       uint64      `json:"log_index"`
+}
+
+type Unclaim struct {
+	GlobalIndex *GlobalIndex `json:"global_index"`
+	BlockNumber uint64       `json:"block_number"`
+	LogIndex    uint64       `json:"log_index"`
+}
+
 type ProvenInsertedGERWithBlockNumber struct {
 	BlockNumber           uint64            `json:"block_number"`
 	ProvenInsertedGERLeaf ProvenInsertedGER `json:"inserted_ger_leaf"`
-	BlockIndex            uint              `json:"block_index"`
+	LogIndex              uint64            `json:"log_index"`
 }
 
 type ProvenInsertedGER struct {
@@ -875,6 +887,7 @@ type ProvenInsertedGER struct {
 
 type ImportedBridgeExitWithBlockNumber struct {
 	BlockNumber        uint64              `json:"block_number"`
+	LogIndex           uint64              `json:"log_index"`
 	ImportedBridgeExit *ImportedBridgeExit `json:"imported_bridge_exit"`
 }
 

aggsender/aggchainproofclient/aggchain_proof_client.go

@@ -134,7 +134,7 @@ func convertAggchainProofRequestToGrpcRequest(
 		}
 		convertedGerLeaves[k.String()] = &aggkitProverV1Proto.ProvenInsertedGERWithBlockNumber{
 			BlockNumber: v.BlockNumber,
-			BlockIndex:  uint64(v.BlockIndex),
+			LogIndex:    v.LogIndex,
 			ProvenInsertedGer: &aggkitProverV1Proto.ProvenInsertedGER{
 				ProofGerL1Root: &agglayerInteropTypesV1Proto.MerkleProof{
 					Root:     &agglayerInteropTypesV1Proto.FixedBytes32{Value: v.ProvenInsertedGERLeaf.ProofGERToL1Root.Root[:]},
@@ -167,6 +167,7 @@ func convertAggchainProofRequestToGrpcRequest(
 	for i, importedBridgeExitWithBlockNumber := range req.ImportedBridgeExitsWithBlockNumber {
 		convertedImportedBridgeExitsWithBlockNumber[i] = &aggkitProverV1Proto.ImportedBridgeExitWithBlockNumber{
 			BlockNumber: importedBridgeExitWithBlockNumber.BlockNumber,
+			LogIndex:    importedBridgeExitWithBlockNumber.LogIndex,
 			GlobalIndex: &agglayerInteropTypesV1Proto.FixedBytes32{
 				Value: common.BigToHash(bridgesync.GenerateGlobalIndex(
 					importedBridgeExitWithBlockNumber.ImportedBridgeExit.GlobalIndex.MainnetFlag,
@@ -180,6 +181,32 @@ func convertAggchainProofRequestToGrpcRequest(
 		}
 	}
 
+	convertedRemovedGers := make([]*aggkitProverV1Proto.RemovedGER, len(req.RemovedGERs))
+	for i, removedGER := range req.RemovedGERs {
+		convertedRemovedGers[i] = &aggkitProverV1Proto.RemovedGER{
+			GlobalExitRoot: &agglayerInteropTypesV1Proto.FixedBytes32{
+				Value: removedGER.GlobalExitRoot[:],
+			},
+			BlockNumber: removedGER.BlockNumber,
+			LogIndex:    removedGER.LogIndex,
+		}
+	}
+
+	convertedUnclaims := make([]*aggkitProverV1Proto.Unclaim, len(req.Unclaims))
+	for i, unclaim := range req.Unclaims {
+		convertedUnclaims[i] = &aggkitProverV1Proto.Unclaim{
+			GlobalIndex: &agglayerInteropTypesV1Proto.FixedBytes32{
+				Value: common.BigToHash(bridgesync.GenerateGlobalIndex(
+					unclaim.GlobalIndex.MainnetFlag,
+					unclaim.GlobalIndex.RollupIndex,
+					unclaim.GlobalIndex.LeafIndex,
+				)).Bytes(),
+			},
+			BlockNumber: unclaim.BlockNumber,
+			LogIndex:    unclaim.LogIndex,
+		}
+	}
+
 	request := &aggkitProverV1Proto.GenerateAggchainProofRequest{
 		LastProvenBlock:       req.LastProvenBlock,
 		RequestedEndBlock:     req.RequestedEndBlock,
@@ -188,6 +215,8 @@ func convertAggchainProofRequestToGrpcRequest(
 		L1InfoTreeMerkleProof: convertedMerkleProof,
 		GerLeaves:             convertedGerLeaves,
 		ImportedBridgeExits:   convertedImportedBridgeExitsWithBlockNumber,
+		RemovedGers:           convertedRemovedGers,
+		Unclaims:              convertedUnclaims,
 	}
 
 	return request

aggsender/aggchainproofclient/aggchain_proof_client_test.go

@@ -60,6 +60,38 @@ func TestGenerateAggchainProof_Success(t *testing.T) {
 		},
 		GERLeavesWithBlockNumber:           nil,
 		ImportedBridgeExitsWithBlockNumber: nil,
+		RemovedGERs: []*agglayer.RemovedGER{
+			{
+				GlobalExitRoot: common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111"),
+				BlockNumber:    150,
+				LogIndex:       1,
+			},
+			{
+				GlobalExitRoot: common.HexToHash("0x2222222222222222222222222222222222222222222222222222222222222222"),
+				BlockNumber:    175,
+				LogIndex:       2,
+			},
+		},
+		Unclaims: []*agglayer.Unclaim{
+			{
+				GlobalIndex: &agglayer.GlobalIndex{
+					MainnetFlag: true,
+					RollupIndex: 1,
+					LeafIndex:   1,
+				},
+				BlockNumber: 160,
+				LogIndex:    3,
+			},
+			{
+				GlobalIndex: &agglayer.GlobalIndex{
+					MainnetFlag: false,
+					RollupIndex: 2,
+					LeafIndex:   2,
+				},
+				BlockNumber: 185,
+				LogIndex:    4,
+			},
+		},
 	}
 
 	result, err := client.GenerateAggchainProof(context.Background(), request)
@@ -207,6 +239,38 @@ func TestGenerateAggchainProof_Error(t *testing.T) {
 				},
 			},
 		},
+		RemovedGERs: []*agglayer.RemovedGER{
+			{
+				GlobalExitRoot: common.HexToHash("0x5555555555555555555555555555555555555555555555555555555555555555"),
+				BlockNumber:    350,
+				LogIndex:       5,
+			},
+			{
+				GlobalExitRoot: common.HexToHash("0x6666666666666666666666666666666666666666666666666666666666666666"),
+				BlockNumber:    375,
+				LogIndex:       6,
+			},
+		},
+		Unclaims: []*agglayer.Unclaim{
+			{
+				GlobalIndex: &agglayer.GlobalIndex{
+					MainnetFlag: true,
+					RollupIndex: 3,
+					LeafIndex:   3,
+				},
+				BlockNumber: 360,
+				LogIndex:    7,
+			},
+			{
+				GlobalIndex: &agglayer.GlobalIndex{
+					MainnetFlag: false,
+					RollupIndex: 4,
+					LeafIndex:   4,
+				},
+				BlockNumber: 385,
+				LogIndex:    8,
+			},
+		},
 	}
 
 	result, err := client.GenerateAggchainProof(context.Background(), request)

aggsender/aggsender.go

@@ -69,6 +69,7 @@ func New(
 	epochNotifier types.EpochNotifier,
 	l1Client aggkittypes.BaseEthereumClienter,
 	l2Client aggkittypes.BaseEthereumClienter,
+	agglayerBridgeL2Addr common.Address,
 	rollupDataQuerier types.RollupDataQuerier,
 	committeeQuerier types.MultisigQuerier,
 ) (*AggSender, error) {
@@ -101,6 +102,7 @@ func New(
 		l2Client,
 		l1InfoTreeSyncer,
 		l2Syncer,
+		agglayerBridgeL2Addr,
 		rollupDataQuerier,
 		committeeQuerier,
 	)

aggsender/aggsender_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/agglayer/aggkit/aggsender/mocks"
 	aggsendertypes "github.com/agglayer/aggkit/aggsender/types"
 	"github.com/agglayer/aggkit/bridgesync"
+	bridgesynctypes "github.com/agglayer/aggkit/bridgesync/types"
 	aggkitcommon "github.com/agglayer/aggkit/common"
 	"github.com/agglayer/aggkit/config/types"
 	mocksdb "github.com/agglayer/aggkit/db/compatibility/mocks"
@@ -108,6 +109,7 @@ func TestAggSenderStart(t *testing.T) {
 		epochNotifierMock,
 		nil, // l1 client
 		nil, // l2 client
+		common.Address{},
 		rollupQuerierMock,
 		committeQuerierMock,
 	)
@@ -258,6 +260,7 @@ func TestSendCertificate_NoClaims(t *testing.T) {
 			DepositCount:       1,
 		},
 	}, []bridgesync.Claim{}, nil).Once()
+	mockL2BridgeQuerier.EXPECT().GetUnsetClaimsForBlockRange(mock.Anything, uint64(11), uint64(50)).Return([]bridgesynctypes.Unclaim{}, nil).Once()
 	mockL1Querier.EXPECT().GetLatestFinalizedL1InfoRoot(ctx).Return(&treetypes.Root{}, nil, nil).Once()
 	mockL2BridgeQuerier.EXPECT().GetExitRootByIndex(mock.Anything, uint32(1)).Return(common.Hash{}, nil).Once()
 	mockL2BridgeQuerier.EXPECT().OriginNetwork().Return(uint32(1)).Once()
@@ -523,6 +526,7 @@ func TestNewAggSender(t *testing.T) {
 		nil, // epoch notifier
 		nil, // l1 client
 		nil, // l2 client
+		common.Address{},
 		mockRollupQuerier,
 		mockCommitteeQuerier,
 	)

aggsender/flows/builder_flow_aggchain_prover.go

@@ -199,6 +199,12 @@ func (a *AggchainProverBuilderFlow) GetCertificateBuildParams(
 			return nil, fmt.Errorf("aggchainProverFlow - error getting bridges and claims: %w", err)
 		}
 
+		unclaims, err := a.l2BridgeQuerier.GetUnsetClaimsForBlockRange(ctx,
+			fromBlock, toBlock)
+		if err != nil {
+			return nil, fmt.Errorf("error getting unset claims for block range: %w", err)
+		}
+
 		buildParams := &types.CertificateBuildParams{
 			FromBlock:           fromBlock,
 			ToBlock:             toBlock,
@@ -208,6 +214,7 @@ func (a *AggchainProverBuilderFlow) GetCertificateBuildParams(
 			LastSentCertificate: lastSentCert,
 			CreatedAt:           lastSentCert.CreatedAt,
 			CertificateType:     typeCert,
+			Unclaims:            unclaims,
 		}
 		if a.featureMaxL2Block != nil {
 			// If the feature is enabled, we need to adapt the build params