Merge pull request #337 from scroll-tech/chore-merge-upstream-1b08843bc

chore: merge upstream 1b08843

Author: greged93

.config/nextest.toml

@@ -6,6 +6,10 @@ slow-timeout = { period = "30s", terminate-after = 4 }
 filter = "test(general_state_tests)"
 slow-timeout = { period = "1m", terminate-after = 10 }
 
+[[profile.default.overrides]]
+filter = "test(eest_fixtures)"
+slow-timeout = { period = "2m", terminate-after = 10 }
+
 # E2E tests using the testsuite framework from crates/e2e-test-utils
 # These tests are located in tests/e2e-testsuite/ directories across various crates
 [[profile.default.overrides]]

.github/CODEOWNERS

@@ -1,13 +1,11 @@
 *                           @gakonst
-bin/                        @onbjerg
 crates/blockchain-tree-api/ @rakita @rkrasiuk @mattsse @Rjected
 crates/blockchain-tree/     @rakita @rkrasiuk @mattsse @Rjected
 crates/chain-state/         @fgimenez @mattsse @rkrasiuk
 crates/chainspec/           @Rjected @joshieDo @mattsse
-crates/cli/                 @onbjerg @mattsse
-crates/config/              @onbjerg
+crates/cli/                 @mattsse
 crates/consensus/           @rkrasiuk @mattsse @Rjected
-crates/e2e-test-utils/      @mattsse @Rjected
+crates/e2e-test-utils/      @mattsse @Rjected @klkvr @fgimenez
 crates/engine               @rkrasiuk @mattsse @Rjected
 crates/engine/              @rkrasiuk @mattsse @Rjected @fgimenez
 crates/era/                 @mattsse @RomanHodulak
@@ -16,12 +14,10 @@ crates/ethereum-forks/      @mattsse @Rjected
 crates/ethereum/            @mattsse @Rjected
 crates/etl/                 @joshieDo @shekhirin
 crates/evm/                 @rakita @mattsse @Rjected
-crates/exex/                @onbjerg @shekhirin
-crates/fs-util/             @onbjerg
-crates/metrics/             @onbjerg
+crates/exex/                @shekhirin
 crates/net/                 @mattsse @Rjected
-crates/net/downloaders/     @onbjerg @rkrasiuk
-crates/node/                @mattsse @Rjected @onbjerg @klkvr
+crates/net/downloaders/     @rkrasiuk
+crates/node/                @mattsse @Rjected @klkvr
 crates/optimism/            @mattsse @Rjected @fgimenez
 crates/payload/             @mattsse @Rjected
 crates/primitives-traits/   @Rjected @RomanHodulak @mattsse @klkvr
@@ -30,21 +26,20 @@ crates/prune/               @shekhirin @joshieDo
 crates/ress                 @rkrasiuk
 crates/revm/                @mattsse @rakita
 crates/rpc/                 @mattsse @Rjected @RomanHodulak
-crates/stages/              @onbjerg @rkrasiuk @shekhirin
+crates/stages/              @rkrasiuk @shekhirin
 crates/static-file/         @joshieDo @shekhirin
 crates/storage/codecs/      @joshieDo
 crates/storage/db-api/      @joshieDo @rakita
-crates/storage/db-common/   @Rjected @onbjerg
+crates/storage/db-common/   @Rjected
 crates/storage/db/          @joshieDo @rakita
-crates/storage/errors/      @rakita @onbjerg
+crates/storage/errors/      @rakita
 crates/storage/libmdbx-rs/  @rakita @shekhirin
 crates/storage/nippy-jar/   @joshieDo @shekhirin
 crates/storage/provider/    @rakita @joshieDo @shekhirin
 crates/storage/storage-api/ @joshieDo @rkrasiuk
 crates/tasks/               @mattsse
 crates/tokio-util/          @fgimenez
-crates/tracing/             @onbjerg
 crates/transaction-pool/    @mattsse
 crates/trie/                @rkrasiuk @Rjected @shekhirin @mediocregopher
-etc/                        @Rjected @onbjerg @shekhirin
-.github/                    @onbjerg @gakonst @DaniPopes
+etc/                        @Rjected @shekhirin
+.github/                    @gakonst @DaniPopes

.github/assets/check_wasm.sh

