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

…post-state-provider
scroll-tech · Dec 2, 2024 · b638e50 · b638e50
2 parents 593587e + fbf8e9e
commit b638e50
Show file tree

Hide file tree

Showing 413 changed files with 9,894 additions and 3,531 deletions.
diff --git a/.github/assets/hive/Dockerfile b/.github/assets/hive/Dockerfile
@@ -5,4 +5,5 @@ COPY dist/reth /usr/local/bin
 COPY LICENSE-* ./
 
 EXPOSE 30303 30303/udp 9001 8545 8546
-ENTRYPOINT ["/usr/local/bin/reth"]
+ENV RUST_LOG=debug
+ENTRYPOINT ["/usr/local/bin/reth"]
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -18,8 +18,7 @@ concurrency:
 name: bench
 jobs:
   iai:
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     # Only run benchmarks in merge groups and on main
     if: github.event_name != 'pull_request'
     steps:

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -4,9 +4,9 @@ name: book
 
 on:
   push:
-    branches: [main]
+    branches: [main, scroll]
   pull_request:
-    branches: [main]
+    branches: [main, scroll]
   merge_group:
 
 jobs:

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

diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml
@@ -4,10 +4,10 @@ name: deny
 
 on:
   push:
-    branches: [main]
+    branches: [main, scroll]
     paths: [Cargo.lock]
   pull_request:
-    branches: [main]
+    branches: [main, scroll]
     paths: [Cargo.lock]
   merge_group:
 

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

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,15 +19,16 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.network }}
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     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

diff --git a/.github/workflows/kurtosis-op.yml b/.github/workflows/kurtosis-op.yml
@@ -102,6 +102,8 @@ jobs:
             if [ $BLOCK_GETH -ge 100 ] && [ $BLOCK_RETH -ge 100 ] ; then exit 0; fi
             echo "Waiting for clients to advance..., Reth: $BLOCK_RETH Geth: $BLOCK_GETH"
           done
+          kurtosis service logs -a op-devnet op-el-2-op-reth-op-node-op-kurtosis
+          kurtosis service logs -a op-devnet op-cl-2-op-node-op-reth-op-kurtosis
           exit 1
 
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -152,7 +152,13 @@ jobs:
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@cargo-udeps
-      - run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked
+        # 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
 
   book:
     name: book

diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml
@@ -0,0 +1,33 @@
+name: Build and publish forkdiff github-pages
+permissions:
+  contents: write
+on:
+  push:
+    branches:
+      - scroll
+jobs:
+  deploy:
+    concurrency: ci-${{ github.ref }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1000  # make sure to fetch the old commit we diff against
+
+      - name: Build forkdiff
+        uses: "docker://protolambda/forkdiff:0.1.0"
+        with:
+          args: -repo=/github/workspace -fork=/github/workspace/fork.yaml -out=/github/workspace/index.html
+
+      - name: Build pages
+        run: |
+          mkdir -p tmp/pages
+          mv index.html tmp/pages/index.html
+          touch tmp/pages/.nojekyll
+
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: tmp/pages
+          clean: true
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [ main, scroll ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -22,8 +22,7 @@ jobs:
     name: stage-run-test
     # Only run stage commands test in merge groups
     if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -4,8 +4,6 @@ name: stale issues
 
 on:
   workflow_dispatch: {}
-  schedule:
-    - cron: "30 1 * * *"
 
 jobs:
   close-issues:

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

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,8 +19,7 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     strategy:
@@ -35,11 +34,11 @@ jobs:
             partition: 2
             total_partitions: 2
           - type: optimism
-            args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*"
+            args: --features "asm-keccak optimism" --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-*"
+            args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
             partition: 2
             total_partitions: 2
           - type: book
@@ -48,6 +47,8 @@ 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
@@ -61,19 +62,21 @@ jobs:
       - name: Run tests
         run: |
           cargo nextest run \
-            ${{ matrix.args }} --workspace --exclude ef-tests \
+            ${{ matrix.args }} --workspace \
+            --exclude ef-tests --no-tests=warn \
             --partition hash:${{ matrix.partition }}/2 \
             -E "!kind(test)"
 
   state:
     name: Ethereum state tests
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     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
@@ -92,8 +95,7 @@ jobs:
 
   doc:
     name: doc tests (${{ matrix.network }})
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30