Merge branch 'main' into Thegaram-patch-1

scroll-tech · Oct 1, 2024 · 1da5a5e · 1da5a5e
2 parents 9ba3489 + 6d57b9e
commit 1da5a5e
Show file tree

Hide file tree

Showing 486 changed files with 5,727 additions and 6,385 deletions.
diff --git a/.github/assets/check_wasm.sh b/.github/assets/check_wasm.sh
@@ -35,7 +35,6 @@ exclude_crates=(
   reth-ethereum-payload-builder
   reth-etl
   reth-evm-ethereum
-  reth-evm-optimism
   reth-execution-errors
   reth-exex
   reth-exex-test-utils
@@ -49,8 +48,9 @@ exclude_crates=(
   reth-node-ethereum
   reth-node-events
   reth-node-metrics
-  reth-node-optimism
   reth-optimism-cli
+  reth-optimism-evm
+  reth-optimism-node
   reth-optimism-payload-builder
   reth-optimism-rpc
   reth-payload-builder

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -46,7 +46,7 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-optimism --features "optimism"
+            --locked -p reth-optimism-node --features "optimism"
 
   integration-success:
     name: integration success

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -39,6 +39,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
+          toolchain: nightly-2024-09-25
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with: