chore: update aggkit

.github/test_fork11_rollup_e2e_args.json

@@ -1,4 +1,7 @@
 {
+  "deployment_stages": {
+    "deploy_optimism_rollup": false
+  },
   "args": {
     "zkevm_contracts_image": "leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1",
     "zkevm_prover_image": "hermeznetwork/zkevm-prover:v7.0.4-hotfix.2-fork.11",
@@ -8,6 +11,7 @@
     "gas_token_address": "",
     "consensus_contract_type": "rollup",
     "sequencer_type": "erigon",
-    "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.19"
+    "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.19",
+    "additional_services": []
   }
 }

.github/test_fork12_cdk_validium_e2e_args.json

@@ -1,7 +1,8 @@
 {
   "deployment_stages": {
     "deploy_aggkit_node": true,
-    "deploy_cdk_bridge_infra": false
+    "deploy_cdk_bridge_infra": false,
+    "deploy_optimism_rollup": false
   },
   "args": {
     "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-rc.5-fork.12",
@@ -11,8 +12,9 @@
     "gas_token_address": "",
     "consensus_contract_type": "cdk_validium",
     "sequencer_type": "erigon",
-    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta8-tmp-bridge",
+    "aggkit_image": "ghcr.io/agglayer/aggkit:0.5.0-beta1",
     "aggkit_components": "bridge",
-    "enable_aggkit_claim_sponsor": true
+    "enable_aggkit_claim_sponsor": false,
+    "additional_services": []
   }
 }

.github/test_fork12_pessimistic_e2e_args.json

@@ -1,7 +1,8 @@
 {
   "deployment_stages": {
     "deploy_aggkit_node": true,
-    "deploy_cdk_bridge_infra": false
+    "deploy_cdk_bridge_infra": false,
+    "deploy_optimism_rollup": false
   },
   "args": {
     "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-rc.5-fork.12",
@@ -11,8 +12,9 @@
     "gas_token_address": "",
     "consensus_contract_type": "pessimistic",
     "sequencer_type": "erigon",
-    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta8-tmp-bridge",
+    "aggkit_image": "ghcr.io/agglayer/aggkit:0.5.0-beta1",
     "aggkit_components": "aggsender,bridge",
-    "enable_aggkit_claim_sponsor": true
+    "enable_aggkit_claim_sponsor": false,
+    "additional_services": []
   }
 }

.github/test_fork12_rollup_e2e_args.json

@@ -1,7 +1,8 @@
 {
   "deployment_stages": {
     "deploy_aggkit_node": true,
-    "deploy_cdk_bridge_infra": false
+    "deploy_cdk_bridge_infra": false,
+    "deploy_optimism_rollup": false
   },
   "args": {
     "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-rc.5-fork.12",
@@ -11,8 +12,9 @@
     "gas_token_address": "",
     "consensus_contract_type": "rollup",
     "sequencer_type": "erigon",
-    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta8-tmp-bridge",
+    "aggkit_image": "ghcr.io/agglayer/aggkit:0.5.0-beta1",
     "aggkit_components": "bridge",
-    "enable_aggkit_claim_sponsor": true
+    "enable_aggkit_claim_sponsor": false,
+    "additional_services": []
   }
 }

.github/test_fork12_rollup_e2e_args_zkevm_bridge.json

@@ -1,6 +1,7 @@
 {
   "deployment_stages": {
-    "deploy_cdk_bridge_infra": true
+    "deploy_cdk_bridge_infra": true,
+    "deploy_optimism_rollup": false
   },
   "args": {
     "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-rc.5-fork.12",
@@ -9,6 +10,7 @@
     "gas_token_enabled": true,
     "gas_token_address": "",
     "consensus_contract_type": "rollup",
-    "sequencer_type": "erigon"
+    "sequencer_type": "erigon",
+    "additional_services": []
   }
 }

.github/test_fork12_rollup_multi_e2e_args_1.json

@@ -2,7 +2,8 @@
   "deployment_stages": {
     "deploy_l2_contracts": true,
     "deploy_aggkit_node": true,
-    "deploy_cdk_bridge_infra": false
+    "deploy_cdk_bridge_infra": false,
+    "deploy_optimism_rollup": false
   },
   "args": {
     "verbosity": "debug",
@@ -11,8 +12,9 @@
     "cdk_node_image": "cdk:local",
     "consensus_contract_type": "rollup",
     "sequencer_type": "erigon",
-    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta8-tmp-bridge",
+    "aggkit_image": "ghcr.io/agglayer/aggkit:0.5.0-beta1",
     "aggkit_components": "bridge",
-    "enable_aggkit_claim_sponsor": true
+    "enable_aggkit_claim_sponsor": false,
+    "additional_services": []
   }
 }

