Merge remote-tracking branch 'origin/main' into alexey/state-root-tas…

…k-state-update-chunk

.config/zepter.yaml

@@ -12,7 +12,7 @@ workflows:
         # Check that `A` activates the features of `B`.
         "propagate-feature",
         # These are the features to check:
-        "--features=std,optimism,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench",
+        "--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench",
         # 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.

.github/assets/check_rv32imac.sh

@@ -16,6 +16,7 @@ crates_to_check=(
     reth-execution-errors
     reth-execution-types
     reth-db-models
+    reth-evm
 
     ## ethereum
     reth-ethereum-forks

.github/assets/check_wasm.sh

@@ -28,7 +28,6 @@ exclude_crates=(
   reth-ethereum-cli
   reth-ethereum-payload-builder
   reth-etl
-  reth-evm
   reth-exex
   reth-exex-test-utils
   reth-ipc
@@ -45,6 +44,8 @@ exclude_crates=(
   reth-optimism-payload-builder
   reth-optimism-rpc
   reth-optimism-chain-registry
+  reth-optimism-consensus
+  reth-optimism-evm
   reth-rpc
   reth-rpc-api
   reth-rpc-api-testing-util

.github/assets/hive/expected_failures.yaml

@@ -52,6 +52,6 @@ sync: []
 
 # no fix: it’s too expensive to check whether the storage is empty on each creation
 eest/consume-engine:
-  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-reth
+  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-blockchain_test_engine-reth
 eest/consume-rlp:
-  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test-zero_nonce]-reth
+  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test-zero_nonce]-blockchain_test-reth

.github/workflows/compact.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         bin:
           - cargo run --bin reth --features "dev"
-          - cargo run --bin op-reth --features "optimism dev" --manifest-path crates/optimism/bin/Cargo.toml
+          - cargo run --bin op-reth --features "dev" --manifest-path crates/optimism/bin/Cargo.toml
     steps:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/integration.yml

@@ -48,7 +48,7 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-optimism-node --features "optimism"
+            --locked -p reth-optimism-node
 
   integration-success:
     name: integration success

.github/workflows/kurtosis-op.yml

@@ -21,7 +21,7 @@ jobs:
     with:
       image_tag: ghcr.io/paradigmxyz/op-reth:kurtosis-ci
       binary_name: op-reth
-      cargo_features: optimism,asm-keccak
+      cargo_features: asm-keccak
       cargo_package: crates/optimism/bin/Cargo.toml
 
   test:

.github/workflows/lint.yml

@@ -18,11 +18,8 @@ jobs:
       matrix:
         include:
           - type: ethereum
-            args: --bin reth --workspace --lib --examples --tests --benches --locked
+            args: --workspace --lib --examples --tests --benches --locked
             features: "ethereum asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
-          - type: optimism
-            args: --bin op-reth --workspace --lib --examples --tests --benches --locked
-            features: "optimism asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
           - type: book
             args: --manifest-path book/sources/Cargo.toml --workspace --bins
             features: ""
@@ -108,20 +105,17 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo hack check --workspace --exclude op-reth
-      - run: cargo check -p op-reth --features "optimism"
+      - run: cargo hack check --workspace
 
   msrv:
-    name: MSRV / ${{ matrix.network }}
+    name: MSRV
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
         include:
           - binary: reth
-            network: ethereum
           - binary: op-reth
-            network: optimism
     steps:
       - uses: actions/checkout@v4
       - uses: rui314/setup-mold@v1
@@ -131,7 +125,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo build --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }}"
+      - run: cargo build --bin "${{ matrix.binary }}" --workspace
         env:
           RUSTFLAGS: -D warnings
 

.github/workflows/unit.yml

@@ -35,11 +35,11 @@ jobs:
             partition: 2
             total_partitions: 2
           - type: optimism
-            args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
+            args: --features "asm-keccak" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
             partition: 1
             total_partitions: 2
           - type: optimism
-            args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
+            args: --features "asm-keccak" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
             partition: 2
             total_partitions: 2
           - type: book
@@ -94,15 +94,12 @@ jobs:
       - run: cargo nextest run --release -p ef-tests --features "asm-keccak ef-tests"
 
   doc:
-    name: doc tests (${{ matrix.network }})
+    name: doc tests
     runs-on:
       group: Reth
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30
-    strategy:
-      matrix:
-        network: ["ethereum", "optimism"]
     steps:
       - uses: actions/checkout@v4
       - uses: rui314/setup-mold@v1
@@ -111,7 +108,7 @@ jobs:
         with:
           cache-on-failure: true
       - name: Run doctests
-        run: cargo test --doc --workspace --features "${{ matrix.network }}"
+        run: cargo test --doc --workspace --all-features
 
   unit-success:
     name: unit success

.github/workflows/windows.yml

@@ -46,4 +46,4 @@ jobs:
       - name: mingw-w64
         run: sudo apt-get install -y mingw-w64
       - name: Check OP-Reth
-        run: cargo check -p op-reth --features optimism --target x86_64-pc-windows-gnu
+        run: cargo check -p op-reth --target x86_64-pc-windows-gnu