diff --git a/.github/workflows/test-e2e-multi_pp.yml b/.github/workflows/test-e2e-multi_pp.yml index f1e35e9c2..1cdeb0fb0 100644 --- a/.github/workflows/test-e2e-multi_pp.yml +++ b/.github/workflows/test-e2e-multi_pp.yml @@ -38,7 +38,7 @@ jobs: with: repository: 0xPolygon/kurtosis-cdk path: kurtosis-cdk - ref: v0.2.26 + ref: v0.2.31 - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index a31f7d4f5..8b460c370 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -52,7 +52,7 @@ jobs: with: repository: 0xPolygon/kurtosis-cdk path: kurtosis-cdk - ref: v0.2.25 + ref: v0.2.31 - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk diff --git a/.golangci.yml b/.golangci.yml index 00f172357..21a536651 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,10 +3,6 @@ run: timeout: 3m tests: true - skip-dirs-use-default: true - -service: - golangci-lint-version: 1.61.0 linters: disable-all: true diff --git a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml index 2b02f6023..3d619995e 100644 --- a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml +++ b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml @@ -27,14 +27,14 @@ args: cdk_node_image: cdk:latest - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2 - zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.14-RC1-amd64 + zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.6-pp-fork.12 additional_services: [] consensus_contract_type: pessimistic sequencer_type: erigon erigon_strict_mode: false gas_token_enabled: false - zkevm_use_real_verifier: true + zkevm_use_real_verifier: false enable_normalcy: true - verifier_program_vkey: 0x00766aa16a6efe4ac05c0fe21d4b50f9631dbd1a2663a982da861427085ea2ea + verifier_program_vkey: 0x0062c685702e0582d900f3a19521270c92a58e2588230c4a5cf3b45103f4a512 diff --git a/test/combinations/fork12-pessimistic-multi.yml b/test/combinations/fork12-pessimistic-multi.yml index 0b917569b..7d9f807d7 100644 --- a/test/combinations/fork12-pessimistic-multi.yml +++ b/test/combinations/fork12-pessimistic-multi.yml @@ -1,17 +1,15 @@ args: cdk_node_image: cdk:latest - agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.20 - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2 - zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 - zkevm_bridge_proxy_image: haproxy:3.1-bookworm - zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC5 + agglayer_image: ghcr.io/agglayer/agglayer:main + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.14-RC1-amd64 + zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.6-pp-fork.12 additional_services: [] consensus_contract_type: pessimistic sequencer_type: erigon erigon_strict_mode: false gas_token_enabled: false - zkevm_use_real_verifier: true + zkevm_use_real_verifier: false enable_normalcy: true - verifier_program_vkey: 0x00766aa16a6efe4ac05c0fe21d4b50f9631dbd1a2663a982da861427085ea2ea + verifier_program_vkey: 0x0062c685702e0582d900f3a19521270c92a58e2588230c4a5cf3b45103f4a512 agglayer_prover_sp1_key: {{.agglayer_prover_sp1_key}} diff --git a/test/combinations/fork12-pessimistic.yml b/test/combinations/fork12-pessimistic.yml index 8e68a4b96..e8527e6d4 100644 --- a/test/combinations/fork12-pessimistic.yml +++ b/test/combinations/fork12-pessimistic.yml @@ -1,11 +1,8 @@ args: - agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.20 - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2 - cdk_node_image: cdk - zkevm_bridge_proxy_image: haproxy:3.1-bookworm - zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC5 - zkevm_bridge_ui_image: leovct/zkevm-bridge-ui:multi-network - zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 + cdk_node_image: cdk:latest + agglayer_image: ghcr.io/agglayer/agglayer:main + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.14-RC1-amd64 + zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.6-pp-fork.12 additional_services: [] consensus_contract_type: pessimistic sequencer_type: erigon