.github/test_fork12_rollup_multi_e2e_args_2.json

@@ -3,7 +3,8 @@
     "deploy_l1": false,
     "deploy_agglayer": false,
     "deploy_aggkit_node": true,
-    "deploy_cdk_bridge_infra": false
+    "deploy_cdk_bridge_infra": false,
+    "deploy_optimism_rollup": false
   },
   "args": {
     "verbosity": "debug",
@@ -26,8 +27,9 @@
     "zkevm_l2_proofsigner_private_key": "0xc7fe3a006d75ba9326d9792523385abb49057c66aee0b8b4248821a89713f975",
     "cdk_node_image": "cdk:local",
     "consensus_contract_type": "rollup",
-    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta8-tmp-bridge",
+    "aggkit_image": "ghcr.io/agglayer/aggkit:0.5.0-beta1",
     "aggkit_components": "bridge",
-    "enable_aggkit_claim_sponsor": true
+    "enable_aggkit_claim_sponsor": false,
+    "additional_services": []
   }
 }

.github/test_fork9_cdk_validium_e2e_args.json

@@ -1,4 +1,7 @@
 {
+  "deployment_stages": {
+    "deploy_optimism_rollup": false
+  },
   "args": {
     "zkevm_contracts_image": "leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1",
     "zkevm_prover_image": "hermeznetwork/zkevm-prover:v6.0.8",

.github/workflows/test-e2e.yml

@@ -79,11 +79,11 @@ jobs:
     needs:
       - build-cdk-image
       - read-test-args
-    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@9fe80e11044b27b3453d5e625ef5d93e7bb40590
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
-      agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
+      agglayer-e2e-ref: 9fe80e11044b27b3453d5e625ef5d93e7bb40590
       test-name: test-fork9-cdk-validium-e2e
       kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork9-cdk-validium-e2e-args }}
 
@@ -102,11 +102,11 @@ jobs:
     needs:
       - build-cdk-image
       - read-test-args
-    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@9fe80e11044b27b3453d5e625ef5d93e7bb40590
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
-      agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
+      agglayer-e2e-ref: 9fe80e11044b27b3453d5e625ef5d93e7bb40590
       test-name: test-fork11-rollup-e2e
       kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork11-rollup-e2e-args }}
 
@@ -125,11 +125,11 @@ jobs:
     needs:
       - build-cdk-image
       - read-test-args
-    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@9fe80e11044b27b3453d5e625ef5d93e7bb40590
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
-      agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
+      agglayer-e2e-ref: 9fe80e11044b27b3453d5e625ef5d93e7bb40590
       test-name: test-fork12-cdk-validium-e2e
       kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork12-cdk-validium-e2e-args }}
 
@@ -148,11 +148,11 @@ jobs:
     needs:
       - build-cdk-image
       - read-test-args
-    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@9fe80e11044b27b3453d5e625ef5d93e7bb40590
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
-      agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
+      agglayer-e2e-ref: 9fe80e11044b27b3453d5e625ef5d93e7bb40590
       test-name: test-fork12-rollup-e2e
       kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork12-rollup-e2e-args }}
 
@@ -171,11 +171,11 @@ jobs:
     needs:
       - build-cdk-image
       - read-test-args
-    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@9fe80e11044b27b3453d5e625ef5d93e7bb40590
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
-      agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
+      agglayer-e2e-ref: 9fe80e11044b27b3453d5e625ef5d93e7bb40590
       test-name: test-fork12-pessimistic-e2e
       kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork12-pessimistic-e2e-args }}
 
@@ -194,11 +194,11 @@ jobs:
     needs:
       - build-cdk-image
       - read-test-args
-    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@9fe80e11044b27b3453d5e625ef5d93e7bb40590
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
-      agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
+      agglayer-e2e-ref: 9fe80e11044b27b3453d5e625ef5d93e7bb40590
       test-name: test-fork12-rollup-e2e-zkevm-bridge
       kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork12-rollup-e2e-args-zkevm-bridge }}
 
