Merge branch 'main' into hpp59

Author: mpaulucci

.github/scripts/flamegraph_watcher.sh

@@ -1,31 +1,28 @@
 #!/bin/bash
+set -e
 
-# This script sends 171 * <iterations> transactions to a test account, per defined private key
-# then polls the account balance until the expected balance has been reached
-# and then kills the process. It also measures the elapsed time of the test and
-# outputs it to Github Action's outputs.
-iterations=3500
-value=1
-account=0x33c6b73432B3aeA0C1725E415CC40D04908B85fd
-end_val=$((171 * $iterations * $value))
+# This script runs a load test and then kills the node under test. The load test sends a 
+# transaction from each rich account to a random one, so we can check their nonce to
+# determine that the load test finished.
+#
+# Usage:
+# ./flamegraph_watcher.sh
+# Requires a PROGRAM variable to be set (e.g. ethrex). This $PROGRAM will be killed when the
+# load test finishes. Must be run from the context of the repo root.
 
-start_time=$(date +%s)
-ethrex_l2 test load --path /home/runner/work/ethrex/ethrex/test_data/private_keys.txt -i $iterations -v --value $value --to $account >/dev/null
+# TODO(#2486): Move this to a cached build outside.
+echo "Building load test"
+cargo build --release --manifest-path ./cmd/load_test/Cargo.toml
 
-output=$(ethrex_l2 info -b -a $account --wei 2>&1)
-echo "balance: $output"
-while [[ $output -lt $end_val ]]; do
-    sleep 2
-    output=$(ethrex_l2 info -b -a $account --wei 2>&1)
-    echo "balance: $output"
-done
+echo "Starting load test"
+start_time=$(date +%s)
+RUST_BACKTRACE=1 ./target/release/load_test -k ./test_data/private_keys.txt -t eth-transfers -N 1000 -n http://localhost:1729 -w 5 >/dev/null
 end_time=$(date +%s)
-elapsed=$((end_time - start_time))
 
+elapsed=$((end_time - start_time))
 minutes=$((elapsed / 60))
 seconds=$((elapsed % 60))
-output=$(ethrex_l2 info -b -a $account --wei 2>&1)
-echo "Balance of $output reached in $minutes min $seconds s, killing process"
+echo "All load test transactions included in $minutes min $seconds s, killing node process."
 
 echo killing "$PROGRAM"
 sudo pkill "$PROGRAM"

.github/workflows/common_hive_reports.yaml

@@ -12,9 +12,6 @@ on:
         required: true
         type: string
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
   run-hive:
     name: Hive (${{ inputs.evm }}) - ${{ matrix.test.name }}

.github/workflows/daily_loc.yaml

@@ -55,10 +55,9 @@ jobs:
             ${{ github.event_name == 'workflow_dispatch'
               && secrets.TEST_CHANNEL_SLACK
               || format(
-                  '{0} {1} {2}',
+                  '{0} {1}',
                   secrets.ETHREX_L1_SLACK_WEBHOOK,
-                  secrets.ETHREX_L2_SLACK_WEBHOOK,
-                  secrets.LEVM_SLACK_WEBHOOK
+                  secrets.ETHREX_L2_SLACK_WEBHOOK
                 )
             }}
         run: |

.github/workflows/daily_reports.yaml

@@ -53,10 +53,9 @@ jobs:
             ${{ github.event_name == 'workflow_dispatch'
               && secrets.TEST_CHANNEL_SLACK
               || format(
-                  '{0} {1} {2}',
+                  '{0} {1}',
                   secrets.ETHREX_L1_SLACK_WEBHOOK,
-                  secrets.ETHREX_L2_SLACK_WEBHOOK,
-                  secrets.LEVM_SLACK_WEBHOOK
+                  secrets.ETHREX_L2_SLACK_WEBHOOK
                 )
             }}
         run: |
@@ -72,8 +71,8 @@ jobs:
               && secrets.TEST_CHANNEL_SLACK
               || format(
                   '{0} {1}',
-                  secrets.ETHREX_L2_SLACK_WEBHOOK,
-                  secrets.LEVM_SLACK_WEBHOOK
+                  secrets.ETHREX_L1_SLACK_WEBHOOK,
+                  secrets.ETHREX_L2_SLACK_WEBHOOK
                 )
             }}
         run: |
@@ -87,7 +86,7 @@ jobs:
           SLACK_WEBHOOK: >
             ${{ github.event_name == 'workflow_dispatch'
               && secrets.TEST_CHANNEL_SLACK
-              || secrets.LEVM_SLACK_WEBHOOK
+              || secrets.ETHREX_L1_SLACK_WEBHOOK
             }}
         # Only send diff message if the diff has changed
         run: |
