feat(l2)!: shared bridge

.github/workflows/pr-main_l2.yaml

@@ -593,6 +593,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 +765,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 +786,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

cmd/ethrex/build_l2.rs

@@ -103,6 +103,10 @@ pub fn download_script() {
             &Path::new("../../crates/l2/contracts/src/l1/CommonBridge.sol"),
             "CommonBridge",
         ),
+        (
+            &Path::new("../../crates/l2/contracts/src/l1/Router.sol"),
+            "Router",
+        ),
     ];
     for (path, name) in l1_contracts {
         compile_contract_to_bytecode(
@@ -122,8 +126,8 @@ pub fn download_script() {
             "CommonBridgeL2",
         ),
         (
-            &Path::new("../../crates/l2/contracts/src/l2/L2ToL1Messenger.sol"),
-            "L2ToL1Messenger",
+            &Path::new("../../crates/l2/contracts/src/l2/Messenger.sol"),
+            "Messenger",
         ),
         (
             &Path::new("../../crates/l2/contracts/src/l2/L2Upgradeable.sol"),
@@ -181,8 +185,9 @@ fn write_empty_bytecode_files(output_contracts_path: &Path) {
         "SP1Verifier",
         "OnChainProposer",
         "CommonBridge",
+        "Router",
         "CommonBridgeL2",
-        "L2ToL1Messenger",
+        "Messenger",
         "UpgradeableSystemContract",
         "SequencerRegistry",
         "OnChainProposerBased",
@@ -338,9 +343,9 @@ fn common_bridge_l2_runtime(out_dir: &Path) -> Vec<u8> {
     fs::read(path).expect("Failed to read bytecode file")
 }
 
-/// Bytecode of the L2ToL1Messenger contract.
+/// Bytecode of the Messenger contract.
 fn l2_to_l1_messenger_runtime(out_dir: &Path) -> Vec<u8> {
-    let path = out_dir.join("contracts/solc_out/L2ToL1Messenger.bytecode");
+    let path = out_dir.join("contracts/solc_out/Messenger.bytecode");
     fs::read(path).expect("Failed to read bytecode file")
 }