@@ -220,7 +220,7 @@ jobs:
     uses: agglayer/e2e/.github/workflows/cdk-e2e-multi-chains.yml@91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
     secrets: inherit
     with:
-      kurtosis-cdk-ref: 891e53fa18ce9c908eeac8e0ea9c90eb17614fef
+      kurtosis-cdk-ref: 65668b05d65785df3aa4dd0d863ee7e8551c3009
       agglayer-e2e-ref: 91331909b6064ee9c84fb4a7abda4cc5b9c40bfc
       kurtosis-cdk-args-1: ${{ needs.read-test-args.outputs.kurtosis-cdk-args-1 }}
       kurtosis-cdk-args-2: ${{ needs.read-test-args.outputs.kurtosis-cdk-args-2 }}

.github/workflows/test-unit.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.24.2]
+        go-version: [1.24.4]
         goarch: ["amd64"]
     runs-on: ubuntu-latest
     steps:

Dockerfile

@@ -1,5 +1,5 @@
 # CONTAINER FOR BUILDING BINARY
-FROM --platform=${BUILDPLATFORM} golang:1.24.2 AS build
+FROM --platform=${BUILDPLATFORM} golang:1.24.4 AS build
 
 WORKDIR $GOPATH/src/github.com/0xPolygon/cdk
 

aggregator/db/dbstorage/dbstorage.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 
 	"github.com/agglayer/aggkit/db"
+	dbtypes "github.com/agglayer/aggkit/db/types"
 )
 
 // DBStorage implements the Storage interface
@@ -22,11 +23,11 @@ func NewDBStorage(dbPath string) (*DBStorage, error) {
 	return &DBStorage{DB: db}, nil
 }
 
