Merge pull request #19 from scroll-tech/chore-merge-upstream-b787d9e5…

…2-v2

Chore merge upstream b787d9e v2

.github/assets/hive/expected_failures.yaml

@@ -20,23 +20,6 @@ rpc-compat:
   - eth_getBlockByNumber/get-latest (reth)
   - eth_getBlockByNumber/get-safe (reth)
 
-  - eth_createAccessList/create-al-contract-eip1559 (reth)
-  - eth_createAccessList/create-al-contract (reth)
-  - eth_getProof/get-account-proof-blockhash (reth)
-  - eth_getProof/get-account-proof-latest (reth)
-  - eth_getProof/get-account-proof-with-storage (reth)
-  - eth_getTransactionByBlockHashAndIndex/get-block-n (reth)
-  - eth_getTransactionByBlockNumberAndIndex/get-block-n (reth)
-  - eth_getTransactionByHash/get-access-list (reth)
-  - eth_getTransactionByHash/get-blob-tx (reth)
-  - eth_getTransactionByHash/get-dynamic-fee (reth)
-  - eth_getTransactionByHash/get-legacy-create (reth)
-  - eth_getTransactionByHash/get-legacy-input (reth)
-  - eth_getTransactionByHash/get-legacy-tx (reth)
-  - eth_getTransactionReceipt/get-legacy-contract (reth)
-  - eth_getTransactionReceipt/get-legacy-input (reth)
-  - eth_getTransactionReceipt/get-legacy-receipt (reth)'
-
   # https://github.com/paradigmxyz/reth/issues/8732
 engine-withdrawals:
   - Withdrawals Fork On Genesis (Paris) (reth)

.github/assets/hive/expected_failures_experimental.yaml

@@ -20,23 +20,6 @@ rpc-compat:
   - eth_getBlockByNumber/get-latest (reth)
   - eth_getBlockByNumber/get-safe (reth)
 
-  - eth_createAccessList/create-al-contract-eip1559 (reth)
-  - eth_createAccessList/create-al-contract (reth)
-  - eth_getProof/get-account-proof-blockhash (reth)
-  - eth_getProof/get-account-proof-latest (reth)
-  - eth_getProof/get-account-proof-with-storage (reth)
-  - eth_getTransactionByBlockHashAndIndex/get-block-n (reth)
-  - eth_getTransactionByBlockNumberAndIndex/get-block-n (reth)
-  - eth_getTransactionByHash/get-access-list (reth)
-  - eth_getTransactionByHash/get-blob-tx (reth)
-  - eth_getTransactionByHash/get-dynamic-fee (reth)
-  - eth_getTransactionByHash/get-legacy-create (reth)
-  - eth_getTransactionByHash/get-legacy-input (reth)
-  - eth_getTransactionByHash/get-legacy-tx (reth)
-  - eth_getTransactionReceipt/get-legacy-contract (reth)
-  - eth_getTransactionReceipt/get-legacy-input (reth)
-  - eth_getTransactionReceipt/get-legacy-receipt (reth)'
-
 # https://github.com/paradigmxyz/reth/issues/8732
 engine-withdrawals:
   - Withdrawals Fork On Genesis (Paris) (reth)

.github/workflows/lint.yml

@@ -30,7 +30,12 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
+      - name: Run clippy on binaries
+        run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
+        env:
+          RUSTFLAGS: -D warnings
+      - name: Run clippy on book binary sources
+        run: cargo clippy --manifest-path book/sources/Cargo.toml --workspace --bins
         env:
           RUSTFLAGS: -D warnings
 
@@ -128,7 +133,10 @@ jobs:
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
-      - run: cargo fmt --all --check
+      - name: Run fmt
+        run: cargo fmt --all --check
+      - name: Run fmt on book sources
+        run: cargo fmt --manifest-path book/sources/Cargo.toml --all --check
 
   udeps:
     name: udeps

.github/workflows/windows.yml

@@ -0,0 +1,47 @@
+# Windows build
+
+name: windows
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  merge_group:
+
+jobs:
+  check-reth:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: x86_64-pc-windows-gnu
+      - uses: taiki-e/install-action@cross
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: mingw-w64
+        run: sudo apt-get install -y mingw-w64
+      - name: Check Reth
+        run: cargo check --target x86_64-pc-windows-gnu
+
+  check-op-reth:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          target: x86_64-pc-windows-gnu
+      - uses: taiki-e/install-action@cross
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - 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

.gitignore

@@ -49,4 +49,7 @@ jwttoken/
 crates/storage/libmdbx-rs/mdbx-sys/libmdbx/cmake-build-debug
 
 # Rust bug report
-rustc-ice-*
+rustc-ice-*
+
+# Book sources should be able to build with the latest version
+book/sources/Cargo.lock