Merge branch 'main' into release/v8.0.0

Author: pablodeymo

.github/actions/snapsync-run/action.yml

@@ -15,6 +15,14 @@ inputs:
     description: Ethrex Docker image tag.
     required: false
     default: main
+  cl_type:
+    description: Consensus layer type (lighthouse, prysm, etc).
+    required: false
+    default: lighthouse
+  cl_image:
+    description: Consensus layer Docker image and tag.
+    required: false
+    default: sigp/lighthouse:v8.0.1
 
 runs:
   using: composite
@@ -33,15 +41,18 @@ runs:
         TIMEOUT: ${{ inputs.timeout }}
         ETHREX_IMAGE: ${{ inputs.ethrex_image }}
         ETHREX_TAG: ${{ inputs.ethrex_tag }}
+        CL_TYPE: ${{ inputs.cl_type }}
+        CL_IMAGE: ${{ inputs.cl_image }}
       run: |
         cat > .github/config/assertoor/network_params.generated.yaml <<YAML
         participants:
           - el_type: ethrex
             el_image: ${ETHREX_IMAGE}:${ETHREX_TAG}
             el_extra_params:
               - "--syncmode=snap"
-            cl_type: lighthouse
-            cl_image: sigp/lighthouse:v8.0.0-rc.1
+              - "--log.level=info"
+            cl_type: ${CL_TYPE}
+            cl_image: ${CL_IMAGE}
             count: 1
 
         network_params:
@@ -71,7 +82,7 @@ runs:
     - name: Run assertoor
       uses: ethpandaops/kurtosis-assertoor-github-action@v1
       with:
-        enclave_name: ethrex-assertoor-${{ inputs.network }}
+        enclave_name: ethrex-assertoor-${{ inputs.network }}-${{ inputs.cl_type }}
         kurtosis_version: 1.10.2
         ethereum_package_url: github.com/ethpandaops/ethereum-package
         ethereum_package_branch: 82e5a7178138d892c0c31c3839c89d53ffd42d9a

.github/pull_request_template.md

@@ -8,5 +8,9 @@
 
 <!-- Link to issues: Resolves #111, Resolves #222 -->
 
+**Checklist**
+
+- [ ] Updated `STORE_SCHEMA_VERSION` (crates/storage/lib.rs) if the PR includes breaking changes to the `Store` requiring a re-sync.
+
 Closes #issue_number
 

.github/workflows/daily_hive_report.yaml

@@ -120,6 +120,12 @@ jobs:
           fi
           echo "flags=$FLAGS" >> "$GITHUB_OUTPUT"
 
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Run Hive Simulation
         id: run-hive-action
         uses: ethpandaops/hive-github-action@v0.5.0

.github/workflows/daily_snapsync.yaml

@@ -6,8 +6,8 @@ on:
     paths:
       - ".github/workflows/daily_snapsync.yaml"
   schedule:
-    # Every day at UTC 03:00
-    - cron: "0 3 * * 1,2,3,4,5"
+    # Every 6 hours
+    - cron: "0 */6 * * *"
   workflow_dispatch:
     inputs:
       network:
@@ -32,18 +32,18 @@ jobs:
         run: |
           event_name="${GITHUB_EVENT_NAME}"
           if [[ "$event_name" == "schedule" ]]; then
-            json='[{"network":"hoodi","timeout":"30m"},{"network":"sepolia","timeout":"10h"}]'
+            json='[{"network":"hoodi","timeout":"40m"},{"network":"sepolia","timeout":"2h30m"}]'
           elif [[ "$event_name" == "pull_request" ]]; then
-            json='[{"network":"hoodi","timeout":"30m"}]'
+            json='[{"network":"hoodi","timeout":"40m"}]'
           else
             network=$(jq -r '.inputs.network // empty' "$GITHUB_EVENT_PATH")
 
             case "$network" in
               hoodi)
-                json='[{"network":"hoodi","timeout":"30m"}]'
+                json='[{"network":"hoodi","timeout":"40m"}]'
                 ;;
               sepolia)
