Merge branch 'develop' into feat/e2e_mutlisign

Author: Stefan-Ethernal

.github/test_e2e_cdk_erigon_args_base.json

@@ -2,7 +2,7 @@
   "deployment_stages": {
     "deploy_l2_contracts": true,
     "deploy_op_succinct": false,
-    "deploy_cdk_bridge_infra": true,
+    "deploy_cdk_bridge_infra": false,
     "deploy_optimism_rollup": false
   },
   "args": {
@@ -25,4 +25,4 @@
     "gas_token_enabled": false,
     "additional_services": []
   }
-}
+}

.github/test_e2e_cdk_erigon_custom_gas_token.json

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

.github/test_e2e_op_args_base.json

@@ -1,6 +1,7 @@
 {
   "deployment_stages": {
-    "deploy_op_succinct": false
+    "deploy_op_succinct": false,
+    "deploy_cdk_bridge_infra": false
   },
   "args": {
     "aggkit_image": "aggkit:local",
@@ -9,11 +10,10 @@
     "agg_sender_multisig_threshold": 2,
     "agg_sender_validator_total_number": 3,
     "verbosity": "debug",
-    "agglayer_image": "ghcr.io/agglayer/agglayer:0.4.0-rc.18",
     "additional_services": [],
     "binary_name": "aggkit",
     "aggkit_components": "aggsender,aggoracle",
     "zkevm_rollup_chain_id": 20201,
     "zkevm_rollup_id": 1
   }
-}
+}

.github/test_e2e_op_succinct_args_base.json

@@ -1,7 +1,6 @@
 {
   "deployment_stages": {
-    "deploy_op_succinct": true,
-    "deploy_cdk_bridge_infra": false
+    "deploy_op_succinct": true
   },
   "args": {
     "op_succinct_mock": true,
@@ -10,6 +9,7 @@
     "op_succinct_submission_interval": "1",
     "op_succinct_max_concurrent_proof_requests": "1",
     "op_succinct_max_concurrent_witness_gen": "1",
-    "op_succinct_range_proof_interval": "60"
+    "op_succinct_range_proof_interval": "60",
+    "additional_services": []
   }
-}
+}

.github/workflows/build-push-docker-image.yml

@@ -17,7 +17,7 @@ env:
 
 jobs:
   build:
-    runs-on: amd-runner-2204
+    runs-on: ${{ matrix.platform == 'linux/arm64' && 'arm-runner-2204' || 'amd-runner-2204' }}
     strategy:
       fail-fast: false
       matrix:
@@ -69,19 +69,16 @@ jobs:
             echo "FULL_IMAGE_DEV=$FULL_IMAGE" >> $GITHUB_OUTPUT
           fi
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and push ${{ matrix.variant.description }} image by digest
         id: build
         uses: docker/build-push-action@v6

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
         if: ${{ matrix.language == 'go' }}
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.x
+          go-version: 1.25.3
 
       - name: Verify Go version
         if: ${{ matrix.language == 'go' }}

.github/workflows/govulncheck.yml

@@ -14,5 +14,5 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@v1
         with:
-           go-version-input: 1.25.0
+           go-version-input: 1.25.3
            go-package: ./...

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.x
+          go-version: 1.25.3
 
       - name: Checkout code
         uses: actions/checkout@v5

.github/workflows/release.yml

@@ -21,7 +21,7 @@ env:
 
 jobs:
   build:
-    runs-on: amd-runner-2204
+    runs-on: ${{ matrix.platform == 'linux/arm64' && 'arm-runner-2204' || 'amd-runner-2204' }}
     strategy:
       fail-fast: false
       matrix:
@@ -30,11 +30,8 @@ jobs:
           - linux/arm64
         variant:
           - { suffix: "", include_shell: "false", description: "production" }
-          - {
-              suffix: "-dev",
-              include_shell: "true",
-              description: "development",
-            }
+          - { suffix: "-dev", include_shell: "true", description: "development" }
+
     outputs:
       IMAGE_NAME_PROD: ${{ steps.image_builder_prod.outputs.IMAGE }}
       IMAGE_NAME_DEV: ${{ steps.image_builder_dev.outputs.IMAGE }}
