diff --git a/.github/test_fork11_rollup_e2e_args.json b/.github/test_fork11_rollup_e2e_args.json index bcc35691b..bdbbc67b2 100644 --- a/.github/test_fork11_rollup_e2e_args.json +++ b/.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": [] } } diff --git a/.github/test_fork12_cdk_validium_e2e_args.json b/.github/test_fork12_cdk_validium_e2e_args.json index e98290694..3f1d24c15 100644 --- a/.github/test_fork12_cdk_validium_e2e_args.json +++ b/.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": [] } } diff --git a/.github/test_fork12_pessimistic_e2e_args.json b/.github/test_fork12_pessimistic_e2e_args.json index 8143f0b83..1421ff707 100644 --- a/.github/test_fork12_pessimistic_e2e_args.json +++ b/.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": [] } } diff --git a/.github/test_fork12_rollup_e2e_args.json b/.github/test_fork12_rollup_e2e_args.json index 70cc6d4ea..2d950e3eb 100644 --- a/.github/test_fork12_rollup_e2e_args.json +++ b/.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": [] } } diff --git a/.github/test_fork12_rollup_e2e_args_zkevm_bridge.json b/.github/test_fork12_rollup_e2e_args_zkevm_bridge.json index 32791d1c9..b03032584 100644 --- a/.github/test_fork12_rollup_e2e_args_zkevm_bridge.json +++ b/.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": [] } } diff --git a/.github/test_fork12_rollup_multi_e2e_args_1.json b/.github/test_fork12_rollup_multi_e2e_args_1.json index d269e3c22..9d9b97aff 100644 --- a/.github/test_fork12_rollup_multi_e2e_args_1.json +++ b/.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": [] } } diff --git a/.github/test_fork12_rollup_multi_e2e_args_2.json b/.github/test_fork12_rollup_multi_e2e_args_2.json index 7c0452d12..081f0fd38 100644 --- a/.github/test_fork12_rollup_multi_e2e_args_2.json +++ b/.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": [] } } diff --git a/.github/test_fork9_cdk_validium_e2e_args.json b/.github/test_fork9_cdk_validium_e2e_args.json index 62fb98659..73bbe1602 100644 --- a/.github/test_fork9_cdk_validium_e2e_args.json +++ b/.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", diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index c2f66a339..7c6fb4033 100644 --- a/.github/workflows/test-e2e.yml +++ b/.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 }} diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 2e947f947..8547a1109 100644 --- a/.github/workflows/test-unit.yml +++ b/.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: diff --git a/Dockerfile b/Dockerfile index ebb72c63e..a40071f64 100644 --- a/Dockerfile +++ b/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 diff --git a/agglayer/mock_agglayer_client_interface.go b/agglayer/mock_agglayer_client_interface.go index ba870086b..03d6282e0 100644 --- a/agglayer/mock_agglayer_client_interface.go +++ b/agglayer/mock_agglayer_client_interface.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package agglayer diff --git a/aggregator/db/dbstorage/dbstorage.go b/aggregator/db/dbstorage/dbstorage.go index 05af9aa76..ff7a0324d 100644 --- a/aggregator/db/dbstorage/dbstorage.go +++ b/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 } diff --git a/aggregator/db/dbstorage/proof.go b/aggregator/db/dbstorage/proof.go index 46a6def79..7e64f9e5d 100644 --- a/aggregator/db/dbstorage/proof.go +++ b/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) diff --git a/aggregator/db/dbstorage/sequence.go b/aggregator/db/dbstorage/sequence.go index ed509e64f..bc1dbeeeb 100644 --- a/aggregator/db/dbstorage/sequence.go +++ b/aggregator/db/dbstorage/sequence.go @@ -4,11 +4,11 @@ import ( "context" "github.com/0xPolygon/cdk/state" - "github.com/agglayer/aggkit/db" + dbtypes "github.com/agglayer/aggkit/db/types" ) // AddSequence stores the sequence information to allow the aggregator verify sequences. -func (d *DBStorage) AddSequence(ctx context.Context, sequence state.Sequence, dbTx db.Txer) error { +func (d *DBStorage) AddSequence(ctx context.Context, sequence state.Sequence, dbTx dbtypes.Txer) error { const addSequenceSQL = ` INSERT INTO sequence (from_batch_num, to_batch_num) VALUES($1, $2) diff --git a/aggregator/interfaces.go b/aggregator/interfaces.go index 3a868d56c..f9407e9c5 100644 --- a/aggregator/interfaces.go +++ b/aggregator/interfaces.go @@ -11,7 +11,7 @@ import ( "github.com/0xPolygon/cdk/state" "github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager" ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types" - "github.com/agglayer/aggkit/db" + dbtypes "github.com/agglayer/aggkit/db/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto/kzg4844" @@ -55,18 +55,18 @@ type aggregatorTxProfitabilityChecker interface { // StateInterface gathers the methods to interact with the state. type StorageInterface interface { - BeginTx(ctx context.Context, options *sql.TxOptions) (db.Txer, error) - CheckProofContainsCompleteSequences(ctx context.Context, proof *state.Proof, dbTx db.Txer) (bool, error) - GetProofReadyToVerify(ctx context.Context, lastVerfiedBatchNumber uint64, dbTx db.Txer) (*state.Proof, error) - GetProofsToAggregate(ctx context.Context, dbTx db.Txer) (*state.Proof, *state.Proof, error) - AddGeneratedProof(ctx context.Context, proof *state.Proof, dbTx db.Txer) error - UpdateGeneratedProof(ctx context.Context, proof *state.Proof, dbTx db.Txer) error - DeleteGeneratedProofs(ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx db.Txer) error - DeleteUngeneratedProofs(ctx context.Context, dbTx db.Txer) error - CleanupGeneratedProofs(ctx context.Context, batchNumber uint64, dbTx db.Txer) error - CleanupLockedProofs(ctx context.Context, duration string, dbTx db.Txer) (int64, error) - CheckProofExistsForBatch(ctx context.Context, batchNumber uint64, dbTx db.Txer) (bool, error) - AddSequence(ctx context.Context, sequence state.Sequence, dbTx db.Txer) error + BeginTx(ctx context.Context, options *sql.TxOptions) (dbtypes.Txer, error) + CheckProofContainsCompleteSequences(ctx context.Context, proof *state.Proof, dbTx dbtypes.Txer) (bool, error) + GetProofReadyToVerify(ctx context.Context, lastVerfiedBatchNumber uint64, dbTx dbtypes.Txer) (*state.Proof, error) + GetProofsToAggregate(ctx context.Context, dbTx dbtypes.Txer) (*state.Proof, *state.Proof, error) + AddGeneratedProof(ctx context.Context, proof *state.Proof, dbTx dbtypes.Txer) error + UpdateGeneratedProof(ctx context.Context, proof *state.Proof, dbTx dbtypes.Txer) error + DeleteGeneratedProofs(ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx dbtypes.Txer) error + DeleteUngeneratedProofs(ctx context.Context, dbTx dbtypes.Txer) error + CleanupGeneratedProofs(ctx context.Context, batchNumber uint64, dbTx dbtypes.Txer) error + CleanupLockedProofs(ctx context.Context, duration string, dbTx dbtypes.Txer) (int64, error) + CheckProofExistsForBatch(ctx context.Context, batchNumber uint64, dbTx dbtypes.Txer) (bool, error) + AddSequence(ctx context.Context, sequence state.Sequence, dbTx dbtypes.Txer) error } // EthTxManagerClient represents the eth tx manager interface diff --git a/aggregator/mocks/mock_eth_tx_manager_client.go b/aggregator/mocks/mock_eth_tx_manager_client.go index 339e6b893..e50a7a529 100644 --- a/aggregator/mocks/mock_eth_tx_manager_client.go +++ b/aggregator/mocks/mock_eth_tx_manager_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/aggregator/mocks/mock_etherman.go b/aggregator/mocks/mock_etherman.go index 8dab429a4..df55f69b8 100644 --- a/aggregator/mocks/mock_etherman.go +++ b/aggregator/mocks/mock_etherman.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/aggregator/mocks/mock_prover_interface.go b/aggregator/mocks/mock_prover_interface.go index f48d4ff07..c63671e08 100644 --- a/aggregator/mocks/mock_prover_interface.go +++ b/aggregator/mocks/mock_prover_interface.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/aggregator/mocks/mock_rpc_interface.go b/aggregator/mocks/mock_rpc_interface.go index 6e3871b3b..a11c8254b 100644 --- a/aggregator/mocks/mock_rpc_interface.go +++ b/aggregator/mocks/mock_rpc_interface.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/aggregator/mocks/mock_storage_interface.go b/aggregator/mocks/mock_storage_interface.go index 42aaf118a..36fe3782a 100644 --- a/aggregator/mocks/mock_storage_interface.go +++ b/aggregator/mocks/mock_storage_interface.go @@ -1,16 +1,16 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks import ( context "context" + sql "database/sql" - db "github.com/agglayer/aggkit/db" mock "github.com/stretchr/testify/mock" - sql "database/sql" - state "github.com/0xPolygon/cdk/state" + + types "github.com/agglayer/aggkit/db/types" ) // StorageInterfaceMock is an autogenerated mock type for the StorageInterface type @@ -27,7 +27,7 @@ func (_m *StorageInterfaceMock) EXPECT() *StorageInterfaceMock_Expecter { } // AddGeneratedProof provides a mock function with given fields: ctx, proof, dbTx -func (_m *StorageInterfaceMock) AddGeneratedProof(ctx context.Context, proof *state.Proof, dbTx db.Txer) error { +func (_m *StorageInterfaceMock) AddGeneratedProof(ctx context.Context, proof *state.Proof, dbTx types.Txer) error { ret := _m.Called(ctx, proof, dbTx) if len(ret) == 0 { @@ -35,7 +35,7 @@ func (_m *StorageInterfaceMock) AddGeneratedProof(ctx context.Context, proof *st } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, db.Txer) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, types.Txer) error); ok { r0 = rf(ctx, proof, dbTx) } else { r0 = ret.Error(0) @@ -52,14 +52,14 @@ type StorageInterfaceMock_AddGeneratedProof_Call struct { // AddGeneratedProof is a helper method to define mock.On call // - ctx context.Context // - proof *state.Proof -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) AddGeneratedProof(ctx interface{}, proof interface{}, dbTx interface{}) *StorageInterfaceMock_AddGeneratedProof_Call { return &StorageInterfaceMock_AddGeneratedProof_Call{Call: _e.mock.On("AddGeneratedProof", ctx, proof, dbTx)} } -func (_c *StorageInterfaceMock_AddGeneratedProof_Call) Run(run func(ctx context.Context, proof *state.Proof, dbTx db.Txer)) *StorageInterfaceMock_AddGeneratedProof_Call { +func (_c *StorageInterfaceMock_AddGeneratedProof_Call) Run(run func(ctx context.Context, proof *state.Proof, dbTx types.Txer)) *StorageInterfaceMock_AddGeneratedProof_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*state.Proof), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(*state.Proof), args[2].(types.Txer)) }) return _c } @@ -69,13 +69,13 @@ func (_c *StorageInterfaceMock_AddGeneratedProof_Call) Return(_a0 error) *Storag return _c } -func (_c *StorageInterfaceMock_AddGeneratedProof_Call) RunAndReturn(run func(context.Context, *state.Proof, db.Txer) error) *StorageInterfaceMock_AddGeneratedProof_Call { +func (_c *StorageInterfaceMock_AddGeneratedProof_Call) RunAndReturn(run func(context.Context, *state.Proof, types.Txer) error) *StorageInterfaceMock_AddGeneratedProof_Call { _c.Call.Return(run) return _c } // AddSequence provides a mock function with given fields: ctx, sequence, dbTx -func (_m *StorageInterfaceMock) AddSequence(ctx context.Context, sequence state.Sequence, dbTx db.Txer) error { +func (_m *StorageInterfaceMock) AddSequence(ctx context.Context, sequence state.Sequence, dbTx types.Txer) error { ret := _m.Called(ctx, sequence, dbTx) if len(ret) == 0 { @@ -83,7 +83,7 @@ func (_m *StorageInterfaceMock) AddSequence(ctx context.Context, sequence state. } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, state.Sequence, db.Txer) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, state.Sequence, types.Txer) error); ok { r0 = rf(ctx, sequence, dbTx) } else { r0 = ret.Error(0) @@ -100,14 +100,14 @@ type StorageInterfaceMock_AddSequence_Call struct { // AddSequence is a helper method to define mock.On call // - ctx context.Context // - sequence state.Sequence -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) AddSequence(ctx interface{}, sequence interface{}, dbTx interface{}) *StorageInterfaceMock_AddSequence_Call { return &StorageInterfaceMock_AddSequence_Call{Call: _e.mock.On("AddSequence", ctx, sequence, dbTx)} } -func (_c *StorageInterfaceMock_AddSequence_Call) Run(run func(ctx context.Context, sequence state.Sequence, dbTx db.Txer)) *StorageInterfaceMock_AddSequence_Call { +func (_c *StorageInterfaceMock_AddSequence_Call) Run(run func(ctx context.Context, sequence state.Sequence, dbTx types.Txer)) *StorageInterfaceMock_AddSequence_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(state.Sequence), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(state.Sequence), args[2].(types.Txer)) }) return _c } @@ -117,29 +117,29 @@ func (_c *StorageInterfaceMock_AddSequence_Call) Return(_a0 error) *StorageInter return _c } -func (_c *StorageInterfaceMock_AddSequence_Call) RunAndReturn(run func(context.Context, state.Sequence, db.Txer) error) *StorageInterfaceMock_AddSequence_Call { +func (_c *StorageInterfaceMock_AddSequence_Call) RunAndReturn(run func(context.Context, state.Sequence, types.Txer) error) *StorageInterfaceMock_AddSequence_Call { _c.Call.Return(run) return _c } // BeginTx provides a mock function with given fields: ctx, options -func (_m *StorageInterfaceMock) BeginTx(ctx context.Context, options *sql.TxOptions) (db.Txer, error) { +func (_m *StorageInterfaceMock) BeginTx(ctx context.Context, options *sql.TxOptions) (types.Txer, error) { ret := _m.Called(ctx, options) if len(ret) == 0 { panic("no return value specified for BeginTx") } - var r0 db.Txer + var r0 types.Txer var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *sql.TxOptions) (db.Txer, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *sql.TxOptions) (types.Txer, error)); ok { return rf(ctx, options) } - if rf, ok := ret.Get(0).(func(context.Context, *sql.TxOptions) db.Txer); ok { + if rf, ok := ret.Get(0).(func(context.Context, *sql.TxOptions) types.Txer); ok { r0 = rf(ctx, options) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(db.Txer) + r0 = ret.Get(0).(types.Txer) } } @@ -171,18 +171,18 @@ func (_c *StorageInterfaceMock_BeginTx_Call) Run(run func(ctx context.Context, o return _c } -func (_c *StorageInterfaceMock_BeginTx_Call) Return(_a0 db.Txer, _a1 error) *StorageInterfaceMock_BeginTx_Call { +func (_c *StorageInterfaceMock_BeginTx_Call) Return(_a0 types.Txer, _a1 error) *StorageInterfaceMock_BeginTx_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *StorageInterfaceMock_BeginTx_Call) RunAndReturn(run func(context.Context, *sql.TxOptions) (db.Txer, error)) *StorageInterfaceMock_BeginTx_Call { +func (_c *StorageInterfaceMock_BeginTx_Call) RunAndReturn(run func(context.Context, *sql.TxOptions) (types.Txer, error)) *StorageInterfaceMock_BeginTx_Call { _c.Call.Return(run) return _c } // CheckProofContainsCompleteSequences provides a mock function with given fields: ctx, proof, dbTx -func (_m *StorageInterfaceMock) CheckProofContainsCompleteSequences(ctx context.Context, proof *state.Proof, dbTx db.Txer) (bool, error) { +func (_m *StorageInterfaceMock) CheckProofContainsCompleteSequences(ctx context.Context, proof *state.Proof, dbTx types.Txer) (bool, error) { ret := _m.Called(ctx, proof, dbTx) if len(ret) == 0 { @@ -191,16 +191,16 @@ func (_m *StorageInterfaceMock) CheckProofContainsCompleteSequences(ctx context. var r0 bool var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, db.Txer) (bool, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, types.Txer) (bool, error)); ok { return rf(ctx, proof, dbTx) } - if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, db.Txer) bool); ok { + if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, types.Txer) bool); ok { r0 = rf(ctx, proof, dbTx) } else { r0 = ret.Get(0).(bool) } - if rf, ok := ret.Get(1).(func(context.Context, *state.Proof, db.Txer) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, *state.Proof, types.Txer) error); ok { r1 = rf(ctx, proof, dbTx) } else { r1 = ret.Error(1) @@ -217,14 +217,14 @@ type StorageInterfaceMock_CheckProofContainsCompleteSequences_Call struct { // CheckProofContainsCompleteSequences is a helper method to define mock.On call // - ctx context.Context // - proof *state.Proof -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) CheckProofContainsCompleteSequences(ctx interface{}, proof interface{}, dbTx interface{}) *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call { return &StorageInterfaceMock_CheckProofContainsCompleteSequences_Call{Call: _e.mock.On("CheckProofContainsCompleteSequences", ctx, proof, dbTx)} } -func (_c *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call) Run(run func(ctx context.Context, proof *state.Proof, dbTx db.Txer)) *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call { +func (_c *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call) Run(run func(ctx context.Context, proof *state.Proof, dbTx types.Txer)) *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*state.Proof), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(*state.Proof), args[2].(types.Txer)) }) return _c } @@ -234,13 +234,13 @@ func (_c *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call) Return( return _c } -func (_c *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call) RunAndReturn(run func(context.Context, *state.Proof, db.Txer) (bool, error)) *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call { +func (_c *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call) RunAndReturn(run func(context.Context, *state.Proof, types.Txer) (bool, error)) *StorageInterfaceMock_CheckProofContainsCompleteSequences_Call { _c.Call.Return(run) return _c } // CheckProofExistsForBatch provides a mock function with given fields: ctx, batchNumber, dbTx -func (_m *StorageInterfaceMock) CheckProofExistsForBatch(ctx context.Context, batchNumber uint64, dbTx db.Txer) (bool, error) { +func (_m *StorageInterfaceMock) CheckProofExistsForBatch(ctx context.Context, batchNumber uint64, dbTx types.Txer) (bool, error) { ret := _m.Called(ctx, batchNumber, dbTx) if len(ret) == 0 { @@ -249,16 +249,16 @@ func (_m *StorageInterfaceMock) CheckProofExistsForBatch(ctx context.Context, ba var r0 bool var r1 error - if rf, ok := ret.Get(0).(func(context.Context, uint64, db.Txer) (bool, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, uint64, types.Txer) (bool, error)); ok { return rf(ctx, batchNumber, dbTx) } - if rf, ok := ret.Get(0).(func(context.Context, uint64, db.Txer) bool); ok { + if rf, ok := ret.Get(0).(func(context.Context, uint64, types.Txer) bool); ok { r0 = rf(ctx, batchNumber, dbTx) } else { r0 = ret.Get(0).(bool) } - if rf, ok := ret.Get(1).(func(context.Context, uint64, db.Txer) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, uint64, types.Txer) error); ok { r1 = rf(ctx, batchNumber, dbTx) } else { r1 = ret.Error(1) @@ -275,14 +275,14 @@ type StorageInterfaceMock_CheckProofExistsForBatch_Call struct { // CheckProofExistsForBatch is a helper method to define mock.On call // - ctx context.Context // - batchNumber uint64 -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) CheckProofExistsForBatch(ctx interface{}, batchNumber interface{}, dbTx interface{}) *StorageInterfaceMock_CheckProofExistsForBatch_Call { return &StorageInterfaceMock_CheckProofExistsForBatch_Call{Call: _e.mock.On("CheckProofExistsForBatch", ctx, batchNumber, dbTx)} } -func (_c *StorageInterfaceMock_CheckProofExistsForBatch_Call) Run(run func(ctx context.Context, batchNumber uint64, dbTx db.Txer)) *StorageInterfaceMock_CheckProofExistsForBatch_Call { +func (_c *StorageInterfaceMock_CheckProofExistsForBatch_Call) Run(run func(ctx context.Context, batchNumber uint64, dbTx types.Txer)) *StorageInterfaceMock_CheckProofExistsForBatch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(uint64), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(uint64), args[2].(types.Txer)) }) return _c } @@ -292,13 +292,13 @@ func (_c *StorageInterfaceMock_CheckProofExistsForBatch_Call) Return(_a0 bool, _ return _c } -func (_c *StorageInterfaceMock_CheckProofExistsForBatch_Call) RunAndReturn(run func(context.Context, uint64, db.Txer) (bool, error)) *StorageInterfaceMock_CheckProofExistsForBatch_Call { +func (_c *StorageInterfaceMock_CheckProofExistsForBatch_Call) RunAndReturn(run func(context.Context, uint64, types.Txer) (bool, error)) *StorageInterfaceMock_CheckProofExistsForBatch_Call { _c.Call.Return(run) return _c } // CleanupGeneratedProofs provides a mock function with given fields: ctx, batchNumber, dbTx -func (_m *StorageInterfaceMock) CleanupGeneratedProofs(ctx context.Context, batchNumber uint64, dbTx db.Txer) error { +func (_m *StorageInterfaceMock) CleanupGeneratedProofs(ctx context.Context, batchNumber uint64, dbTx types.Txer) error { ret := _m.Called(ctx, batchNumber, dbTx) if len(ret) == 0 { @@ -306,7 +306,7 @@ func (_m *StorageInterfaceMock) CleanupGeneratedProofs(ctx context.Context, batc } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, uint64, db.Txer) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, uint64, types.Txer) error); ok { r0 = rf(ctx, batchNumber, dbTx) } else { r0 = ret.Error(0) @@ -323,14 +323,14 @@ type StorageInterfaceMock_CleanupGeneratedProofs_Call struct { // CleanupGeneratedProofs is a helper method to define mock.On call // - ctx context.Context // - batchNumber uint64 -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) CleanupGeneratedProofs(ctx interface{}, batchNumber interface{}, dbTx interface{}) *StorageInterfaceMock_CleanupGeneratedProofs_Call { return &StorageInterfaceMock_CleanupGeneratedProofs_Call{Call: _e.mock.On("CleanupGeneratedProofs", ctx, batchNumber, dbTx)} } -func (_c *StorageInterfaceMock_CleanupGeneratedProofs_Call) Run(run func(ctx context.Context, batchNumber uint64, dbTx db.Txer)) *StorageInterfaceMock_CleanupGeneratedProofs_Call { +func (_c *StorageInterfaceMock_CleanupGeneratedProofs_Call) Run(run func(ctx context.Context, batchNumber uint64, dbTx types.Txer)) *StorageInterfaceMock_CleanupGeneratedProofs_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(uint64), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(uint64), args[2].(types.Txer)) }) return _c } @@ -340,13 +340,13 @@ func (_c *StorageInterfaceMock_CleanupGeneratedProofs_Call) Return(_a0 error) *S return _c } -func (_c *StorageInterfaceMock_CleanupGeneratedProofs_Call) RunAndReturn(run func(context.Context, uint64, db.Txer) error) *StorageInterfaceMock_CleanupGeneratedProofs_Call { +func (_c *StorageInterfaceMock_CleanupGeneratedProofs_Call) RunAndReturn(run func(context.Context, uint64, types.Txer) error) *StorageInterfaceMock_CleanupGeneratedProofs_Call { _c.Call.Return(run) return _c } // CleanupLockedProofs provides a mock function with given fields: ctx, duration, dbTx -func (_m *StorageInterfaceMock) CleanupLockedProofs(ctx context.Context, duration string, dbTx db.Txer) (int64, error) { +func (_m *StorageInterfaceMock) CleanupLockedProofs(ctx context.Context, duration string, dbTx types.Txer) (int64, error) { ret := _m.Called(ctx, duration, dbTx) if len(ret) == 0 { @@ -355,16 +355,16 @@ func (_m *StorageInterfaceMock) CleanupLockedProofs(ctx context.Context, duratio var r0 int64 var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, db.Txer) (int64, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, types.Txer) (int64, error)); ok { return rf(ctx, duration, dbTx) } - if rf, ok := ret.Get(0).(func(context.Context, string, db.Txer) int64); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, types.Txer) int64); ok { r0 = rf(ctx, duration, dbTx) } else { r0 = ret.Get(0).(int64) } - if rf, ok := ret.Get(1).(func(context.Context, string, db.Txer) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, string, types.Txer) error); ok { r1 = rf(ctx, duration, dbTx) } else { r1 = ret.Error(1) @@ -381,14 +381,14 @@ type StorageInterfaceMock_CleanupLockedProofs_Call struct { // CleanupLockedProofs is a helper method to define mock.On call // - ctx context.Context // - duration string -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) CleanupLockedProofs(ctx interface{}, duration interface{}, dbTx interface{}) *StorageInterfaceMock_CleanupLockedProofs_Call { return &StorageInterfaceMock_CleanupLockedProofs_Call{Call: _e.mock.On("CleanupLockedProofs", ctx, duration, dbTx)} } -func (_c *StorageInterfaceMock_CleanupLockedProofs_Call) Run(run func(ctx context.Context, duration string, dbTx db.Txer)) *StorageInterfaceMock_CleanupLockedProofs_Call { +func (_c *StorageInterfaceMock_CleanupLockedProofs_Call) Run(run func(ctx context.Context, duration string, dbTx types.Txer)) *StorageInterfaceMock_CleanupLockedProofs_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(string), args[2].(types.Txer)) }) return _c } @@ -398,13 +398,13 @@ func (_c *StorageInterfaceMock_CleanupLockedProofs_Call) Return(_a0 int64, _a1 e return _c } -func (_c *StorageInterfaceMock_CleanupLockedProofs_Call) RunAndReturn(run func(context.Context, string, db.Txer) (int64, error)) *StorageInterfaceMock_CleanupLockedProofs_Call { +func (_c *StorageInterfaceMock_CleanupLockedProofs_Call) RunAndReturn(run func(context.Context, string, types.Txer) (int64, error)) *StorageInterfaceMock_CleanupLockedProofs_Call { _c.Call.Return(run) return _c } // DeleteGeneratedProofs provides a mock function with given fields: ctx, batchNumber, batchNumberFinal, dbTx -func (_m *StorageInterfaceMock) DeleteGeneratedProofs(ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx db.Txer) error { +func (_m *StorageInterfaceMock) DeleteGeneratedProofs(ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx types.Txer) error { ret := _m.Called(ctx, batchNumber, batchNumberFinal, dbTx) if len(ret) == 0 { @@ -412,7 +412,7 @@ func (_m *StorageInterfaceMock) DeleteGeneratedProofs(ctx context.Context, batch } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, uint64, uint64, db.Txer) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, uint64, uint64, types.Txer) error); ok { r0 = rf(ctx, batchNumber, batchNumberFinal, dbTx) } else { r0 = ret.Error(0) @@ -430,14 +430,14 @@ type StorageInterfaceMock_DeleteGeneratedProofs_Call struct { // - ctx context.Context // - batchNumber uint64 // - batchNumberFinal uint64 -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) DeleteGeneratedProofs(ctx interface{}, batchNumber interface{}, batchNumberFinal interface{}, dbTx interface{}) *StorageInterfaceMock_DeleteGeneratedProofs_Call { return &StorageInterfaceMock_DeleteGeneratedProofs_Call{Call: _e.mock.On("DeleteGeneratedProofs", ctx, batchNumber, batchNumberFinal, dbTx)} } -func (_c *StorageInterfaceMock_DeleteGeneratedProofs_Call) Run(run func(ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx db.Txer)) *StorageInterfaceMock_DeleteGeneratedProofs_Call { +func (_c *StorageInterfaceMock_DeleteGeneratedProofs_Call) Run(run func(ctx context.Context, batchNumber uint64, batchNumberFinal uint64, dbTx types.Txer)) *StorageInterfaceMock_DeleteGeneratedProofs_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(uint64), args[2].(uint64), args[3].(db.Txer)) + run(args[0].(context.Context), args[1].(uint64), args[2].(uint64), args[3].(types.Txer)) }) return _c } @@ -447,13 +447,13 @@ func (_c *StorageInterfaceMock_DeleteGeneratedProofs_Call) Return(_a0 error) *St return _c } -func (_c *StorageInterfaceMock_DeleteGeneratedProofs_Call) RunAndReturn(run func(context.Context, uint64, uint64, db.Txer) error) *StorageInterfaceMock_DeleteGeneratedProofs_Call { +func (_c *StorageInterfaceMock_DeleteGeneratedProofs_Call) RunAndReturn(run func(context.Context, uint64, uint64, types.Txer) error) *StorageInterfaceMock_DeleteGeneratedProofs_Call { _c.Call.Return(run) return _c } // DeleteUngeneratedProofs provides a mock function with given fields: ctx, dbTx -func (_m *StorageInterfaceMock) DeleteUngeneratedProofs(ctx context.Context, dbTx db.Txer) error { +func (_m *StorageInterfaceMock) DeleteUngeneratedProofs(ctx context.Context, dbTx types.Txer) error { ret := _m.Called(ctx, dbTx) if len(ret) == 0 { @@ -461,7 +461,7 @@ func (_m *StorageInterfaceMock) DeleteUngeneratedProofs(ctx context.Context, dbT } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, db.Txer) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, types.Txer) error); ok { r0 = rf(ctx, dbTx) } else { r0 = ret.Error(0) @@ -477,14 +477,14 @@ type StorageInterfaceMock_DeleteUngeneratedProofs_Call struct { // DeleteUngeneratedProofs is a helper method to define mock.On call // - ctx context.Context -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) DeleteUngeneratedProofs(ctx interface{}, dbTx interface{}) *StorageInterfaceMock_DeleteUngeneratedProofs_Call { return &StorageInterfaceMock_DeleteUngeneratedProofs_Call{Call: _e.mock.On("DeleteUngeneratedProofs", ctx, dbTx)} } -func (_c *StorageInterfaceMock_DeleteUngeneratedProofs_Call) Run(run func(ctx context.Context, dbTx db.Txer)) *StorageInterfaceMock_DeleteUngeneratedProofs_Call { +func (_c *StorageInterfaceMock_DeleteUngeneratedProofs_Call) Run(run func(ctx context.Context, dbTx types.Txer)) *StorageInterfaceMock_DeleteUngeneratedProofs_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(db.Txer)) + run(args[0].(context.Context), args[1].(types.Txer)) }) return _c } @@ -494,13 +494,13 @@ func (_c *StorageInterfaceMock_DeleteUngeneratedProofs_Call) Return(_a0 error) * return _c } -func (_c *StorageInterfaceMock_DeleteUngeneratedProofs_Call) RunAndReturn(run func(context.Context, db.Txer) error) *StorageInterfaceMock_DeleteUngeneratedProofs_Call { +func (_c *StorageInterfaceMock_DeleteUngeneratedProofs_Call) RunAndReturn(run func(context.Context, types.Txer) error) *StorageInterfaceMock_DeleteUngeneratedProofs_Call { _c.Call.Return(run) return _c } // GetProofReadyToVerify provides a mock function with given fields: ctx, lastVerfiedBatchNumber, dbTx -func (_m *StorageInterfaceMock) GetProofReadyToVerify(ctx context.Context, lastVerfiedBatchNumber uint64, dbTx db.Txer) (*state.Proof, error) { +func (_m *StorageInterfaceMock) GetProofReadyToVerify(ctx context.Context, lastVerfiedBatchNumber uint64, dbTx types.Txer) (*state.Proof, error) { ret := _m.Called(ctx, lastVerfiedBatchNumber, dbTx) if len(ret) == 0 { @@ -509,10 +509,10 @@ func (_m *StorageInterfaceMock) GetProofReadyToVerify(ctx context.Context, lastV var r0 *state.Proof var r1 error - if rf, ok := ret.Get(0).(func(context.Context, uint64, db.Txer) (*state.Proof, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, uint64, types.Txer) (*state.Proof, error)); ok { return rf(ctx, lastVerfiedBatchNumber, dbTx) } - if rf, ok := ret.Get(0).(func(context.Context, uint64, db.Txer) *state.Proof); ok { + if rf, ok := ret.Get(0).(func(context.Context, uint64, types.Txer) *state.Proof); ok { r0 = rf(ctx, lastVerfiedBatchNumber, dbTx) } else { if ret.Get(0) != nil { @@ -520,7 +520,7 @@ func (_m *StorageInterfaceMock) GetProofReadyToVerify(ctx context.Context, lastV } } - if rf, ok := ret.Get(1).(func(context.Context, uint64, db.Txer) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, uint64, types.Txer) error); ok { r1 = rf(ctx, lastVerfiedBatchNumber, dbTx) } else { r1 = ret.Error(1) @@ -537,14 +537,14 @@ type StorageInterfaceMock_GetProofReadyToVerify_Call struct { // GetProofReadyToVerify is a helper method to define mock.On call // - ctx context.Context // - lastVerfiedBatchNumber uint64 -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) GetProofReadyToVerify(ctx interface{}, lastVerfiedBatchNumber interface{}, dbTx interface{}) *StorageInterfaceMock_GetProofReadyToVerify_Call { return &StorageInterfaceMock_GetProofReadyToVerify_Call{Call: _e.mock.On("GetProofReadyToVerify", ctx, lastVerfiedBatchNumber, dbTx)} } -func (_c *StorageInterfaceMock_GetProofReadyToVerify_Call) Run(run func(ctx context.Context, lastVerfiedBatchNumber uint64, dbTx db.Txer)) *StorageInterfaceMock_GetProofReadyToVerify_Call { +func (_c *StorageInterfaceMock_GetProofReadyToVerify_Call) Run(run func(ctx context.Context, lastVerfiedBatchNumber uint64, dbTx types.Txer)) *StorageInterfaceMock_GetProofReadyToVerify_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(uint64), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(uint64), args[2].(types.Txer)) }) return _c } @@ -554,13 +554,13 @@ func (_c *StorageInterfaceMock_GetProofReadyToVerify_Call) Return(_a0 *state.Pro return _c } -func (_c *StorageInterfaceMock_GetProofReadyToVerify_Call) RunAndReturn(run func(context.Context, uint64, db.Txer) (*state.Proof, error)) *StorageInterfaceMock_GetProofReadyToVerify_Call { +func (_c *StorageInterfaceMock_GetProofReadyToVerify_Call) RunAndReturn(run func(context.Context, uint64, types.Txer) (*state.Proof, error)) *StorageInterfaceMock_GetProofReadyToVerify_Call { _c.Call.Return(run) return _c } // GetProofsToAggregate provides a mock function with given fields: ctx, dbTx -func (_m *StorageInterfaceMock) GetProofsToAggregate(ctx context.Context, dbTx db.Txer) (*state.Proof, *state.Proof, error) { +func (_m *StorageInterfaceMock) GetProofsToAggregate(ctx context.Context, dbTx types.Txer) (*state.Proof, *state.Proof, error) { ret := _m.Called(ctx, dbTx) if len(ret) == 0 { @@ -570,10 +570,10 @@ func (_m *StorageInterfaceMock) GetProofsToAggregate(ctx context.Context, dbTx d var r0 *state.Proof var r1 *state.Proof var r2 error - if rf, ok := ret.Get(0).(func(context.Context, db.Txer) (*state.Proof, *state.Proof, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, types.Txer) (*state.Proof, *state.Proof, error)); ok { return rf(ctx, dbTx) } - if rf, ok := ret.Get(0).(func(context.Context, db.Txer) *state.Proof); ok { + if rf, ok := ret.Get(0).(func(context.Context, types.Txer) *state.Proof); ok { r0 = rf(ctx, dbTx) } else { if ret.Get(0) != nil { @@ -581,7 +581,7 @@ func (_m *StorageInterfaceMock) GetProofsToAggregate(ctx context.Context, dbTx d } } - if rf, ok := ret.Get(1).(func(context.Context, db.Txer) *state.Proof); ok { + if rf, ok := ret.Get(1).(func(context.Context, types.Txer) *state.Proof); ok { r1 = rf(ctx, dbTx) } else { if ret.Get(1) != nil { @@ -589,7 +589,7 @@ func (_m *StorageInterfaceMock) GetProofsToAggregate(ctx context.Context, dbTx d } } - if rf, ok := ret.Get(2).(func(context.Context, db.Txer) error); ok { + if rf, ok := ret.Get(2).(func(context.Context, types.Txer) error); ok { r2 = rf(ctx, dbTx) } else { r2 = ret.Error(2) @@ -605,14 +605,14 @@ type StorageInterfaceMock_GetProofsToAggregate_Call struct { // GetProofsToAggregate is a helper method to define mock.On call // - ctx context.Context -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) GetProofsToAggregate(ctx interface{}, dbTx interface{}) *StorageInterfaceMock_GetProofsToAggregate_Call { return &StorageInterfaceMock_GetProofsToAggregate_Call{Call: _e.mock.On("GetProofsToAggregate", ctx, dbTx)} } -func (_c *StorageInterfaceMock_GetProofsToAggregate_Call) Run(run func(ctx context.Context, dbTx db.Txer)) *StorageInterfaceMock_GetProofsToAggregate_Call { +func (_c *StorageInterfaceMock_GetProofsToAggregate_Call) Run(run func(ctx context.Context, dbTx types.Txer)) *StorageInterfaceMock_GetProofsToAggregate_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(db.Txer)) + run(args[0].(context.Context), args[1].(types.Txer)) }) return _c } @@ -622,13 +622,13 @@ func (_c *StorageInterfaceMock_GetProofsToAggregate_Call) Return(_a0 *state.Proo return _c } -func (_c *StorageInterfaceMock_GetProofsToAggregate_Call) RunAndReturn(run func(context.Context, db.Txer) (*state.Proof, *state.Proof, error)) *StorageInterfaceMock_GetProofsToAggregate_Call { +func (_c *StorageInterfaceMock_GetProofsToAggregate_Call) RunAndReturn(run func(context.Context, types.Txer) (*state.Proof, *state.Proof, error)) *StorageInterfaceMock_GetProofsToAggregate_Call { _c.Call.Return(run) return _c } // UpdateGeneratedProof provides a mock function with given fields: ctx, proof, dbTx -func (_m *StorageInterfaceMock) UpdateGeneratedProof(ctx context.Context, proof *state.Proof, dbTx db.Txer) error { +func (_m *StorageInterfaceMock) UpdateGeneratedProof(ctx context.Context, proof *state.Proof, dbTx types.Txer) error { ret := _m.Called(ctx, proof, dbTx) if len(ret) == 0 { @@ -636,7 +636,7 @@ func (_m *StorageInterfaceMock) UpdateGeneratedProof(ctx context.Context, proof } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, db.Txer) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *state.Proof, types.Txer) error); ok { r0 = rf(ctx, proof, dbTx) } else { r0 = ret.Error(0) @@ -653,14 +653,14 @@ type StorageInterfaceMock_UpdateGeneratedProof_Call struct { // UpdateGeneratedProof is a helper method to define mock.On call // - ctx context.Context // - proof *state.Proof -// - dbTx db.Txer +// - dbTx types.Txer func (_e *StorageInterfaceMock_Expecter) UpdateGeneratedProof(ctx interface{}, proof interface{}, dbTx interface{}) *StorageInterfaceMock_UpdateGeneratedProof_Call { return &StorageInterfaceMock_UpdateGeneratedProof_Call{Call: _e.mock.On("UpdateGeneratedProof", ctx, proof, dbTx)} } -func (_c *StorageInterfaceMock_UpdateGeneratedProof_Call) Run(run func(ctx context.Context, proof *state.Proof, dbTx db.Txer)) *StorageInterfaceMock_UpdateGeneratedProof_Call { +func (_c *StorageInterfaceMock_UpdateGeneratedProof_Call) Run(run func(ctx context.Context, proof *state.Proof, dbTx types.Txer)) *StorageInterfaceMock_UpdateGeneratedProof_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*state.Proof), args[2].(db.Txer)) + run(args[0].(context.Context), args[1].(*state.Proof), args[2].(types.Txer)) }) return _c } @@ -670,7 +670,7 @@ func (_c *StorageInterfaceMock_UpdateGeneratedProof_Call) Return(_a0 error) *Sto return _c } -func (_c *StorageInterfaceMock_UpdateGeneratedProof_Call) RunAndReturn(run func(context.Context, *state.Proof, db.Txer) error) *StorageInterfaceMock_UpdateGeneratedProof_Call { +func (_c *StorageInterfaceMock_UpdateGeneratedProof_Call) RunAndReturn(run func(context.Context, *state.Proof, types.Txer) error) *StorageInterfaceMock_UpdateGeneratedProof_Call { _c.Call.Return(run) return _c } diff --git a/aggregator/prover/mocks/mock_aggregator_service_channel_server.go b/aggregator/prover/mocks/mock_aggregator_service_channel_server.go index f65c2f694..1e465d18d 100644 --- a/aggregator/prover/mocks/mock_aggregator_service_channel_server.go +++ b/aggregator/prover/mocks/mock_aggregator_service_channel_server.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/cmd/run.go b/cmd/run.go index 062fd7c98..5ce47f735 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -26,10 +26,10 @@ import ( "github.com/0xPolygon/cdk/translator" ethtxman "github.com/0xPolygon/zkevm-ethtx-manager/etherman" "github.com/0xPolygon/zkevm-ethtx-manager/etherman/etherscan" - aggkitetherman "github.com/agglayer/aggkit/etherman" "github.com/agglayer/aggkit/l1infotreesync" "github.com/agglayer/aggkit/log" "github.com/agglayer/aggkit/reorgdetector" + aggkittypes "github.com/agglayer/aggkit/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/urfave/cli/v2" ) @@ -377,7 +377,7 @@ func runL1InfoTreeSyncerIfNeeded( cfg.L1InfoTreeSync.GlobalExitRootAddr, cfg.L1InfoTreeSync.RollupManagerAddr, cfg.L1InfoTreeSync.SyncBlockChunkSize, - aggkitetherman.NewBlockNumberFinality(cfg.L1InfoTreeSync.BlockFinality), + aggkittypes.NewBlockNumberFinality(cfg.L1InfoTreeSync.BlockFinality), reorgDetector, l1Client, cfg.L1InfoTreeSync.WaitForNewBlocksPeriod.Duration, @@ -385,7 +385,7 @@ func runL1InfoTreeSyncerIfNeeded( cfg.L1InfoTreeSync.RetryAfterErrorPeriod.Duration, cfg.L1InfoTreeSync.MaxRetryAttemptsAfterError, l1infotreesync.FlagNone, - aggkitetherman.FinalizedBlock, + aggkittypes.FinalizedBlock, true, ) if err != nil { diff --git a/dataavailability/mocks_da/mock_batch_data_provider.go b/dataavailability/mocks_da/mock_batch_data_provider.go index 2529c859f..56cfc5ce5 100644 --- a/dataavailability/mocks_da/mock_batch_data_provider.go +++ b/dataavailability/mocks_da/mock_batch_data_provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/dataavailability/mocks_da/mock_da_backender.go b/dataavailability/mocks_da/mock_da_backender.go index f9f1187c1..0e5cce02e 100644 --- a/dataavailability/mocks_da/mock_da_backender.go +++ b/dataavailability/mocks_da/mock_da_backender.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/dataavailability/mocks_da/mock_data_manager.go b/dataavailability/mocks_da/mock_data_manager.go index 697f8539f..50cb94685 100644 --- a/dataavailability/mocks_da/mock_data_manager.go +++ b/dataavailability/mocks_da/mock_data_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/dataavailability/mocks_da/mock_sequence_retriever.go b/dataavailability/mocks_da/mock_sequence_retriever.go index 934376e87..f78703664 100644 --- a/dataavailability/mocks_da/mock_sequence_retriever.go +++ b/dataavailability/mocks_da/mock_sequence_retriever.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/dataavailability/mocks_da/mock_sequence_sender.go b/dataavailability/mocks_da/mock_sequence_sender.go index a7fc2638b..ddaf41348 100644 --- a/dataavailability/mocks_da/mock_sequence_sender.go +++ b/dataavailability/mocks_da/mock_sequence_sender.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/dataavailability/mocks_da/mock_sequence_sender_banana.go b/dataavailability/mocks_da/mock_sequence_sender_banana.go index 9549518ad..e38e632f9 100644 --- a/dataavailability/mocks_da/mock_sequence_sender_banana.go +++ b/dataavailability/mocks_da/mock_sequence_sender_banana.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/dataavailability/mocks_da/mock_sequence_sender_elderberry.go b/dataavailability/mocks_da/mock_sequence_sender_elderberry.go index b37b703e6..086cd1ba2 100644 --- a/dataavailability/mocks_da/mock_sequence_sender_elderberry.go +++ b/dataavailability/mocks_da/mock_sequence_sender_elderberry.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_da diff --git a/go.mod b/go.mod index 232ea55ae..ef702fc5d 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/0xPolygon/cdk -go 1.24.2 +go 1.24.4 require ( - github.com/0xPolygon/cdk-contracts-tooling v0.0.3 - github.com/0xPolygon/cdk-data-availability v0.0.13 + github.com/0xPolygon/cdk-contracts-tooling v0.0.4 + github.com/0xPolygon/cdk-data-availability v0.0.14-0.20250616155510-076e73c1a237 github.com/0xPolygon/cdk-rpc v0.0.0-20250213125803-179882ad6229 - github.com/0xPolygon/zkevm-ethtx-manager v0.2.12 + github.com/0xPolygon/zkevm-ethtx-manager v0.2.15 github.com/0xPolygonHermez/zkevm-synchronizer-l1 v1.0.8 - github.com/agglayer/aggkit v0.3.0-beta8-tmp-bridge.0.20250527201724-c58267fccdf9 + github.com/agglayer/aggkit v0.5.0-beta1 github.com/ethereum/go-ethereum v1.15.5 github.com/iden3/go-iden3-crypto v0.0.17 github.com/invopop/jsonschema v0.13.0 @@ -16,18 +16,18 @@ require ( github.com/knadh/koanf/parsers/json v1.0.0 github.com/knadh/koanf/parsers/toml v0.1.0 github.com/knadh/koanf/providers/rawbytes v1.0.0 - github.com/knadh/koanf/v2 v2.2.0 + github.com/knadh/koanf/v2 v2.2.1 github.com/mitchellh/mapstructure v1.5.0 github.com/pelletier/go-toml/v2 v2.2.4 github.com/rubenv/sql-migrate v1.8.0 github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 - github.com/urfave/cli/v2 v2.27.6 + github.com/urfave/cli/v2 v2.27.7 github.com/valyala/fasttemplate v1.2.2 go.uber.org/zap v1.27.0 - golang.org/x/crypto v0.38.0 - golang.org/x/net v0.40.0 - google.golang.org/grpc v1.72.2 + golang.org/x/crypto v0.39.0 + golang.org/x/net v0.41.0 + google.golang.org/grpc v1.73.0 google.golang.org/protobuf v1.36.6 ) @@ -39,11 +39,11 @@ require ( cloud.google.com/go/iam v1.2.2 // indirect cloud.google.com/go/kms v1.20.1 // indirect cloud.google.com/go/longrunning v0.6.2 // indirect - github.com/BurntSushi/toml v1.4.0 // indirect + github.com/BurntSushi/toml v1.5.0 // indirect github.com/DataDog/zstd v1.5.6 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/VictoriaMetrics/fastcache v1.12.2 // indirect - github.com/agglayer/go_signer v0.0.6 // indirect + github.com/agglayer/go_signer v0.0.7 // indirect github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect github.com/aws/aws-sdk-go-v2/config v1.28.11 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.52 // indirect @@ -71,7 +71,7 @@ require ( github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.27 // indirect github.com/consensys/gnark-crypto v0.16.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect @@ -86,11 +86,11 @@ require ( github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/getsentry/sentry-go v0.28.1 // indirect github.com/go-gorp/gorp/v3 v3.1.0 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-pkgz/expirable-cache v0.0.3 // indirect - github.com/go-viper/mapstructure/v2 v2.2.1 // indirect + github.com/go-viper/mapstructure/v2 v2.3.0 // indirect github.com/gofrs/flock v0.12.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect @@ -176,29 +176,29 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect - go.opentelemetry.io/otel v1.36.0 // indirect - go.opentelemetry.io/otel/metric v1.36.0 // indirect - go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.opentelemetry.io/otel v1.37.0 // indirect + go.opentelemetry.io/otel/metric v1.37.0 // indirect + go.opentelemetry.io/otel/trace v1.37.0 // indirect go.uber.org/multierr v1.10.0 // indirect - golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect + golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/mod v0.24.0 // indirect - golang.org/x/oauth2 v0.26.0 // indirect - golang.org/x/sync v0.14.0 // indirect + golang.org/x/mod v0.25.0 // indirect + golang.org/x/oauth2 v0.28.0 // indirect + golang.org/x/sync v0.15.0 // indirect golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.25.0 // indirect + golang.org/x/text v0.26.0 // indirect golang.org/x/time v0.10.0 // indirect - golang.org/x/tools v0.32.0 // indirect + golang.org/x/tools v0.33.0 // indirect google.golang.org/api v0.215.0 // indirect google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.0.1-2020.1.4 // indirect - modernc.org/libc v1.62.1 // indirect + modernc.org/libc v1.65.10 // indirect modernc.org/mathutil v1.7.1 // indirect - modernc.org/memory v1.9.1 // indirect - modernc.org/sqlite v1.37.0 // indirect + modernc.org/memory v1.11.0 // indirect + modernc.org/sqlite v1.38.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/go.sum b/go.sum index 864380425..6bbf49473 100644 --- a/go.sum +++ b/go.sum @@ -13,19 +13,19 @@ cloud.google.com/go/kms v1.20.1 h1:og29Wv59uf2FVaZlesaiDAqHFzHaoUyHI3HYp9VUHVg= cloud.google.com/go/kms v1.20.1/go.mod h1:LywpNiVCvzYNJWS9JUcGJSVTNSwPwi0vBAotzDqn2nc= cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc= cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI= -github.com/0xPolygon/cdk-contracts-tooling v0.0.3 h1:G7H3UNyDOpoLqDvW9c4lgn2iMnteM1HqUpUAD1gk9VU= -github.com/0xPolygon/cdk-contracts-tooling v0.0.3/go.mod h1:mFlcEjsm2YBBsu8atHJ3zyVnwM+Z/fMXpVmIJge+WVU= -github.com/0xPolygon/cdk-data-availability v0.0.13 h1:CoZoSGOtg+wCF3s9XfLf+dc9H5SdPDMEhmiwNrFf1iY= -github.com/0xPolygon/cdk-data-availability v0.0.13/go.mod h1:u/vHga1Wdx4qeglcvh3VCGxeU7h/EouZnuYeFBibOZU= +github.com/0xPolygon/cdk-contracts-tooling v0.0.4 h1:nQGwmS30bZovCKGGuF9zWcoVZFkK1l9B6h995zEgdG4= +github.com/0xPolygon/cdk-contracts-tooling v0.0.4/go.mod h1:mFlcEjsm2YBBsu8atHJ3zyVnwM+Z/fMXpVmIJge+WVU= +github.com/0xPolygon/cdk-data-availability v0.0.14-0.20250616155510-076e73c1a237 h1:9BSVjCdPCs1D/bILS6TMZIqtc55Wo328j/3s1JL29Qs= +github.com/0xPolygon/cdk-data-availability v0.0.14-0.20250616155510-076e73c1a237/go.mod h1:sreo1poyneLBLEu0LS8Ej5qrG9oFfPhSLwwqtaVk6x4= github.com/0xPolygon/cdk-rpc v0.0.0-20250213125803-179882ad6229 h1:6YhqNQVcXkoxqs5zQVg1bREuoeKvwpffpfoL8QQT+u4= github.com/0xPolygon/cdk-rpc v0.0.0-20250213125803-179882ad6229/go.mod h1:2scWqMMufrQXu7TikDgQ3BsyaKoX8qP26D6E262vSOg= -github.com/0xPolygon/zkevm-ethtx-manager v0.2.12 h1:7Z+8lyuDxyfmJUW/CnnNQ1ZcDgGlKpi4el2BZ4gfL/8= -github.com/0xPolygon/zkevm-ethtx-manager v0.2.12/go.mod h1:mRdWtyuzQQOiQWvo1nNuj44H0UNqK/8FOF44bjOCKYs= +github.com/0xPolygon/zkevm-ethtx-manager v0.2.15 h1:v9BhQkXWvg1jM3SeDRJzjwUQo0YOWFUSEtkFRfGW+dw= +github.com/0xPolygon/zkevm-ethtx-manager v0.2.15/go.mod h1:AmLGLIk9qrf1EGqZrgjBc3YGn+0Dc7Ee2KVLuiTBY7g= github.com/0xPolygonHermez/zkevm-synchronizer-l1 v1.0.8 h1:DY6rxa5oqYUIzDH3TIFDSoXNzXFgiy8Lyn6ZwO3GMec= github.com/0xPolygonHermez/zkevm-synchronizer-l1 v1.0.8/go.mod h1:IYqOmGBjvpJKRjVVqH3pGQysHU8W8YSctbl4TQDjNMg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= -github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= +github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -35,10 +35,10 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI= -github.com/agglayer/aggkit v0.3.0-beta8-tmp-bridge.0.20250527201724-c58267fccdf9 h1:0Vf6bEsqXprceyNkeyeKcl2vLcp2l+wIP3F3uWrGIBE= -github.com/agglayer/aggkit v0.3.0-beta8-tmp-bridge.0.20250527201724-c58267fccdf9/go.mod h1:uGB75C0O43cboxPMRY/4T0rQUzJNP5IFTZdCca8KMs8= -github.com/agglayer/go_signer v0.0.6 h1:IKeh4JMvWAXZX/0lGEF0W/UatmUc7LEo5Nm0L+yCcqc= -github.com/agglayer/go_signer v0.0.6/go.mod h1:YIoQNqvA10L/qV9vlAV8rXjejnyPpnYA0A/zU1uxXeY= +github.com/agglayer/aggkit v0.5.0-beta1 h1:AQI4QNOhvGCsBzCjATzIGbxD2YpnBaQhMAANopW5KkM= +github.com/agglayer/aggkit v0.5.0-beta1/go.mod h1:8OGuq9Q2vI28Ql6G6LeDdkhfdcr1Wz8++bOycmzl/nE= +github.com/agglayer/go_signer v0.0.7 h1:V+4wFWjGKdL1GgXSzx2RLgglJWyce95Dy/4+9xx52hs= +github.com/agglayer/go_signer v0.0.7/go.mod h1:PiDQugvxAgTYDD9bbWcqBMl/LuOOG/B9Hx1N1lIPq0s= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc= github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= @@ -109,8 +109,8 @@ github.com/consensys/gnark-crypto v0.16.0 h1:8Dl4eYmUWK9WmlP1Bj6je688gBRJCJbT8Mw github.com/consensys/gnark-crypto v0.16.0/go.mod h1:Ke3j06ndtPTVvo++PhGNgvm+lgpLvzbcE2MqljY7diU= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc= -github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo= +github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a h1:W8mUrRp6NOVl3J+MYp5kPMoUZPp7aOYHtaua31lwRHg= github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a/go.mod h1:sTwzHBvIzm2RfVCGNEBZgRyjwK40bVoun3ZnGOCafNM= github.com/crate-crypto/go-kzg-4844 v1.1.0 h1:EN/u9k2TF6OWSHrCCDBBU6GLNMq88OspHHlMnHfoyU4= @@ -157,8 +157,8 @@ github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpj github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -171,8 +171,8 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= -github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= +github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= @@ -314,8 +314,8 @@ github.com/knadh/koanf/parsers/toml v0.1.0 h1:S2hLqS4TgWZYj4/7mI5m1CQQcWurxUz6OD github.com/knadh/koanf/parsers/toml v0.1.0/go.mod h1:yUprhq6eo3GbyVXFFMdbfZSo928ksS+uo0FFqNMnO18= github.com/knadh/koanf/providers/rawbytes v1.0.0 h1:MrKDh/HksJlKJmaZjgs4r8aVBb/zsJyc/8qaSnzcdNI= github.com/knadh/koanf/providers/rawbytes v1.0.0/go.mod h1:KxwYJf1uezTKy6PBtfE+m725NGp4GPVA7XoNTJ/PtLo= -github.com/knadh/koanf/v2 v2.2.0 h1:FZFwd9bUjpb8DyCWARUBy5ovuhDs1lI87dOEn2K8UVU= -github.com/knadh/koanf/v2 v2.2.0/go.mod h1:PSFru3ufQgTsI7IF+95rf9s8XA1+aHxKuO/W+dPoHEY= +github.com/knadh/koanf/v2 v2.2.1 h1:jaleChtw85y3UdBnI0wCqcg1sj1gPoz6D3caGNHtrNE= +github.com/knadh/koanf/v2 v2.2.1/go.mod h1:PSFru3ufQgTsI7IF+95rf9s8XA1+aHxKuO/W+dPoHEY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -501,8 +501,8 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g= -github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ= +github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU= +github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= @@ -529,16 +529,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= -go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= -go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= -go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= -go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= -go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= -go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= +go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= +go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= +go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY= +go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= +go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -569,11 +569,11 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= golang.org/x/exp v0.0.0-20190221220918-438050ddec5e/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= -golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= +golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM= +golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -586,8 +586,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= +golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -608,11 +608,11 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= -golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc= +golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -620,8 +620,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -680,8 +680,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4= golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= @@ -704,8 +704,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU= -golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -719,14 +719,14 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= -google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a h1:nwKuGPlUAt+aR+pcrkfFRrTU1BVrSmYyYMxYbUIVHr0= -google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a/go.mod h1:3kWAYMk1I75K4vykHtKt2ycnOgpA6974V7bREqbsenU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a h1:51aaUVRocpvUOSQKM6Q7VuoaktNIaMCLuhZB6DKksq4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a/go.mod h1:uRxBH1mhmO8PGhU89cMcHaXKZqO+OfakD8QQO0oYwlQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 h1:hE3bRWtU6uceqlh4fhrSnUyjKHMKB9KrTLLG+bc0ddM= +google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463/go.mod h1:U90ffi8eUL9MwPcrJylN5+Mk2v3vuPDptd5yyNUiRR8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8= -google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok= +google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -761,26 +761,26 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -modernc.org/cc/v4 v4.25.2 h1:T2oH7sZdGvTaie0BRNFbIYsabzCxUQg8nLqCdQ2i0ic= -modernc.org/cc/v4 v4.25.2/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= -modernc.org/ccgo/v4 v4.25.1 h1:TFSzPrAGmDsdnhT9X2UrcPMI3N/mJ9/X9ykKXwLhDsU= -modernc.org/ccgo/v4 v4.25.1/go.mod h1:njjuAYiPflywOOrm3B7kCB444ONP5pAVr8PIEoE0uDw= -modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE= -modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ= +modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s= +modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= +modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU= +modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE= +modernc.org/fileutil v1.3.3 h1:3qaU+7f7xxTUmvU1pJTZiDLAIoJVdUSSauJNHg9yXoA= +modernc.org/fileutil v1.3.3/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= -modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s= -modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo= +modernc.org/libc v1.65.10 h1:ZwEk8+jhW7qBjHIT+wd0d9VjitRyQef9BnzlzGwMODc= +modernc.org/libc v1.65.10/go.mod h1:StFvYpx7i/mXtBAfVOjaU0PWZOvIRoZSgXhrwXzr8Po= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= -modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g= -modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI= -modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= +modernc.org/sqlite v1.38.0 h1:+4OrfPQ8pxHKuWG4md1JpR/EYAh3Md7TdejuuzE7EUI= +modernc.org/sqlite v1.38.0/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= diff --git a/sequencesender/mocks/mock_eth_tx_manager.go b/sequencesender/mocks/mock_eth_tx_manager.go index 62c6352ea..f0b07795c 100644 --- a/sequencesender/mocks/mock_eth_tx_manager.go +++ b/sequencesender/mocks/mock_eth_tx_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/sequencesender/mocks/mock_etherman.go b/sequencesender/mocks/mock_etherman.go index 72bc1a023..809afc56d 100644 --- a/sequencesender/mocks/mock_etherman.go +++ b/sequencesender/mocks/mock_etherman.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/sequencesender/mocks/mock_rpc_interface.go b/sequencesender/mocks/mock_rpc_interface.go index 7a2b9950a..f381c3eb3 100644 --- a/sequencesender/mocks/mock_rpc_interface.go +++ b/sequencesender/mocks/mock_rpc_interface.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/sequencesender/mocks/mock_tx_builder.go b/sequencesender/mocks/mock_tx_builder.go index 70738e5e8..de0ed045e 100644 --- a/sequencesender/mocks/mock_tx_builder.go +++ b/sequencesender/mocks/mock_tx_builder.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_cond_new_sequence.go b/sequencesender/txbuilder/mocks_txbuilder/mock_cond_new_sequence.go index d38905526..d17b85682 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_cond_new_sequence.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_cond_new_sequence.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_contractor.go index 1c952c660..04f546716 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_zkevm_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_zkevm_contractor.go index 7006660f3..d9509587c 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_zkevm_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_global_exit_root_banana_zkevm_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_l1_client.go b/sequencesender/txbuilder/mocks_txbuilder/mock_l1_client.go index c7ff99fc0..516e06abb 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_l1_client.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_l1_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_l1_info_syncer.go b/sequencesender/txbuilder/mocks_txbuilder/mock_l1_info_syncer.go index c88b38318..f80534856 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_l1_info_syncer.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_l1_info_syncer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_base_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_base_contractor.go index 4d06e8c8d..497f0c720 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_base_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_base_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_validium_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_validium_contractor.go index c191dfe90..a41537be1 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_validium_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_validium_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_zkevm_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_zkevm_contractor.go index 31bbd3571..77cd87f71 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_zkevm_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_banana_zkevm_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_validium_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_validium_contractor.go index d9cc9179e..0bd42751a 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_validium_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_validium_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_zkevm_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_zkevm_contractor.go index 9406e9986..325ce5f1e 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_zkevm_contractor.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_rollup_elderberry_zkevm_contractor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/sequencesender/txbuilder/mocks_txbuilder/mock_tx_builder.go b/sequencesender/txbuilder/mocks_txbuilder/mock_tx_builder.go index 3eda5fdd3..df0382534 100644 --- a/sequencesender/txbuilder/mocks_txbuilder/mock_tx_builder.go +++ b/sequencesender/txbuilder/mocks_txbuilder/mock_tx_builder.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks_txbuilder diff --git a/test/aggregator/mocks/mock_synchronizer.go b/test/aggregator/mocks/mock_synchronizer.go index 371344fc6..5670b6eb3 100644 --- a/test/aggregator/mocks/mock_synchronizer.go +++ b/test/aggregator/mocks/mock_synchronizer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package mocks diff --git a/test/helpers/e2e.go b/test/helpers/e2e.go index 991a4eb7b..cc540ffe8 100644 --- a/test/helpers/e2e.go +++ b/test/helpers/e2e.go @@ -14,10 +14,10 @@ import ( "github.com/0xPolygon/cdk/test/contracts/transparentupgradableproxy" "github.com/agglayer/aggkit/bridgesync" aggkitTypes "github.com/agglayer/aggkit/config/types" - aggkitetherman "github.com/agglayer/aggkit/etherman" "github.com/agglayer/aggkit/l1infotreesync" "github.com/agglayer/aggkit/reorgdetector" aggkittesthelpers "github.com/agglayer/aggkit/test/helpers" + aggkittypes "github.com/agglayer/aggkit/types" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" @@ -104,11 +104,11 @@ func L1Setup(t *testing.T) *L1Environment { l1InfoTreeSync, err := l1infotreesync.New( ctx, dbPathL1InfoTreeSync, gerL1Addr, common.Address{}, - syncBlockChunkSize, aggkitetherman.LatestBlock, + syncBlockChunkSize, aggkittypes.LatestBlock, rdL1, l1Client.Client(), time.Millisecond, 0, periodRetry, retries, l1infotreesync.FlagAllowWrongContractsAddrs, - aggkitetherman.SafeBlock, + aggkittypes.SafeBlock, false, ) require.NoError(t, err) @@ -129,7 +129,7 @@ func L1Setup(t *testing.T) *L1Environment { dbPathBridgeSyncL1 := path.Join(t.TempDir(), "BridgeSyncL1.sqlite") bridgeL1Sync, err := bridgesync.NewL1( ctx, dbPathBridgeSyncL1, bridgeL1Addr, - syncBlockChunks, aggkitetherman.LatestBlock, rdL1, testClient, + syncBlockChunks, aggkittypes.LatestBlock, rdL1, testClient, initialBlock, waitForNewBlocksPeriod, retryPeriod, retriesCount, originNetwork, false, false) require.NoError(t, err) @@ -187,7 +187,7 @@ func L2Setup(t *testing.T, networkID uint32) *L2Environment { bridgeL2Sync, err := bridgesync.NewL2( ctx, dbPathL2BridgeSync, bridgeL2Addr, syncBlockChunks, - aggkitetherman.LatestBlock, rdL2, testClient, + aggkittypes.LatestBlock, rdL2, testClient, initialBlock, waitForNewBlocksPeriod, retryPeriod, retriesCount, originNetwork, false, false) require.NoError(t, err) diff --git a/test/helpers/mock_eth_tx_manager.go b/test/helpers/mock_eth_tx_manager.go index 2320a1436..080028384 100644 --- a/test/helpers/mock_eth_tx_manager.go +++ b/test/helpers/mock_eth_tx_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.52.2. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package helpers diff --git a/test/run-local-e2e.sh b/test/run-local-e2e.sh index f355d075e..7d8ba0498 100755 --- a/test/run-local-e2e.sh +++ b/test/run-local-e2e.sh @@ -7,11 +7,11 @@ RED='\033[0;31m' NC='\033[0m' log_info() { - echo -e "${GREEN}[INFO]${NC} $*" | tee -a "$LOG_FILE" + echo -e "${GREEN}[INFO]${NC} $*" } log_error() { - echo -e "${RED}[ERROR]${NC} $*" | tee -a "$LOG_FILE" + echo -e "${RED}[ERROR]${NC} $*" } trap 'log_error "Script failed at line $LINENO"' ERR @@ -26,14 +26,6 @@ KURTOSIS_FOLDER=$2 E2E_FOLDER=${3:-""} PROJECT_ROOT="$PWD" -ROOT_FOLDER="/tmp/cdk-e2e-run" -LOG_FOLDER="$ROOT_FOLDER/logs" -LOG_FILE="$LOG_FOLDER/run-local-e2e.log" - -rm -rf "$ROOT_FOLDER" -mkdir -p "$LOG_FOLDER" - -exec > >(tee -a "$LOG_FILE") 2>&1 log_info "Starting local E2E setup..." @@ -117,12 +109,12 @@ if [ -n "$E2E_FOLDER" ]; then bats tests/aggkit/bridge-e2e.bats tests/aggkit/bridge-e2e-custom-gas.bats ;; "fork12-multi-l2-networks") - bats ./tests/aggkit/bridge-l2_to_l2-e2e.bats + bats ./tests/aggkit/bridge-e2e-2-chains.bats ;; esac popd >/dev/null - log_info "E2E tests completed. Logs saved to $LOG_FILE" + log_info "E2E tests completed." else log_info "No E2E repo provided. Skipping tests." exit 0