-                json='[{"network":"sepolia","timeout":"10h"}]'
+                json='[{"network":"sepolia","timeout":"2h30m"}]'
                 ;;
               *)
                 echo "::error::Unsupported network value '$network'. Allowed values: hoodi, sepolia."
@@ -53,9 +53,9 @@ jobs:
           fi
           echo "matrix=$json" >> "$GITHUB_OUTPUT"
 
-  sync:
+  sync-lighthouse:
     needs: prepare
-    name: Sync ${{ matrix.network }}
+    name: Sync ${{ matrix.network }} - Lighthouse
     runs-on: ethrex-sync
     strategy:
       fail-fast: false
@@ -70,3 +70,25 @@ jobs:
         with:
           network: ${{ matrix.network }}
           timeout: ${{ matrix.timeout }}
+          cl_type: lighthouse
+          cl_image: "sigp/lighthouse:v8.0.1"
+
+  sync-prysm:
+    needs: prepare
+    name: Sync ${{ matrix.network }} - Prysm
+    runs-on: ethrex-sync
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.prepare.outputs.matrix) }}
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run Snapsync Test
+        uses: ./.github/actions/snapsync-run
+        with:
+          network: ${{ matrix.network }}
+          timeout: ${{ matrix.timeout }}
+          cl_type: prysm
+          cl_image: "gcr.io/offchainlabs/prysm/beacon-chain:v7.1.0"

.github/workflows/pr-main_l1.yaml

@@ -176,6 +176,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [detect-changes, docker_build]
     if: ${{ needs.detect-changes.outputs.run_tests == 'true' && github.event_name != 'merge_group' }}
+    env:
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
@@ -251,6 +253,13 @@ jobs:
           fi
           echo "flags=$FLAGS" >> "$GITHUB_OUTPUT"
 
+      - name: Log in to the Container registry
+        if: ${{ env.DOCKERHUB_TOKEN != '' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ env.DOCKERHUB_TOKEN }}
+
       - name: Run Hive Simulation
         id: run-hive-action
         uses: ethpandaops/hive-github-action@v0.5.0

.github/workflows/pr-main_l2.yaml

@@ -31,7 +31,13 @@ jobs:
           filters: |
             run_tests:
               - "crates/l2/**"
-              - "fixtures/**"
+              - "fixtures/keys/**"
+              - "fixtures/genesis/l1-dev.json"
+              - "fixtures/genesis/l2.json"
+              - "fixtures/cache/**"
+              - "fixtures/blobs/**"
+              - "fixtures/blockchain/**"
+              - "fixtures/contracts/**"
               - "crates/blockchain/dev/**"
               - "crates/vm/levm/**"
               - ".github/workflows/pr-main_l2.yaml"
@@ -593,6 +599,166 @@ jobs:
           cd crates/l2
           make state-diff-test
 
