Merge 755be1b into 27ae20b

Author: JereSalo

.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/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

.github/workflows/main_prover.yaml

@@ -71,3 +71,12 @@ jobs:
       - name: Ensure admin permissions in _work
         if: always()
         run: sudo chown admin:admin -R /home/admin/actions-runner/_work/
+
+      - name: Report Status
+        if: always()
+        uses: ravsamhq/notify-slack-action@v2
+        with:
+          status: ${{ job.status }}
+          notify_when: 'failure'
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.ETHREX_L2_SLACK_WEBHOOK }}

.github/workflows/pr-main_l1.yaml

@@ -160,11 +160,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: *|Invalid Missing Ancestor Syncing ReOrg|Request Blob Pooled Transactions|Invalid NewPayload, Incomplete Transactions|Invalid P9|Invalid P10|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"
             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|Invalid P9|In-Order Consecutive Payload Execution|Re-Org Back to Canonical Chain"
             ethrex_flags: ""
           - name: "Engine withdrawal tests"
             simulation: ethereum/engine
@@ -174,10 +174,11 @@ jobs:
             simulation: ethereum/sync
             test_pattern: ""
             ethrex_flags: "--syncmode full"
-          - name: "Sync snap"
-            simulation: ethereum/sync
-            test_pattern: ""
-            ethrex_flags: "--syncmode snap"
+          # Flaky test, reenable when fixed
+          # - name: "Sync snap"
+          #   simulation: ethereum/sync
+          #   test_pattern: ""
+          #   ethrex_flags: "--syncmode snap"
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

.github/workflows/pr-main_l2.yaml

@@ -6,6 +6,8 @@ on:
     branches: ["**"]
     paths:
       - "crates/l2/**"
+      - "test_data/**"
+      - "crates/blockchain/dev/**"
       - "crates/vm/levm/**"
       - ".github/workflows/pr-main_l2.yaml"
 

.github/workflows/pr-main_l2_contracts.yaml

@@ -24,6 +24,8 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
       - name: Caching
         uses: Swatinem/rust-cache@v2
       - name: Run test of deployer.rs

.github/workflows/pr-main_l2_prover.yaml

@@ -6,6 +6,8 @@ on:
     branches: ["**"]
     paths:
       - "crates/l2/prover/**"
+      - "test_data/**"
+      - "crates/blockchain/dev/**"
       - ".github/workflows/pr-main_l2_prover.yaml"
 
 concurrency:

.github/workflows/pr-main_l2_prover_nightly.yaml renamed to .github/workflows/pr-main_l2_prover_nightly.yaml.disabled

@@ -1,3 +1,5 @@
+# DISABLED: Temporarily disabled due to Pico dependency issues
+
 # The reason this exists is because the Pico zkVM compiles in nightly only.
 name: L2 Prover (nightly)
 on:
@@ -7,6 +9,8 @@ on:
     branches: ["**"]
     paths:
       - "crates/l2/prover/**"
+      - "test_data/**"
+      - "crates/blockchain/dev/**"
       - "crates/vm/levm/**"
       - ".github/workflows/pr-main_l2_prover_nightly.yaml"
 

.github/workflows/pr-main_levm.yaml

@@ -322,6 +322,8 @@ jobs:
 
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
 
       - name: Run benchmarks
         run: |

.github/workflows/pr_perf_levm.yaml

@@ -35,6 +35,8 @@ jobs:
 
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
 
       - name: Run PR benchmarks
         run: |
@@ -89,6 +91,8 @@ jobs:
 
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
 
       - name: Run main benchmarks
         run: |

CHANGELOG.md

@@ -2,8 +2,16 @@
 
 ## Perf
 
+### 2025-04-22
+
+- Avoid calculating state transitions after every block in bulk mode [2519](https://github.com/lambdaclass/ethrex/pull/2519)
+
+- Transform the inlined variant of NodeHash to a constant sized array [2516](https://github.com/lambdaclass/ethrex/pull/2516)
+
 ### 2025-04-11
 
+- Removed some unnecessary clones and made some functions const: [2438](https://github.com/lambdaclass/ethrex/pull/2438)
+
 - Asyncify some DB read APIs, as well as its users [#2430](https://github.com/lambdaclass/ethrex/pull/2430)
 
 ### 2025-04-09

Makefile

@@ -161,16 +161,16 @@ start-node-with-flamegraph: rm-test-db ## 🚀🔥 Starts an ethrex client used
 	--datadir test_ethrex
 
 load-test: ## 🚧 Runs a load-test. Run make start-node-with-flamegraph and in a new terminal make load-node
-	cargo run --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t eth-transfers
+	cargo run --release --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t eth-transfers
 
 load-test-erc20:
-	cargo run --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t erc20
+	cargo run --release --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t erc20
 
 load-test-fibonacci:
-	cargo run --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t fibonacci
+	cargo run --release --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t fibonacci
 
 load-test-io:
-	cargo run --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t io-heavy
+	cargo run --release --manifest-path ./cmd/load_test/Cargo.toml -- -k ./test_data/private_keys.txt -t io-heavy
 
 rm-test-db:  ## 🛑 Removes the DB used by the ethrex client used for testing
 	sudo cargo run --release --bin ethrex -- removedb --force --datadir test_ethrex