-func (d *DBStorage) BeginTx(ctx context.Context, options *sql.TxOptions) (db.Txer, error) {
+func (d *DBStorage) BeginTx(ctx context.Context, options *sql.TxOptions) (dbtypes.Txer, error) {
 	return db.NewTx(ctx, d.DB)
 }
 
-func (d *DBStorage) getExecQuerier(dbTx db.Txer) db.Querier {
+func (d *DBStorage) getExecQuerier(dbTx dbtypes.Txer) dbtypes.Querier {
 	if dbTx == nil {
 		return d.DB
 	}

aggregator/db/dbstorage/proof.go

@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/0xPolygon/cdk/state"
-	"github.com/agglayer/aggkit/db"
+	dbtypes "github.com/agglayer/aggkit/db/types"
 )
 
 // CheckProofExistsForBatch checks if the batch is already included in any proof
-func (d *DBStorage) CheckProofExistsForBatch(ctx context.Context, batchNumber uint64, dbTx db.Txer) (bool, error) {
+func (d *DBStorage) CheckProofExistsForBatch(ctx context.Context, batchNumber uint64, dbTx dbtypes.Txer) (bool, error) {
 	const checkProofExistsForBatchSQL = `
 		SELECT EXISTS (SELECT 1 FROM proof p WHERE $1 >= p.batch_num AND $1 <= p.batch_num_final)
 		`
@@ -27,7 +27,7 @@ func (d *DBStorage) CheckProofExistsForBatch(ctx context.Context, batchNumber ui
 
 // CheckProofContainsCompleteSequences checks if a recursive proof contains complete sequences
 func (d *DBStorage) CheckProofContainsCompleteSequences(
-	ctx context.Context, proof *state.Proof, dbTx db.Txer,
+	ctx context.Context, proof *state.Proof, dbTx dbtypes.Txer,
 ) (bool, error) {
 	const getProofContainsCompleteSequencesSQL = `
 		SELECT EXISTS (SELECT 1 FROM sequence s1 WHERE s1.from_batch_num = $1) AND
@@ -44,7 +44,7 @@ func (d *DBStorage) CheckProofContainsCompleteSequences(
 
 // GetProofReadyToVerify return the proof that is ready to verify
 func (d *DBStorage) GetProofReadyToVerify(
-	ctx context.Context, lastVerfiedBatchNumber uint64, dbTx db.Txer,
+	ctx context.Context, lastVerfiedBatchNumber uint64, dbTx dbtypes.Txer,
 ) (*state.Proof, error) {
 	const getProofReadyToVerifySQL = `
 		SELECT 
@@ -103,7 +103,7 @@ func (d *DBStorage) GetProofReadyToVerify(
 }
 
 // GetProofsToAggregate return the next to proof that it is possible to aggregate
-func (d *DBStorage) GetProofsToAggregate(ctx context.Context, dbTx db.Txer) (*state.Proof, *state.Proof, error) {
+func (d *DBStorage) GetProofsToAggregate(ctx context.Context, dbTx dbtypes.Txer) (*state.Proof, *state.Proof, error) {
 	var (
 		proof1 = &state.Proof{}
 		proof2 = &state.Proof{}
@@ -209,7 +209,7 @@ func (d *DBStorage) GetProofsToAggregate(ctx context.Context, dbTx db.Txer) (*st
 }
 
 // AddGeneratedProof adds a generated proof to the storage
-func (d *DBStorage) AddGeneratedProof(ctx context.Context, proof *state.Proof, dbTx db.Txer) error {
+func (d *DBStorage) AddGeneratedProof(ctx context.Context, proof *state.Proof, dbTx dbtypes.Txer) error {
 	const addGeneratedProofSQL = `
 		INSERT INTO proof (
 			batch_num, batch_num_final, proof, proof_id, input_prover, prover, 
@@ -256,7 +256,7 @@ func (d *DBStorage) AddGeneratedProof(ctx context.Context, proof *state.Proof, d
 }
 
 // UpdateGeneratedProof updates a generated proof in the storage
-func (d *DBStorage) UpdateGeneratedProof(ctx context.Context, proof *state.Proof, dbTx db.Txer) error {
+func (d *DBStorage) UpdateGeneratedProof(ctx context.Context, proof *state.Proof, dbTx dbtypes.Txer) error {
 	const updateGeneratedProofSQL = `
 	UPDATE proof 
 	SET proof = $3, 
@@ -299,7 +299,7 @@ func (d *DBStorage) UpdateGeneratedProof(ctx context.Context, proof *state.Proof
 // DeleteGeneratedProofs deletes from the storage the generated proofs falling
 // inside the batch numbers range.
 func (d *DBStorage) DeleteGeneratedProofs(
-	ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx db.Txer,
+	ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx dbtypes.Txer,
 ) error {
 	const deleteGeneratedProofSQL = "DELETE FROM proof WHERE batch_num >= $1 AND batch_num_final <= $2"
 	e := d.getExecQuerier(dbTx)
@@ -309,7 +309,7 @@ func (d *DBStorage) DeleteGeneratedProofs(
 
 // CleanupGeneratedProofs deletes from the storage the generated proofs up to
 // the specified batch number included.
-func (d *DBStorage) CleanupGeneratedProofs(ctx context.Context, batchNumber uint64, dbTx db.Txer) error {
+func (d *DBStorage) CleanupGeneratedProofs(ctx context.Context, batchNumber uint64, dbTx dbtypes.Txer) error {
 	const deleteGeneratedProofSQL = "DELETE FROM proof WHERE batch_num_final <= $1"
 	e := d.getExecQuerier(dbTx)
 	_, err := e.Exec(deleteGeneratedProofSQL, batchNumber)
@@ -318,7 +318,7 @@ func (d *DBStorage) CleanupGeneratedProofs(ctx context.Context, batchNumber uint
 
 // CleanupLockedProofs deletes from the storage the proofs locked in generating
 // state for more than the provided threshold.
-func (d *DBStorage) CleanupLockedProofs(ctx context.Context, duration string, dbTx db.Txer) (int64, error) {
+func (d *DBStorage) CleanupLockedProofs(ctx context.Context, duration string, dbTx dbtypes.Txer) (int64, error) {
 	seconds, err := convertDurationToSeconds(duration)
 	if err != nil {
 		return 0, err
@@ -337,7 +337,7 @@ func (d *DBStorage) CleanupLockedProofs(ctx context.Context, duration string, db
 
 // DeleteUngeneratedProofs deletes ungenerated proofs.
 // This method is meant to be use during aggregator boot-up sequence
-func (d *DBStorage) DeleteUngeneratedProofs(ctx context.Context, dbTx db.Txer) error {
+func (d *DBStorage) DeleteUngeneratedProofs(ctx context.Context, dbTx dbtypes.Txer) error {
 	const deleteUngeneratedProofsSQL = "DELETE FROM proof WHERE generating_since IS NOT NULL"
 	e := d.getExecQuerier(dbTx)
 	_, err := e.Exec(deleteUngeneratedProofsSQL)