+  integration-test-shared-bridge:
+    name: Integration Test Shared Bridge
+    runs-on: ubuntu-latest
+    needs: [detect-changes, build-docker, build-docker-l2]
+    if: ${{ needs.detect-changes.outputs.run_tests == 'true' }}
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup Rust Environment
+        uses: ./.github/actions/setup-rust
+
+      - name: Install solc
+        uses: lambdaclass/get-solc@master
+        with:
+          version: v0.8.29
+          token: ${{ secrets.GITHUB_TOKEN || '' }}
+
+      - name: Build prover
+        run: |
+          cd crates/l2
+          make build-prover-exec
+          mkdir -p prover/src/guest_program/src/sp1/out && touch prover/src/guest_program/src/sp1/out/riscv32im-succinct-zkvm-vk-bn254 && touch prover/src/guest_program/src/sp1/out/riscv32im-succinct-zkvm-vk-u32
+
+      - name: Build test
+        run: |
+          cargo test l2 --features l2 --no-run --release
+
+      - name: Download ethrex image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ethrex_image
+          path: /tmp
+
+      - name: Load ethrex image
+        run: |
+          docker load --input /tmp/ethrex_image.tar
+
+      - name: Download ethrex L2 image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ethrex_image_l2
+          path: /tmp
+
+      - name: Load ethrex L2 image
+        run: |
+          docker load --input /tmp/ethrex_image_l2.tar
+
+      - name: Start L1
+        run: |
+          cd crates/l2
+          docker compose up --detach ethrex_l1
+
+      - name: Deploy contracts L2A
+        run: |
+          #
+          # If this job fails due to connection refused to ethrex_l1 consider increasing the failure retries
+          # in the contract_deployer service in crates/l2/docker-compose.yaml
+          #
+          touch cmd/.env
+          cd crates/l2
+          DOCKER_ETHREX_WORKDIR=/usr/local/bin \
+          ETHREX_DEPLOYER_DEPLOY_RICH=true \
+          ETHREX_SHARED_BRIDGE_DEPLOY_ROUTER=true \
+          docker compose up contract_deployer
+
+          DEPLOYER_EXIT_CODE=$(docker inspect -f '{{.State.ExitCode}}' contract_deployer)
+          if [ "$DEPLOYER_EXIT_CODE" != "0" ]; then
+            echo "If this job fails due to connection refused to ethrex_l1 consider increasing the failure retries in the contract_deployer service in crates/l2/docker-compose.yaml"
+            docker logs contract_deployer
+            exit 1
+          fi
+
+      - name: Copy env to host
+        run: |
+          docker cp contract_deployer:/env/.env cmd/.env_l2a
+          cat cmd/.env_l2a
+
+      - name: Deploy contracts L2B
+        run: |
+          jq '.config.chainId = 1730' fixtures/genesis/l2.json > fixtures/genesis/l2b.json
+          #
+          # If this job fails due to connection refused to ethrex_l1 consider increasing the failure retries
+          # in the contract_deployer service in crates/l2/docker-compose.yaml
+          #
+          touch cmd/.env
+          cd crates/l2
+          export $(grep -v '^#' ../../cmd/.env_l2a | xargs)
+          DOCKER_ETHREX_WORKDIR=/usr/local/bin \
+          ETHREX_DEPLOYER_DEPLOY_RICH=true \
+          ETHREX_SHARED_BRIDGE_ROUTER_ADDRESS=$ETHREX_SHARED_BRIDGE_ROUTER_ADDRESS \
+          docker compose -f docker-compose.yaml -f docker-compose-l2-shared-bridge.overrides.yaml up contract_deployer
+
+          DEPLOYER_EXIT_CODE=$(docker inspect -f '{{.State.ExitCode}}' contract_deployer)
+          if [ "$DEPLOYER_EXIT_CODE" != "0" ]; then
+            echo "If this job fails due to connection refused to ethrex_l1 consider increasing the failure retries in the contract_deployer service in crates/l2/docker-compose.yaml"
+            docker logs contract_deployer
+            exit 1
+          fi
+
+      - name: Copy env to host
+        run: |
+          docker cp contract_deployer:/env/.env cmd/.env_l2b
+          cat cmd/.env_l2b
+
+      - name: Start Sequencer L2A
+        run: |
+          cp cmd/.env_l2a cmd/.env
+          export ETHREX_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+          export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362
+          export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS=1000000000
+          export ETHREX_BLOCK_PRODUCER_L1_FEE_VAULT_ADDRESS=0x45681AE1768a8936FB87aB11453B4755e322ceec
+          cd crates/l2
+          export $(xargs < ../../cmd/.env_l2a)
+          DOCKER_ETHREX_WORKDIR=/usr/local/bin \
+          ETHREX_WATCHER_BLOCK_DELAY=0 \
+          ETHREX_COMMITTER_COMMIT_TIME=15000 \
+          ETHREX_WATCHER_WATCH_INTERVAL=1000 \
+          ETHREX_WATCHER_L2_RPCS=http://ethrex_l2_b:1730 \
+          ETHREX_WATCHER_L2_CHAIN_IDS=1730 \
+          ETHREX_WATCHER_ROUTER_ADDRESS=$ETHREX_SHARED_BRIDGE_ROUTER_ADDRESS \
+          docker compose -f docker-compose.yaml up --detach --no-deps ethrex_l2
+
+      - name: Start Sequencer L2B
+        run: |
+          cp cmd/.env_l2b cmd/.env
+          export ETHREX_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+          export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362
+          export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS=1000000000
+          export ETHREX_BLOCK_PRODUCER_L1_FEE_VAULT_ADDRESS=0x45681AE1768a8936FB87aB11453B4755e322ceec
+          cd crates/l2
+          export $(xargs < ../../cmd/.env_l2b)
+          DOCKER_ETHREX_WORKDIR=/usr/local/bin \
+          ETHREX_WATCHER_BLOCK_DELAY=0 \
+          ETHREX_COMMITTER_COMMIT_TIME=15000 \
+          ETHREX_WATCHER_WATCH_INTERVAL=1000 \
+          ETHREX_WATCHER_L2_RPCS=http://ethrex_l2:1729 \
+          ETHREX_WATCHER_L2_CHAIN_IDS=65536999 \
+          ETHREX_WATCHER_ROUTER_ADDRESS=$ETHREX_SHARED_BRIDGE_ROUTER_ADDRESS \
+          docker compose -f docker-compose.yaml -f docker-compose-l2-shared-bridge.overrides.yaml up --detach --no-deps ethrex_l2_b
+
+      - name: Run tests
+        run: | 
+          sudo chmod -R a+rw crates/l2
+          cd crates/l2
+          cargo run --release --features "l2,l2-sql" --manifest-path ../../Cargo.toml -- \
+          l2 prover \
+          --proof-coordinators tcp://127.0.0.1:3900 tcp://127.0.0.1:3901 \
+          --backend exec &
+          docker logs --follow ethrex_l2 &
+          docker logs --follow ethrex_l2_b &
+          docker logs --follow ethrex_l1 &
+          cargo test shared_bridge --release -- --nocapture --test-threads=1
+          cp ../../cmd/.env_l2a ../../cmd/.env
+          PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d INTEGRATION_TEST_SKIP_TEST_TOTAL_ETH=true cargo test l2 --release -- --nocapture --test-threads=1
+          cp ../../cmd/.env_l2b ../../cmd/.env
+          PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d INTEGRATION_TEST_SKIP_TEST_TOTAL_ETH=true INTEGRATION_TEST_L2_RPC=http://localhost:1730 cargo test l2 --release -- --nocapture --test-threads=1
+          cargo test shared_bridge --release -- --nocapture --test-threads=1
+          killall ethrex -s SIGINT
+
+
   # The purpose of this job is to add it as a required check in GitHub so that we don't have to add every individual job as a required check
   all-tests:
     # "Integration Test L2" is a required check, don't change the name
