Merge pull request #155 from scroll-tech/chore-merge-upstream-46d63e805

Chore merge upstream 46d63e8
scroll-tech · Feb 11, 2025 · a337c97 · a337c97
2 parents 449f951 + 3711e25
commit a337c97
Show file tree

Hide file tree

Showing 283 changed files with 6,451 additions and 4,501 deletions.
diff --git a/.github/assets/check_rv32imac.sh b/.github/assets/check_rv32imac.sh
@@ -8,6 +8,8 @@ crates_to_check=(
     reth-network-peers
     reth-trie-common
     reth-chainspec
+    reth-consensus
+    reth-consensus-common
 
     ## ethereum
     reth-ethereum-forks

diff --git a/.github/assets/check_wasm.sh b/.github/assets/check_wasm.sh
@@ -64,8 +64,10 @@ exclude_crates=(
   reth-stages-api # reth-provider, reth-prune
   reth-static-file # tokio
   reth-transaction-pool # c-kzg
+  reth-payload-util # reth-transaction-pool
   reth-trie-parallel # tokio
   reth-testing-utils
+  reth-optimism-txpool # reth-transaction-pool
   reth-scroll-cli # tokio
   reth-scroll-node # tokio
   reth-scroll # tokio
@@ -74,6 +76,7 @@ exclude_crates=(
   reth-scroll-evm # tokio
   reth-scroll-rpc #tokio
   reth-scroll-engine-primitives # proptest
+  reth-scroll-payload # c-kzg
 )
 
 # Array to hold the results

diff --git a/.github/assets/hive/build_simulators.sh b/.github/assets/hive/build_simulators.sh
@@ -11,7 +11,7 @@ go build .
 
 # Run each hive command in the background for each simulator and wait
 echo "Building images"
-./hive -client reth --sim "pyspec" -sim.timelimit 1s || true &
+./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-6%40v1.0.0/fixtures_pectra-devnet-6.tar.gz -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/engine" -sim.timelimit 1s || true &
 ./hive -client reth --sim "devp2p" -sim.timelimit 1s || true &
 ./hive -client reth --sim "ethereum/rpc-compat" -sim.timelimit 1s || true &
@@ -26,7 +26,8 @@ docker save hive/hiveproxy:latest -o ../hive_assets/hiveproxy.tar &
 docker save hive/simulators/devp2p:latest -o ../hive_assets/devp2p.tar &
 docker save hive/simulators/ethereum/engine:latest -o ../hive_assets/engine.tar &
 docker save hive/simulators/ethereum/rpc-compat:latest -o ../hive_assets/rpc_compat.tar &
-docker save hive/simulators/ethereum/pyspec:latest -o ../hive_assets/pyspec.tar &
+docker save hive/simulators/ethereum/eest/consume-engine:latest -o ../hive_assets/eest_engine.tar &
+docker save hive/simulators/ethereum/eest/consume-rlp:latest -o ../hive_assets/eest_rlp.tar &
 docker save hive/simulators/smoke/genesis:latest -o ../hive_assets/smoke_genesis.tar &
 docker save hive/simulators/smoke/network:latest -o ../hive_assets/smoke_network.tar &
 docker save hive/simulators/ethereum/sync:latest -o ../hive_assets/ethereum_sync.tar &

diff --git a/.github/assets/hive/expected_failures.yaml b/.github/assets/hive/expected_failures.yaml
@@ -15,8 +15,6 @@ rpc-compat:
 
   # https://github.com/paradigmxyz/reth/issues/13879
   - eth_createAccessList/create-al-contract-eip1559 (reth)
-  - eth_getBlockByNumber/get-genesis (reth)
-  - eth_getTransactionReceipt/get-setcode-tx (reth)
 
 # https://github.com/paradigmxyz/reth/issues/8732
 engine-withdrawals:
@@ -51,3 +49,9 @@ engine-cancun:
   - Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
 
 sync: []
+
+# no fix: it’s too expensive to check whether the storage is empty on each creation
+eest/consume-engine:
+  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-reth
+eest/consume-rlp:
+  - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test-zero_nonce]-reth
diff --git a/.github/assets/hive/load_images.sh b/.github/assets/hive/load_images.sh
@@ -11,6 +11,8 @@ IMAGES=(
     "/tmp/smoke_genesis.tar"
     "/tmp/smoke_network.tar"
     "/tmp/ethereum_sync.tar"
+    "/tmp/eest_engine.tar"
+    "/tmp/eest_rlp.tar"
     "/tmp/reth_image.tar"
 )
 
@@ -22,4 +24,4 @@ done
 
 wait
 
-docker image ls -a
+docker image ls -a
diff --git a/.github/assets/hive/run_simulator.sh b/.github/assets/hive/run_simulator.sh
@@ -7,7 +7,7 @@ sim="${1}"
 limit="${2}"
 
 run_hive() {
-    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 4 --client reth 2>&1 | tee /tmp/log || true
+    hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 8 --client reth 2>&1 | tee /tmp/log || true
 }
 
 check_log() {

diff --git a/.github/assets/kurtosis_op_network_params.yaml b/.github/assets/kurtosis_op_network_params.yaml
@@ -9,9 +9,13 @@ optimism_package:
     - participants:
       - el_type: op-geth
         cl_type: op-node
+        # https://github.com/ethpandaops/optimism-package/issues/157
+        cl_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:a79e8cc06aa354511983fafcb6d71ab04cdfadbc"
       - el_type: op-reth
         el_image: "ghcr.io/paradigmxyz/op-reth:kurtosis-ci"
         cl_type: op-node
+        # https://github.com/ethpandaops/optimism-package/issues/157
+        cl_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:a79e8cc06aa354511983fafcb6d71ab04cdfadbc"
       batcher_params:
         extra_params:
           - "--throttle-interval=0"
diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml
@@ -114,40 +114,38 @@ jobs:
               - eth_syncing
               # debug_ rpc methods
               - debug_
-          # Pyspec cancun jobs
-          # TODO: uncomment when https://github.com/ethereum/hive/issues/1147 is fixed
-          #- sim: pyspec
-          #  include: [cancun/eip4844]
-          #- sim: pyspec
-          #  include: [cancun/eip4788]
-          #- sim: pyspec
-          #  include: [cancun/eip6780]
-          #- sim: pyspec
-          #  include: [cancun/eip5656]
-          #- sim: pyspec
-          #  include: [cancun/eip1153]
-          #- sim: pyspec
-          #  include: [cancun/eip7516]
-          # Pyspec shanghai jobs
-          #- sim: pyspec
-          #  include: [shanghai/eip3651]
-          #- sim: pyspec
-          #  include: [shanghai/eip3855]
-          #- sim: pyspec
-          #  include: [shanghai/eip3860]
-          #- sim: pyspec
-          #  include: [shanghai/eip4895]
-          # Pyspec merge and earlier jobs
-          #- sim: pyspec
-          #  include: [merge/]
-          #- sim: pyspec
-          #  include: [berlin/]
-          #- sim: pyspec
-          #  include: [istanbul/]
-          #- sim: pyspec
-          #  include: [homestead/]
-          #- sim: pyspec
-          #  include: [frontier/]
+
+          # consume-engine
+          - sim: ethereum/eest/consume-engine
+            limit: tests/prague
+          - sim: ethereum/eest/consume-engine
+            limit: tests/cancun
+          - sim: ethereum/eest/consume-engine
+            limit: tests/shanghai
+          - sim: ethereum/eest/consume-engine
+            limit: tests/berlin
+          - sim: ethereum/eest/consume-engine
+            limit: tests/istanbul
+          - sim: ethereum/eest/consume-engine
+            limit: tests/homestead
+          - sim: ethereum/eest/consume-engine
+            limit: tests/frontier
+
+          # consume-rlp
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/prague
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/cancun
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/shanghai
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/berlin
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/istanbul
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/homestead
+          - sim: ethereum/eest/consume-rlp
+            limit: tests/frontier
     needs:
       - prepare-reth
       - prepare-hive

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -34,7 +34,6 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@clippy
         with:
-          toolchain: nightly-2025-01-16
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
@@ -57,7 +56,6 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2025-01-16
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
@@ -191,11 +189,11 @@ jobs:
           cargo udeps --workspace --lib --examples --tests --benches --all-features --locked \
             --exclude reth-optimism-cli --exclude reth-optimism-consensus --exclude reth-optimism-payload-builder \
             --exclude reth-optimism-node --exclude reth-optimism-evm --exclude reth-optimism-node --exclude reth-optimism-rpc \
-            --exclude op-reth --exclude "example-*" --exclude reth --exclude reth-payload-primitives \
+            --exclude reth-optimism-txpool --exclude op-reth --exclude "example-*" --exclude reth --exclude reth-payload-primitives \
             --exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
             --exclude reth-node-ethereum --exclude reth-scroll-cli --exclude reth-scroll-evm \
             --exclude reth-scroll-node --exclude scroll-reth --exclude reth-scroll-rpc  --exclude reth-scroll-trie \
-            --exclude reth-scroll-engine-primitives --exclude scroll-alloy-provider
+            --exclude reth-scroll-engine-primitives --exclude reth-scroll-payload --exclude scroll-alloy-provider
 
   book:
     name: book