Merge pull request bnb-chain#150 from bnb-chain/merge/upstream_v1.0.7

chore: merge upstream v1.0.7
forcodedancing · Sep 29, 2024 · dd637d6 · dd637d6
2 parents afc0917 + d1a9d9f
commit dd637d6
Show file tree

Hide file tree

Showing 761 changed files with 18,522 additions and 12,642 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -44,4 +44,5 @@ crates/tokio-util/          @fgimenez @emhane
 crates/tracing/             @onbjerg
 crates/transaction-pool/    @mattsse
 crates/trie/                @rkrasiuk @Rjected
+etc/                        @Rjected @onbjerg @shekhirin
 .github/                    @onbjerg @gakonst @DaniPopes
diff --git a/.github/assets/check_wasm.sh b/.github/assets/check_wasm.sh
@@ -45,6 +45,7 @@ exclude_crates=(
   reth-net-nat
   reth-network
   reth-node-api
+  reth-node-types
   reth-node-builder
   reth-node-core
   reth-node-ethereum
@@ -68,18 +69,16 @@ exclude_crates=(
   reth-stages
   reth-storage-errors
   # The following are not supposed to be working
-  reth # all of the crates below 
-  reth-db # mdbx
+  reth # all of the crates below
+  reth-invalid-block-hooks # reth-provider
   reth-libmdbx # mdbx
   reth-mdbx-sys # mdbx
-  reth-nippy-jar # sucds
-  reth-provider # reth-db, reth-nippy-jar
-  reth-prune # reth-db
+  reth-provider # tokio
+  reth-prune # tokio
   reth-stages-api # reth-provider, reth-prune
-  reth-static-file # reth-nippy-jar 
+  reth-static-file # tokio
   reth-transaction-pool # c-kzg
-  reth-trie-db # reth-db 
-  reth-trie-parallel # reth-db
+  reth-trie-parallel # tokio
 )
 
 # Array to hold the results

diff --git a/.github/assets/hive/expected_failures.yaml b/.github/assets/hive/expected_failures.yaml
@@ -13,6 +13,13 @@ rpc-compat:
   - eth_getTransactionReceipt/get-access-list (reth)
   - eth_getTransactionReceipt/get-blob-tx (reth)
   - eth_getTransactionReceipt/get-dynamic-fee (reth)
+  - eth_getBlockByHash/get-block-by-hash (reth)
+  - eth_getBlockByNumber/get-block-n (reth)
+  - eth_getBlockByNumber/get-finalized (reth)
+  - eth_getBlockByNumber/get-genesis (reth)
+  - eth_getBlockByNumber/get-latest (reth)
+  - eth_getBlockByNumber/get-safe (reth)
+  - eth_sendRawTransaction/send-blob-tx (reth)
 
 # https://github.com/paradigmxyz/reth/issues/8732
 engine-withdrawals:
@@ -63,8 +70,6 @@ engine-cancun:
   - Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=True, Invalid P9 (Cancun) (reth)
   - Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
   - Invalid NewPayload, ParentBeaconBlockRoot, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, Blob Count on BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
   - Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
 
 # https://github.com/paradigmxyz/reth/issues/8579

diff --git a/.github/assets/hive/expected_failures_experimental.yaml b/.github/assets/hive/expected_failures_experimental.yaml
@@ -13,6 +13,13 @@ rpc-compat:
   - eth_getTransactionReceipt/get-access-list (reth)
   - eth_getTransactionReceipt/get-blob-tx (reth)
   - eth_getTransactionReceipt/get-dynamic-fee (reth)
+  - eth_getBlockByHash/get-block-by-hash (reth)
+  - eth_getBlockByNumber/get-block-n (reth)
+  - eth_getBlockByNumber/get-finalized (reth)
+  - eth_getBlockByNumber/get-genesis (reth)
+  - eth_getBlockByNumber/get-latest (reth)
+  - eth_getBlockByNumber/get-safe (reth)
+  - eth_sendRawTransaction/send-blob-tx (reth)
 
 # https://github.com/paradigmxyz/reth/issues/8732
 engine-withdrawals:
@@ -37,12 +44,7 @@ engine-withdrawals:
 
 # https://github.com/paradigmxyz/reth/issues/8305
 # https://github.com/paradigmxyz/reth/issues/6217
-engine-api:
-  - Re-org to Previously Validated Sidechain Payload (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P9 (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P10 (Paris) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P10 (Paris) (reth)
+engine-api: []
 
 # https://github.com/paradigmxyz/reth/issues/8305
 # https://github.com/paradigmxyz/reth/issues/6217
@@ -51,14 +53,11 @@ engine-api:
 engine-cancun:
   - Blob Transaction Ordering, Multiple Clients (Cancun) (reth)
   - Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
-  - Invalid NewPayload, BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Invalid NewPayload, Blob Count on BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
   - Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
-  - Re-org to Previously Validated Sidechain Payload (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P9 (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P10 (Cancun) (reth)
-  - Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P10 (Cancun) (reth)
+  - Invalid NewPayload, VersionedHashes, Syncing=False, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
+  - Invalid NewPayload, VersionedHashes Version, Syncing=False, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
+  - Invalid NewPayload, Incomplete VersionedHashes, Syncing=False, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
+  - Invalid NewPayload, Extra VersionedHashes, Syncing=False, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
 
 # https://github.com/paradigmxyz/reth/issues/8579
 sync:

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -54,7 +54,7 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: ./Cargo.lock
           commit-message: ${{ steps.msg.outputs.commit_message }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,8 +8,8 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  TOOL_CHAIN: "1.80"
-  TOOL_CHAIN_NIGHTLY: "nightly-2024-09-01"
+  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN_NIGHTLY: "nightly-2024-09-09"
 
 jobs:
   clippy-binaries:
@@ -40,21 +40,38 @@ jobs:
         env:
           RUSTFLAGS: -D warnings
 
-  #  wasm:
-  #    runs-on: ubuntu-latest
-  #    timeout-minutes: 30
-  #    steps:
-  #      - uses: actions/checkout@v4
-  #      - uses: dtolnay/rust-toolchain@stable
-  #        with:
-  #          target: wasm32-wasip1
-  #          toolchain: ${{ env.TOOL_CHAIN }}
-  #      - uses: taiki-e/install-action@cargo-hack
-  #      - uses: Swatinem/rust-cache@v2
-  #        with:
-  #          cache-on-failure: true
-  #      - name: Run Wasm checks
-  #        run: .github/assets/check_wasm.sh ${{ env.TOOL_CHAIN }}
+  # clippy:
+  #   name: clippy
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 30
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/rust-toolchain@nightly
+  #       with:
+  #         toolchain: ${{ env.TOOL_CHAIN_NIGHTLY }}
+  #         components: clippy
+  #     - uses: Swatinem/rust-cache@v2
+  #       with:
+  #         cache-on-failure: true
+  #     - run: cargo clippy --workspace --lib --examples --tests --benches --all-features --locked
+  #       env:
+  #         RUSTFLAGS: -D warnings
+
+  # wasm:
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 30
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/rust-toolchain@stable
+  #       with:
+  #         target: wasm32-wasip1
+  #     - uses: taiki-e/install-action@cargo-hack
+  #     - uses: Swatinem/rust-cache@v2
+  #       with:
+  #         cache-on-failure: true
+  #     - uses: dcarbone/install-jq-action@v2
+  #     - name: Run Wasm checks
+  #       run: .github/assets/check_wasm.sh
 
   crate-checks:
     runs-on: ubuntu-latest
@@ -68,7 +85,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo hack check
+      - run: cargo hack check --workspace --exclude op-reth
+      - run: cargo check -p op-reth --features "optimism opbnb"
 
   msrv:
     name: MSRV / ${{ matrix.network }}
@@ -110,6 +128,39 @@ jobs:
           toolchain: ${{ env.TOOL_CHAIN_NIGHTLY }} # fmt need the nightly flag, please update this if reallly needed
       - run: cargo fmt --all --check
 
+  # udeps:
+  #   name: udeps
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 30
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/rust-toolchain@nightly
+  #     - uses: Swatinem/rust-cache@v2
+  #       with:
+  #         cache-on-failure: true
+  #     - uses: taiki-e/install-action@cargo-udeps
+  #     - run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked
+
+  # book:
+  #   name: book
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 30
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/rust-toolchain@nightly
+  #     - uses: dtolnay/rust-toolchain@master
+  #       with:
+  #         toolchain: ${{ env.TOOL_CHAIN }} # MSRV
+  #     - uses: Swatinem/rust-cache@v2
+  #       with:
+  #         cache-on-failure: true
+  #     - run: cargo build --bin reth --workspace --features ethereum
+  #   env:
+  #     RUSTFLAGS: -D warnings
+  # - run: ./book/cli/update.sh target/debug/reth
+  # - name: Check book changes
+  #   run: git diff --exit-code
+
   codespell:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -163,6 +214,8 @@ jobs:
       - clippy-binaries
       - crate-checks
       - fmt
+      # - udeps
+      # - book
       - codespell
       - grafana
       - no-test-deps

diff --git a/.github/workflows/op-sync.yml b/.github/workflows/op-sync.yml
@@ -33,8 +33,7 @@ jobs:
         with:
           cache-on-failure: true
       - name: Build op-reth
-        run: |
-          cargo install --features asm-keccak,jemalloc,optimism --bin op-reth --path bin/reth
+        run: make install-op
       - name: Run sync
         # https://basescan.org/block/10000
         run: |