@@ -144,7 +143,7 @@ jobs:
           SLACK_WEBHOOK: >
             ${{ github.event_name == 'workflow_dispatch'
               && secrets.TEST_CHANNEL_SLACK
-              || secrets.LEVM_SLACK_WEBHOOK
+              || secrets.ETHREX_L1_SLACK_WEBHOOK
             }}
         run: sh .github/scripts/publish_levm_ef_tests.sh "$SLACK_WEBHOOK"
 
@@ -163,7 +162,7 @@ jobs:
               || format(
                   '{0} {1}',
                   secrets.ETHREX_L2_SLACK_WEBHOOK,
-                  secrets.LEVM_SLACK_WEBHOOK
+                  secrets.ETHREX_L1_SLACK_WEBHOOK
                 )
             }}
         run: |

.github/workflows/main_flamegraph_report.yaml

@@ -6,9 +6,8 @@ permissions:
   id-token: write
 
 on:
-  # re-enable this when fixing the workflow
-  # push:
-  #   branches: ["main"]
+  push:
+    branches: ["main"]
   workflow_dispatch:
 
 env:
@@ -183,13 +182,6 @@ jobs:
             ${{ env.HOME }}/.cargo/bin/inferno-*
           key: ${{ runner.os }}-extra-binaries
 
-      - name: Cache ethrex_l2
-        id: cache-ethrex-l2
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.HOME }}/.cargo/bin/ethrex_l2
-          key: ${{ runner.os }}-ethrex-l2-${{ hashFiles('cmd/ethrex_l2/Cargo.lock') }}
-
       - name: Change perf settings
         run: |
           sudo sysctl kernel.perf_event_paranoid=-1
@@ -236,30 +228,18 @@ jobs:
             echo "$HOME/.cargo/bin/inferno-collapse-perf" already found
           fi
 
-      - name: Install ethrex_l2 cli
-        run: |
-          if [ -f "$HOME/.cargo/bin/ethrex_l2" ]; then
-            echo "$HOME/.cargo/bin/ethrex_l2" already found
-          else
-            cargo install --force --path cmd/ethrex_l2
-          fi
-          ethrex_l2 config create default --default
-          ethrex_l2 config set default
-
       # By default ethrex uses revm as evm backend.
       - id: generate-flamegraph-ethrex
         name: Generate Flamegraph data for Ethrex
         shell: bash
         run: |
           rm -rf target/release/ethrex
+          cargo build --release --bin ethrex --features dev
           CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph -c "record -o perf.data -F997 --call-graph dwarf,16384 -g" \
-          --bin ethrex --features dev -- --dev --network /home/runner/work/ethrex/ethrex/test_data/genesis-l2.json --http.port 1729 >/dev/null &
-          while [ ! -x "./target/release/ethrex" ]; do
-            echo "Waiting for ethrex binary to be ready..."
-            sleep 2
-          done
+          --bin ethrex --release --features dev -- \
+          --dev --network /home/runner/work/ethrex/ethrex/test_data/genesis-l2-ci.json --http.port 1729 >/dev/null &
           sleep 10
-          echo "Compilation finished. Executing load test..."
+          echo "Executing load test..."
           bash /home/runner/work/ethrex/ethrex/.github/scripts/flamegraph_watcher.sh &&
           echo "Load test finished"
 
@@ -293,12 +273,13 @@ jobs:
         with:
           toolchain: ${{ env.RUST_RETH_VERSION }}
 
+      # We need a reth version that requires a rustc version <= 1.82.0
       - name: Checkout reth
         uses: actions/checkout@v4
         with:
           repository: paradigmxyz/reth
           path: "reth"
-          ref: main
+          ref: b2ead06d1d0804101de0d1eb3a070e08d8eab857
 
       - name: Caching
         uses: Swatinem/rust-cache@v2
@@ -316,13 +297,6 @@ jobs:
             ${{ env.HOME }}/.cargo/bin/inferno-*
           key: ${{ runner.os }}-extra-binaries
 
-      - name: Cache ethrex_l2
-        id: cache-ethrex-l2
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.HOME }}/.cargo/bin/ethrex_l2
-          key: ${{ runner.os }}-ethrex-l2-${{ hashFiles('cmd/ethrex_l2/Cargo.lock') }}
-
       - name: Change perf settings
         run: |
           sudo sysctl kernel.perf_event_paranoid=-1
@@ -369,35 +343,22 @@ jobs:
             echo "$HOME/.cargo/bin/inferno-collapse-perf" already found
           fi
 
-      - name: Install ethrex_l2 cli
-        run: |
-          if [ -f "$HOME/.cargo/bin/ethrex_l2" ]; then
-            echo "$HOME/.cargo/bin/ethrex_l2" already found
-          else
-            cargo install --force --path cmd/ethrex_l2
-          fi
-          ethrex_l2 config create default --default
-          ethrex_l2 config set default
-
       - id: generate-flamegraph-reth
         name: Build and test reth
         shell: bash
         # --dev.block-time 1000ms set to 1000ms to match ethrex block generation time
         run: |
           cd ./reth
           rm -rf target/profiling/reth
