Merge upstream v19.5.0

.config/zepter.yaml

@@ -0,0 +1,36 @@
+version:
+  format: 1
+  # Minimum zepter version that is expected to work. This is just for printing a nice error
+  # message when someone tries to use an older version.
+  binary: 0.13.2
+
+# The examples in the following comments assume crate `A` to have a dependency on crate `B`.
+workflows:
+  check:
+    - [
+        "lint",
+        # Check that `A` activates the features of `B`.
+        "propagate-feature",
+        # These are the features to check:
+        "--features=std,serde",
+        # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
+        "--left-side-feature-missing=ignore",
+        # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
+        "--left-side-outside-workspace=ignore",
+        "--show-path",
+        "--quiet",
+      ]
+  default:
+    # Running `zepter` with no subcommand will check & fix.
+    - [$check.0, "--fix"]
+
+# Will be displayed when any workflow fails:
+help:
+  text: |
+    Revm uses the Zepter CLI to detect abnormalities in Cargo features, e.g. missing propagation.
+
+    It looks like one more checks failed; please check the console output.
+
+    You can try to automatically address them by installing zepter (`cargo install zepter --locked`) and simply running `zepter` in the workspace root.
+  links:
+    - "https://github.com/ggwpez/zepter"

.github/workflows/bench.yml

@@ -0,0 +1,37 @@
+name: Benchmark
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  codspeed:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Install cargo-codspeed
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-codspeed
+      - name: Build the benchmark target(s)
+        run: cargo codspeed build --profile profiling --workspace
+      - name: Run the benchmarks
+        uses: CodSpeedHQ/action@v3
+        with:
+          run: cargo codspeed run --workspace
+          token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/book.yml

@@ -32,7 +32,10 @@ jobs:
           echo `pwd`/mdbook-template >> $GITHUB_PATH
 
       - name: Run tests
-        run: mdbook test
+        run: |
+          cp README.md book/src/README.md
+          sed -i -e 's|../../README.md|README.md|g' book/src/SUMMARY.md
+          mdbook test
 
   lint:
     runs-on: ubuntu-latest
@@ -78,26 +81,26 @@ jobs:
           echo `pwd`/mdbook-template >> $GITHUB_PATH
 
       - name: Build book
-        run: mdbook build documentation
+        run: mdbook build book
 
       - name: Build docs
         run: RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --all --no-deps
 
       - name: Move docs to book folder
         run: |
           mkdir -p target/book/docs
-          mv target/doc documentation/book/docs
+          mv target/doc book/book/docs
 
       - name: Archive artifact
         shell: sh
         run: |
-          chmod -c -R +rX "documentation/book" |
+          chmod -c -R +rX "book/book" |
           while read line; do
              echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
           tar \
             --dereference --hard-dereference \
-            --directory "documentation/book" \
+            --directory "book/book" \
             -cvf "$RUNNER_TEMP/artifact.tar" \
             --exclude=.git \
             --exclude=.github \

.github/workflows/ci.yml

@@ -38,13 +38,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: ["", "optimism,kzg-rs"]
+        features: ["", "kzg-rs"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: riscv32imac-unknown-none-elf
-      - run: cargo check --target riscv32imac-unknown-none-elf --no-default-features --features=${{ matrix.features }}
+      - run: |
+          cargo check --target riscv32imac-unknown-none-elf --no-default-features --features=${{ matrix.features }}
+          cargo check --target riscv32imac-unknown-none-elf -p op-revm --no-default-features --features=${{ matrix.features }}
+          cargo check --target riscv32imac-unknown-none-elf -p revm-database --no-default-features
 
   check:
     name: check ${{ matrix.features }}
@@ -93,6 +96,18 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  # Check crates correctly propagate features
+  feature-propagation:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v4
+      - name: run zepter
+        run: |
+          cargo install zepter -f --locked
+          zepter --version
+          time zepter run check
 
   typos-check:
     name: TyposCheck
@@ -102,6 +117,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: crate-ci/typos@v1.22.7
         with:
-          config: ./Typos.toml
+          config: ./typos.toml
           isolated: true
-

.github/workflows/ethereum-tests.yml

@@ -47,15 +47,11 @@ jobs:
             ethtests/LegacyTests/Constantinople/GeneralStateTests/ \
             ethtests/EIPTests/StateTests/stEIP1153-transientStorage/ \
             ethtests/EIPTests/StateTests/stEIP4844-blobtransactions/ \
-            ethtests/EIPTests/StateTests/stEIP2537/ \
             ethtests/EIPTests/StateTests/stEOF \
             tests/eof_suite/eest/state_tests \
-            tests/eof_suite/evmone/state_tests \
-            tests/prague_suite/state_tests
+            tests/pectra/state_tests/prague
       - name: Run EOF validation tests
         run: |
           cross run --target ${{matrix.target}} --profile ${{ matrix.profile }} -p revme -- eof-validation \
-          ethtests/EOFTests \
-          tests/eof_suite/eest/eof_tests/prague \
-          tests/eof_suite/evmone/eof_tests
+          tests/eof_suite/eest/eof_tests/osaka
 

.gitignore

@@ -10,7 +10,6 @@ pkg/
 bins/revme/temp_folder
 bins/revme/tests
 ethereumjs-util.js
-book
 
 # Generated by the block traces example
 traces
@@ -19,3 +18,8 @@ burntpix/svgs
 
 # Rust bug report
 rustc-ice-*
+
+# book output of README.md generated by `mdbook serve book`
+/book/book
+/book/cache.json
+/index.html