Revert "Merge remote-tracking branch 'scroll/scroll' into feat/hashed…

…-post-state-provider"

This reverts commit d841e22, reversing
changes made to 06f01c4.

.github/workflows/bench.yml

@@ -18,7 +18,8 @@ concurrency:
 name: bench
 jobs:
   iai:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     # Only run benchmarks in merge groups and on main
     if: github.event_name != 'pull_request'
     steps:

.github/workflows/book.yml

@@ -4,9 +4,9 @@ name: book
 
 on:
   push:
-    branches: [main, scroll]
+    branches: [main]
   pull_request:
-    branches: [main, scroll]
+    branches: [main]
   merge_group:
 
 jobs:

.github/workflows/compact.yml

@@ -10,15 +10,16 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [scroll]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
 
 name: compact-codec
 jobs:
   compact-codec:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     strategy:
       matrix:
         bin:
@@ -32,8 +33,8 @@ jobs:
       - name: Checkout base
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.base_ref || 'scroll' }}
-      # On `scroll` branch, generates test vectors and serializes them to disk using `Compact`.
+          ref: ${{ github.base_ref || 'main' }}
+      # On `main` branch, generates test vectors and serializes them to disk using `Compact`.
       - name: Generate compact vectors
         run: |
           ${{ matrix.bin }} -- test-vectors compact --write

.github/workflows/deny.yml

@@ -4,10 +4,10 @@ name: deny
 
 on:
   push:
-    branches: [main, scroll]
+    branches: [main]
     paths: [Cargo.lock]
   pull_request:
-    branches: [main, scroll]
+    branches: [main]
     paths: [Cargo.lock]
   merge_group:
 

.github/workflows/hive.yml

@@ -19,7 +19,8 @@ jobs:
   prepare-reth:
     if: github.repository == 'paradigmxyz/reth'
     timeout-minutes: 45
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     steps:
       - uses: actions/checkout@v4
       - run: mkdir artifacts
@@ -52,7 +53,8 @@ jobs:
   prepare-hive:
     if: github.repository == 'paradigmxyz/reth'
     timeout-minutes: 45
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     steps:
       - uses: actions/checkout@v4
       - name: Checkout hive tests
@@ -179,7 +181,8 @@ jobs:
       - prepare-reth
       - prepare-hive
     name: run ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     permissions:
       issues: write
     steps:
@@ -246,7 +249,8 @@ jobs:
   notify-on-error:
     needs: test
     if: failure()
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     steps:
       - name: Slack Webhook Action
         uses: rtCamp/action-slack-notify@v2

.github/workflows/integration.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main, scroll]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,16 +19,15 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.network }}
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     env:
       RUST_BACKTRACE: 1
     strategy:
       matrix:
         network: ["ethereum", "optimism"]
     timeout-minutes: 60
     steps:
-      - name: Free up disk space
-        run: rm -rf /opt/hostedtoolcache
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Install Geth

.github/workflows/lint.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main, scroll]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -152,13 +152,7 @@ jobs:
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@cargo-udeps
-        # due to the scroll feature flag, we need to exclude some crates that were annotated with
-        # #![cfg(not(feature = "scroll))].
-      - run: |
-          cargo udeps --workspace --lib --examples --tests --benches --all-features --locked \
-            --exclude "reth-optimism-*" --exclude op-reth --exclude "example-*" --exclude reth \
-            --exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
-            --exclude reth-node-ethereum
+      - run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked
 
   book:
     name: book

.github/workflows/stage.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main, scroll ]
+    branches: [ main ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -22,7 +22,8 @@ jobs:
     name: stage-run-test
     # Only run stage commands test in merge groups
     if: github.event_name == 'merge_group'
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

.github/workflows/stale.yml

@@ -4,6 +4,8 @@ name: stale issues
 
 on:
   workflow_dispatch: {}
+  schedule:
+    - cron: "30 1 * * *"
 
 jobs:
   close-issues:

.github/workflows/sync.yml

@@ -15,7 +15,8 @@ concurrency:
 jobs:
   sync:
     name: sync (${{ matrix.chain.bin }})
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

.github/workflows/unit.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main, scroll]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,7 +19,8 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     env:
       RUST_BACKTRACE: 1
     strategy:
@@ -34,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 optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*"
             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 optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*"
             partition: 2
             total_partitions: 2
           - type: book
@@ -47,8 +48,6 @@ jobs:
             total_partitions: 1
     timeout-minutes: 30
     steps:
-      - name: Free up disk space
-        run: rm -rf /opt/hostedtoolcache
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
@@ -62,21 +61,19 @@ jobs:
       - name: Run tests
         run: |
           cargo nextest run \
-            ${{ matrix.args }} --workspace \
-            --exclude ef-tests --no-tests=warn \
+            ${{ matrix.args }} --workspace --exclude ef-tests \
             --partition hash:${{ matrix.partition }}/2 \
             -E "!kind(test)"
 
   state:
     name: Ethereum state tests
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
     timeout-minutes: 30
     steps:
-      - name: Free up disk space
-        run: rm -rf /opt/hostedtoolcache
       - uses: actions/checkout@v4
       - name: Checkout ethereum/tests
         uses: actions/checkout@v4
@@ -95,7 +92,8 @@ jobs:
 
   doc:
     name: doc tests (${{ matrix.network }})
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Reth
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30