-          CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph -c "record -o perf.data -F997 --call-graph dwarf,16384 -g" \
-          --bin reth --profile profiling -- node --chain /home/runner/work/ethrex/ethrex/test_data/genesis-load-test.json --dev \
+          cargo build --bin reth --profile profiling
+          CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph -c "record -o perf.data -F997 --call-graph dwarf,16384 -g" --bin reth --profile profiling -- \
+          node --chain /home/runner/work/ethrex/ethrex/test_data/genesis-l2-ci.json --dev \
           --dev.block-time 1000ms --http.port 1729  --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 \
           --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 \
           --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000 >/dev/null &
-          while [ ! -x "./target/profiling/reth" ]; do
-            echo "Waiting for reth binary to be ready..."
-            sleep 10
-          done
           sleep 30
           echo "Executing load test..."
-          bash /home/runner/work/ethrex/ethrex/.github/scripts/flamegraph_watcher.sh &&
+          (cd /home/runner/work/ethrex/ethrex; ./.github/scripts/flamegraph_watcher.sh)
           echo "Load test finished"
 
       - name: Generate SVG
@@ -468,6 +429,9 @@ jobs:
           cp -r flamegraph_ethrex.svg flamegraphs/
           cp -r flamegraph_reth.svg flamegraphs/
 
+          # Fix flamegraphs width
+          sed -i 's|frames.attributes.width.value = |// |' flamegraphs/flamegraph_*.svg
+
           # ETHREX HTML
           sed -i "s/{{LAST_UPDATE}}/$(TZ='Etc/GMT+3' date +'%Y-%m-%dT%H:%M:%S')/g" templates/index.html
           sed -i "s/{{ETHREX_TIME}}/${{ needs.flamegraph-ethrex.outputs.time }}/g" templates/index.html

.github/workflows/main_prover.yaml

@@ -1,7 +1,8 @@
 name: L2 (SP1 Backend)
 on:
-  push:
-    branches: ["main"]
+  pull_request:
+    branches: ["**"]
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -13,7 +14,7 @@ env:
 
 jobs:
   test:
-    name: Integration Test
+    name: Integration Test Prover SP1
     runs-on: gpu
     steps:
       - name: Checkout sources
@@ -23,20 +24,24 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Set up Rust cache
+        if: ${{ always() && github.event_name == 'merge_group' }}
         uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: "true"
 
       - name: RISC-V SP1 toolchain install
+        if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           . "$HOME/.cargo/env"
           curl -L https://sp1.succinct.xyz | bash
           ~/.sp1/bin/sp1up --version 4.1.0
 
       - name: Set up Docker Buildx
+        if: ${{ always() && github.event_name == 'merge_group' }}
         uses: docker/setup-buildx-action@v3
 
       - name: Bake docker images
+        if: ${{ always() && github.event_name == 'merge_group' }}
         uses: docker/bake-action@v6
         with:
           workdir: "crates/l2"
@@ -47,15 +52,18 @@ jobs:
             *.cache-from=type=gha
 
       - name: Build prover
+        if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           cd crates/l2
           make build-prover
 
       - name: Build test
+        if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           cargo test l2 --no-run --release
 
       - name: Run test
+        if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
           cd crates/l2
           cp configs/prover_client_config_example.toml configs/prover_client_config.toml

.github/workflows/pr-main_l1.yaml

@@ -6,7 +6,6 @@ on:
   pull_request:
     branches: ["**"]
     paths-ignore:
-      - "crates/vm/levm/**" # We run this in a separate workflow
       - "crates/l2/**" # Behind a feature flag not used in this workflow
 
 concurrency:
@@ -31,15 +30,12 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Run cargo check
-        run: cargo check
-
-      - name: Run cargo build
-        run: |
-          cargo build
+        run: cargo check --workspace --exclude ethrex-prover-bench
 
       - name: Run cargo clippy
         run: |
-          cargo clippy --all-targets --all-features --workspace --exclude ethrex-prover --exclude zkvm_interface -- -D warnings
+          cargo clippy --workspace --exclude ethrex-prover-bench -- -D warnings
+          cargo clippy --all-targets --all-features --workspace --exclude ethrex-prover --exclude ethrex-prover-bench --exclude zkvm_interface -- -D warnings
 
       - name: Run cargo fmt
         run: |
@@ -64,7 +60,6 @@ jobs:
           make test
 
   docker_build:
-    # "Build Docker" is a required check, don't change the name
     name: Build Docker
     runs-on: ubuntu-latest
     steps:
@@ -160,11 +155,11 @@ jobs:
             ethrex_flags: ""
           - name: "Cancun Engine tests"
             simulation: ethereum/engine
-            test_pattern: "engine-cancun/Blob Transactions On Block 1|Blob Transaction Ordering, Single|Blob Transaction Ordering, Multiple Accounts|Replace Blob Transactions|Parallel Blob Transactions|ForkchoiceUpdatedV3|ForkchoiceUpdatedV2|ForkchoiceUpdated Version|GetPayload|NewPayloadV3 After Cancun|NewPayloadV3 Before Cancun|NewPayloadV3 Versioned Hashes|Incorrect BlobGasUsed|ParentHash equals BlockHash|RPC:|in ForkchoiceState|Unknown SafeBlockHash|Unknown FinalizedBlockHash|Unique|Re-Execute Payload|Multiple New Payloads|NewPayload with|Build Payload with|Re-org to Previously|Safe Re-Org to Side Chain|Transaction Re-Org|Re-Org Back into Canonical Chain, Depth=5|Suggested Fee Recipient Test|PrevRandao Opcode|Fork ID: *|Invalid Missing Ancestor Syncing ReOrg|Request Blob Pooled Transactions"
+            test_pattern: "engine-cancun/Blob Transactions On Block 1|Blob Transaction Ordering, Single|Blob Transaction Ordering, Multiple Accounts|Replace Blob Transactions|Parallel Blob Transactions|ForkchoiceUpdatedV3|ForkchoiceUpdatedV2|ForkchoiceUpdated Version|GetPayload|NewPayloadV3 After Cancun|NewPayloadV3 Before Cancun|NewPayloadV3 Versioned Hashes|Incorrect BlobGasUsed|ParentHash equals BlockHash|RPC:|in ForkchoiceState|Unknown SafeBlockHash|Unknown FinalizedBlockHash|Unique|Re-Execute Payload|Multiple New Payloads|NewPayload with|Build Payload with|Re-org to Previously|Safe Re-Org to Side Chain|Transaction Re-Org|Re-Org Back into Canonical Chain, Depth=5|Suggested Fee Recipient Test|PrevRandao Opcode|Fork ID: *|Request Blob Pooled Transactions|Invalid NewPayload, Incomplete Transactions|Re-Org Back to Canonical Chain*|Invalid PayloadAttributes*|Invalid NewPayload, VersionedHashes|Invalid NewPayload, Incomplete VersionedHashes|Invalid NewPayload, Extra VersionedHashes|Bad Hash on NewPayload|Unknown HeadBlockHash|In-Order Consecutive Payload Execution|Valid NewPayload->ForkchoiceUpdated|Invalid NewPayload, ParentHash|Syncing=False|Payload Build after New Invalid Payload" # Invalid Missing Ancestor Syncing ReOrg|Invalid P9|Invalid P10 -> flaky
             ethrex_flags: ""
           - name: "Paris Engine tests"
             simulation: ethereum/engine
-            test_pattern: "engine-api/RPC|Re-org to Previously Validated Sidechain Payload|Re-Org Back into Canonical Chain, Depth=5|Safe Re-Org|Transaction Re-Org|Inconsistent|Suggested Fee|PrevRandao Opcode Transactions|Fork ID|Unknown SafeBlockHash|Unknown FinalizedBlockHash|Unique Payload ID|Re-Execute Payload|Multiple New Payloads|NewPayload with|Payload Build|Build Payload"
+            test_pattern: "engine-api/RPC|Re-org to Previously Validated Sidechain Payload|Re-Org Back into Canonical Chain, Depth=5|Safe Re-Org|Transaction Re-Org|Inconsistent|Suggested Fee|PrevRandao Opcode Transactions|Fork ID|Unknown SafeBlockHash|Unknown FinalizedBlockHash|Unique Payload ID|Re-Execute Payload|Multiple New Payloads|NewPayload with|Payload Build|Build Payload|Invalid PayloadAttributes|Unknown HeadBlockHash|Valid NewPayload->ForkchoiceUpdated|Invalid NewPayload, ParentHash|Bad Hash on NewPayload|In-Order Consecutive Payload Execution|Re-Org Back to Canonical Chain" # |Invalid P9 -> flaky
             ethrex_flags: ""
           - name: "Engine withdrawal tests"
             simulation: ethereum/engine
@@ -197,7 +192,6 @@ jobs:
         run: |
           docker load --input /tmp/ethrex_image.tar
 
-      # By default ethrex uses revm as evm backend.
       - name: Run Hive Simulation
         run: chmod +x hive && ./hive --client ethrex --ethrex.flags "${{ matrix.ethrex_flags }}" --sim ${{ matrix.simulation }} --sim.limit "${{ matrix.test_pattern }}" --sim.parallelism 16