@@ -40,6 +40,7 @@ exclude_crates=(
   reth-node-events
   reth-node-metrics
   reth-optimism-cli
+  reth-optimism-flashblocks
   reth-optimism-node
   reth-optimism-payload-builder
   reth-optimism-rpc

.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 "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v4.4.0/fixtures_develop.tar.gz --sim.buildarg branch=v4.4.0 -sim.timelimit 1s || true &
+./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.0.0/fixtures_develop.tar.gz --sim.buildarg branch=v5.0.0 -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 &

.github/assets/hive/expected_failures.yaml

@@ -8,9 +8,6 @@ rpc-compat:
 
   - eth_getStorageAt/get-storage-invalid-key-too-large (reth)
   - eth_getStorageAt/get-storage-invalid-key (reth)
-  - eth_getTransactionReceipt/get-access-list (reth)
-  - eth_getTransactionReceipt/get-blob-tx (reth)
-  - eth_getTransactionReceipt/get-dynamic-fee (reth)
   - eth_getTransactionReceipt/get-legacy-contract (reth)
   - eth_getTransactionReceipt/get-legacy-input (reth)
   - eth_getTransactionReceipt/get-legacy-receipt (reth)
@@ -75,10 +72,6 @@ eest/consume-engine:
   - tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py::test_system_contract_deployment[fork_CancunToPragueAtTime15k-blockchain_test_engine-deploy_after_fork-zero_balance]-reth
   - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_False]-reth
   - tests/prague/eip6110_deposits/test_modified_contract.py::test_invalid_log_length[fork_Prague-blockchain_test_engine-slice_bytes_True]-reth
-  # the next test expects a concrete new format in the error message, there is no spec for this message, so it is ok to ignore
-  - tests/cancun/eip4844_blobs/test_blob_txs.py::test_blob_type_tx_pre_fork[fork_ShanghaiToCancunAtTime15k-blockchain_test_engine_from_state_test-one_blob_tx]-reth
-# 7702 test - no fix: it’s too expensive to check whether the storage is empty on each creation
-# rest of tests - see above
 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
   - tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py::test_system_contract_errors[fork_Prague-blockchain_test_engine-system_contract_reaches_gas_limit-system_contract_0x0000bbddc7ce488642fb579f8b00f3a590007251]-reth

.github/assets/hive/ignored_tests.yaml

@@ -11,7 +11,19 @@
 #
 # When a test should no longer be ignored, remove it from this list.
 
+# flaky
 engine-withdrawals:
-  # flaky
   - Withdrawals Fork on Block 1 - 8 Block Re-Org NewPayload (Paris) (reth)
+  - Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org (Paris) (reth)
+engine-cancun:
+  - Transaction Re-Org, New Payload on Revert Back (Cancun) (reth)
+  - Transaction Re-Org, Re-Org to Different Block
+  - Transaction Re-Org, Re-Org Out
+engine-api:
+  - Transaction Re-Org, Re-Org Out (Paris) (reth)
+  - Transaction Re-Org, Re-Org to Different Block (Paris) (reth)
+  - Transaction Re-Org, New Payload on Revert Back (Paris) (reth)
+  - Transaction Re-Org, Re-Org to Different Block (Paris) (reth)
+  - Invalid Missing Ancestor Syncing ReOrg, Transaction Nonce, EmptyTxs=False, CanonicalReOrg=False, Invalid P9 (Paris) (reth)
+  - Multiple New Payloads Extending Canonical Chain, Wait for Canonical Payload (Paris) (reth)
 

.github/assets/kurtosis_op_network_params.yaml

@@ -4,6 +4,7 @@ ethereum_package:
       el_extra_params:
         - "--rpc.eth-proof-window=100"
       cl_type: teku
+      cl_image: "consensys/teku:25.7"
   network_params:
     preset: minimal
     genesis_delay: 5

.github/workflows/bench.yml

@@ -17,7 +17,7 @@ jobs:
   codspeed:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - uses: rui314/setup-mold@v1

.github/workflows/book.yml

@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install bun
         uses: oven-sh/setup-bun@v2
@@ -43,7 +43,7 @@ jobs:
         uses: actions/configure-pages@v5
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: "./docs/vocs/docs/dist"
 

.github/workflows/compact.yml

@@ -31,15 +31,15 @@ jobs:
         with:
           cache-on-failure: true
       - name: Checkout base
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           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
       - name: Checkout PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           clean: false
       # On incoming merge try to read and decode previously generated vectors with `Compact`