@@ -605,9 +771,10 @@ jobs:
         state-diff-test,
         integration-test-tdx,
         uniswap-swap,
+        integration-test-shared-bridge,
       ]
     # Make sure this job runs even if the previous jobs failed or were skipped
-    if: ${{ needs.detect-changes.outputs.run_tests == 'true' && always() && needs.integration-test.result != 'skipped' && needs.state-diff-test.result != 'skipped' && needs.integration-test-tdx.result != 'skipped' && needs.uniswap-swap.result != 'skipped' }}
+    if: ${{ needs.detect-changes.outputs.run_tests == 'true' && always() && needs.integration-test.result != 'skipped' && needs.state-diff-test.result != 'skipped' && needs.integration-test-tdx.result != 'skipped' && needs.uniswap-swap.result != 'skipped' && needs.integration-test-shared-bridge.result != 'skipped' }}
     steps:
       - name: Check if any job failed
         run: |
@@ -625,3 +792,8 @@ jobs:
             echo "Job Uniswap Swap Token Flow failed"
             exit 1
           fi
+
+          if [ "${{ needs.integration-test-shared-bridge.result }}" != "success" ]; then
+            echo "Job Integration test shared bridge failed"
+            exit 1
+          fi

.github/workflows/pr-main_l2_prover.yaml

@@ -19,7 +19,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        backend: ["sp1", "risc0", "zisk", "openvm"]
+        # Note: openvm backend linting is disabled due to a problem in the installation https://github.com/lambdaclass/ethrex/issues/5509
+        backend: ["sp1", "risc0", "zisk"]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4