@@ -92,9 +89,6 @@ jobs:
           IMAGE=$(jq -ecr '.tags | map(select(match("${{ env.REGEX_IMAGE }}-dev", "i"))) | first| sub(":.*$";"")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
           echo "IMAGE=$IMAGE" >> $GITHUB_OUTPUT
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -105,19 +99,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push by digest
+      - name: Build and push ${{ matrix.variant.description }} image by digest
         id: build
         uses: docker/build-push-action@v6
         with:
           context: .
-          push: false
           platforms: ${{ matrix.platform }}
-          labels: ${{ (matrix.variant.suffix == '') && steps.meta_prod.outputs.labels || steps.meta_dev.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          push: false
+          cache-from: type=gha,scope=${{ matrix.variant.description }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.variant.description }}
           build-args: |
             INCLUDE_SHELL=${{ matrix.variant.include_shell }}
-          outputs: type=image,name=${{ (matrix.variant.suffix == '') && steps.image_builder_prod.outputs.IMAGE || steps.image_builder_dev.outputs.IMAGE }},push-by-digest=true,push=true
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true
 
       - name: Export digest
         run: |

.github/workflows/test-e2e.yml

@@ -54,15 +54,15 @@ jobs:
             fi
           else
             # For push/workflow_dispatch, use the fixed commit
-            COMMIT="c32d3805ad1eb45a8b3ef91ec41610c6197c6379"
+            COMMIT="5bcd88d0695ee976cfb2bd059f08463f0a95cf9c"
             echo "Using fixed kurtosis-cdk commit: ${COMMIT}"
           fi
           echo "commit=${COMMIT}" >> $GITHUB_OUTPUT
 
   build-aggkit-image:
     uses: ./.github/workflows/build-aggkit-image.yml
     with:
-      go-version: 1.25.x
+      go-version: 1.25.3
       docker-image-name: aggkit
 
   read-aggkit-args:
@@ -118,12 +118,12 @@ jobs:
             echo "$content" | jq .
           }
 
-          # single l2 network (fork 12, op-succinct)
+          # single l2 network (op-succinct)
           put_args op_succinct_args "$BASE_OP" \
             ./.github/test_e2e_op_succinct_args_base.json \
             ./.github/test_e2e_single_chain_op_succinct_args.json
 
-          # single l2 network (fork 12, op-succinct with aggoracle committee)
+          # single l2 network (op-succinct with aggoracle committee)
           put_args op_succinct_aggoracle_committee_args "$BASE_OP" \
             ./.github/test_e2e_op_succinct_args_base.json \
             ./.github/test_e2e_single_chain_op_succinct_aggoracle_committee_args.json
@@ -160,7 +160,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.x
+          go-version: 1.25.3
       - name: Build Aggsender Find Imported Bridge
         run: make build-tools
       - name: Upload Binary
@@ -173,19 +173,21 @@ jobs:
     name: Single L2 chain tests (OP, pessimistic)
     needs:
       - build-aggkit-image
+      - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@16fc8987b826981e4d37aab88184cd4feba03fd3
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@ae92165db92fcda4dd6bab323ab2b7b8fe579d82
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 16fc8987b826981e4d37aab88184cd4feba03fd3
-      kurtosis-cdk-enclave-name: aggkit
+      agglayer-e2e-ref: ae92165db92fcda4dd6bab323ab2b7b8fe579d82
+      kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-pessimistic }}
       test-name: "test-single-l2-network-op-pessimistic"
       event-name: ${{ github.event_name }}
+      aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
 
-  check-single-l2-network-fork12-pessimistic-tests-result:
+  check-single-l2-network-op-pessimistic-tests-result:
     name: Check results for single l2 network (OP, pessimistic)
     needs:
       - test-single-l2-network-op-pessimistic
@@ -198,15 +200,17 @@ jobs:
     name: Single L2 chain tests (op-succinct)
     needs:
       - build-aggkit-image
+      - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@16fc8987b826981e4d37aab88184cd4feba03fd3
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@ae92165db92fcda4dd6bab323ab2b7b8fe579d82
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 16fc8987b826981e4d37aab88184cd4feba03fd3
+      agglayer-e2e-ref: ae92165db92fcda4dd6bab323ab2b7b8fe579d82 # main
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct }}
+      aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       test-name: "test-single-l2-network-op-succinct"
       event-name: ${{ github.event_name }}
 
@@ -223,23 +227,27 @@ jobs:
     name: Single L2 chain tests (op-succinct with aggoracle committee)
     needs:
       - build-aggkit-image
+      - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@16fc8987b826981e4d37aab88184cd4feba03fd3
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@ae92165db92fcda4dd6bab323ab2b7b8fe579d82
+    if: always() && github.event_name == 'schedule' && github.ref == 'refs/heads/develop'
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 16fc8987b826981e4d37aab88184cd4feba03fd3
+      agglayer-e2e-ref: ae92165db92fcda4dd6bab323ab2b7b8fe579d82
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct-aggoracle-committee }}
       test-name: "test-single-l2-network-op-succinct-aggoracle-committee"
       event-name: ${{ github.event_name }}
+      aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
 
   check-single-l2-network-op-succinct-aggoracle-committee-tests-result:
     name: Check results for single l2 network (op-succinct with aggoracle committee)
     needs:
       - test-single-l2-network-op-succinct-aggoracle-committee
     runs-on: ubuntu-latest
+    if: always() && github.event_name == 'schedule' && github.ref == 'refs/heads/develop'
     steps:
       - run: exit 1
         if: ${{ contains(fromJSON('["failure", "cancelled"]'), needs.test-single-l2-network-op-succinct-aggoracle-committee.result) }}
@@ -251,12 +259,12 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@16fc8987b826981e4d37aab88184cd4feba03fd3
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@ae92165db92fcda4dd6bab323ab2b7b8fe579d82
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 16fc8987b826981e4d37aab88184cd4feba03fd3
-      kurtosis-cdk-enclave-name: aggkit
+      agglayer-e2e-ref: ae92165db92fcda4dd6bab323ab2b7b8fe579d82
+      kurtosis-cdk-enclave-name: op
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-1 }}
       kurtosis-cdk-args-2: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-2 }}
@@ -277,11 +285,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@16fc8987b826981e4d37aab88184cd4feba03fd3
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@ae92165db92fcda4dd6bab323ab2b7b8fe579d82
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 16fc8987b826981e4d37aab88184cd4feba03fd3
+      agglayer-e2e-ref: ae92165db92fcda4dd6bab323ab2b7b8fe579d82
       kurtosis-cdk-enclave-name: aggkit
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-3 }}