Merge f7ef881 into ebb341b

Author: xqft

.github/workflows/main_prover.yaml

@@ -54,21 +54,31 @@ jobs:
         # if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           cd crates/l2
-          PROVER=sp1 G=true make build-prover
+          make build-prover-sp1 GPU=true
+
+      - name: Show vks
+        # if: ${{ always() && github.event_name == 'merge_group' }}
+        run: |
+          ls -lah crates/l2/prover/src/guest_program/src/sp1/out/
 
       - name: Build test
         # if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           cargo test l2 --features l2 --no-run --release
 
-      - name: Start L1 & Deploy contracts
+      - name: Start L1
+        run: |
+          cd crates/l2
+          docker compose up --detach ethrex_l1
+
+      - name: Deploy contracts
         # if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           touch cmd/.env
           cd crates/l2
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
-          ETHREX_DEPLOYER_SP1_DEPLOY_VERIFIER=true \
+          ETHREX_L2_SP1=true \
           docker compose up --build contract_deployer
 
           DEPLOYER_EXIT_CODE=$(docker inspect -f '{{.State.ExitCode}}' contract_deployer)
@@ -104,7 +114,7 @@ jobs:
         # if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           cd crates/l2
-          RUST_LOG=info,ethrex_prover_lib=debug PROVER=sp1 G=true make init-prover &
+          make init-prover-sp1 GPU=true &
           docker logs --follow ethrex_l2 & DOCKER_LOGS_PID=$!
           PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d cargo test l2 --release -- --nocapture --test-threads=1
           killall ethrex -s SIGINT

.github/workflows/pr-main_l2.yaml

@@ -166,11 +166,10 @@ jobs:
           version: v0.8.29
           token: ${{ secrets.GITHUB_TOKEN || '' }}
 
-      # also creates empty verification keys (as workflow runs with exec backend)
       - name: Build prover
         run: |
           cd crates/l2
-          make build-prover
+          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
 
       - name: Build test
@@ -242,9 +241,6 @@ jobs:
           fi
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
-          ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
-          ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
-          ETHREX_DEPLOYER_RISC0_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
           ETHREX_L2_VALIDIUM=${{ matrix.validium }} \
           ETHREX_NATIVE_TOKEN_L1_ADDRESS=$ETHREX_NATIVE_TOKEN_L1_ADDRESS \
           docker compose up contract_deployer
@@ -304,7 +300,7 @@ jobs:
           fi
           sudo chmod -R a+rw crates/l2
           cd crates/l2
-          RUST_LOG=info,ethrex_prover_lib=debug make init-prover &
+          RUST_LOG=info,ethrex_prover_lib=debug make init-prover-exec &
           docker logs --follow ethrex_l2 &
           docker logs --follow ethrex_l1 &
           PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d cargo test l2 --release -- --nocapture --test-threads=1
@@ -380,7 +376,7 @@ jobs:
           cd crates/l2
           make init-l1-docker;
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
-          ETHREX_DEPLOYER_TDX_DEPLOY_VERIFIER=true \
+          ETHREX_L2_TDX=true \
           ETHREX_TDX_DEV_MODE=true \
           make deploy-l1
 
@@ -463,9 +459,6 @@ jobs:
           cd crates/l2
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
-          ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
-          ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
-          ETHREX_DEPLOYER_RISC0_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
           COMPILE_CONTRACTS=true \
           docker compose up contract_deployer
 
@@ -503,7 +496,7 @@ jobs:
       - name: Start ethrex
         run: |
           cd crates/l2
-          make init-l2-dev &
+          ETHREX_NO_MONITOR=true make init-l2-dev 2>&1 | tee /tmp/ethrex.log &
 
       - name: Wait for ethrex l2
         run: |
@@ -520,11 +513,18 @@ jobs:
 
       - name: Init prover
         run: |
-          target/release/ethrex l2 prover --proof-coordinators http://localhost:3900 &
+          target/release/ethrex l2 prover --proof-coordinators http://localhost:3900 2>&1 | tee /tmp/prover.log &
+
+      - name: show envs
+        run: |
+          cat crates/l2/.env
 
       - name: Run test
         run: |
           cd crates/l2
+          tail -n 100 -f /tmp/ethrex.log &
+          tail -n 100 -f /tmp/prover.log &
+          export $(shell cat .env | xargs); \
           INTEGRATION_TEST_SKIP_BASE_FEE_VAULT_CHECK=true \
           PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d \
           cargo test l2 --release -- --nocapture --test-threads=1