Merge upstream v1.1.4

.config/zepter.yaml

@@ -0,0 +1,41 @@
+version:
+  format: 1
+  # Minimum zepter version that is expected to work. This is just for printing a nice error
+  # message when someone tries to use an older version.
+  binary: 0.13.2
+
+# The examples in the following comments assume crate `A` to have a dependency on crate `B`.
+workflows:
+  check:
+    - [
+        "lint",
+        # Check that `A` activates the features of `B`.
+        "propagate-feature",
+        # These are the features to check:
+        "--features=std,optimism,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench",
+        # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
+        "--left-side-feature-missing=ignore",
+        # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
+
+        "--left-side-outside-workspace=ignore",
+        # Auxillary flags:
+        "--offline",
+        "--locked",
+        "--show-path",
+        "--quiet",
+      ]
+  default:
+    # Running `zepter` with no subcommand will check & fix.
+    - [$check.0, "--fix"]
+
+# Will be displayed when any workflow fails:
+help:
+  text: |
+    Reth uses the Zepter CLI to detect abnormalities in Cargo features, e.g. missing propagation.
+
+    It looks like one more checks failed; please check the console output.
+
+    You can try to automatically address them by installing zepter (`cargo install zepter --locked`) and simply running `zepter` in the workspace root.
+  links:
+    - "https://github.com/paradigmxyz/reth/pull/11888"
+    - "https://github.com/ggwpez/zepter"

.github/CODEOWNERS

@@ -20,11 +20,11 @@ crates/fs-util/             @onbjerg @emhane
 crates/metrics/             @onbjerg
 crates/net/                 @emhane @mattsse @Rjected
 crates/net/downloaders/     @onbjerg @rkrasiuk @emhane
-crates/node/                @mattsse @Rjected @onbjerg
+crates/node/                @mattsse @Rjected @onbjerg @emhane @klkvr
 crates/optimism/            @mattsse @Rjected @fgimenez @emhane
 crates/payload/             @mattsse @Rjected
-crates/primitives/          @Rjected
-crates/primitives-traits/   @Rjected @joshieDo
+crates/primitives/          @Rjected @emhane @mattsse @klkvr
+crates/primitives-traits/   @Rjected @joshieDo @emhane @mattsse @klkvr
 crates/prune/               @shekhirin @joshieDo
 crates/revm/                @mattsse @rakita
 crates/rpc/                 @mattsse @Rjected @emhane

.github/ISSUE_TEMPLATE/bug.yml

@@ -60,6 +60,18 @@ body:
         - Mac (Apple Silicon)
         - Windows (x86)
         - Windows (ARM)
+  - type: dropdown
+    id: container_type
+    attributes:
+      label: Container Type
+      description: Were you running it in a container?
+      multiple: true
+      options:
+        - Not running in a container
+        - Docker
+        - Kubernetes
+        - LXC/LXD
+        - Other
     validations:
       required: true
   - type: textarea

.github/assets/check_rv32imac.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+set +e  # Disable immediate exit on error
+
+# Array of crates to check
+crates_to_check=(
+    reth-codecs-derive
+    reth-ethereum-forks
+    reth-ethereum-primitives
+    reth-primitives-traits
+    reth-optimism-forks
+    reth-network-peers
+    # reth-evm
+    # reth-primitives
+    # reth-optimism-chainspec
+)
+
+# Array to hold the results
+results=()
+# Flag to track if any command fails
+any_failed=0
+
+for crate in "${crates_to_check[@]}"; do
+  cmd="cargo +stable build -p $crate --target riscv32imac-unknown-none-elf --no-default-features"
+
+  if [ -n "$CI" ]; then
+    echo "::group::$cmd"
+  else
+    printf "\n%s:\n  %s\n" "$crate" "$cmd"
+  fi
+
+  set +e  # Disable immediate exit on error
+  # Run the command and capture the return code
+  $cmd
+  ret_code=$?
+  set -e  # Re-enable immediate exit on error
+
+  # Store the result in the dictionary
+  if [ $ret_code -eq 0 ]; then
+    results+=("1:✅:$crate")
+  else
+    results+=("2:❌:$crate")
+    any_failed=1
+  fi
+
+  if [ -n "$CI" ]; then
+    echo "::endgroup::"
+  fi
+done
+
+# Sort the results by status and then by crate name
+IFS=$'\n' sorted_results=($(sort <<<"${results[*]}"))
+unset IFS
+
+# Print summary
+echo -e "\nSummary of build results:"
+for result in "${sorted_results[@]}"; do
+  status="${result#*:}"
+  status="${status%%:*}"
+  crate="${result##*:}"
+  echo "$status $crate"
+done
+
+# Exit with a non-zero status if any command fails
+exit $any_failed

.github/assets/check_wasm.sh

@@ -3,17 +3,18 @@ set +e  # Disable immediate exit on error
 
 # Array of crates to compile
 crates=($(cargo metadata --format-version=1 --no-deps | jq -r '.packages[].name' | grep '^reth' | sort))
+
 # Array of crates to exclude
+# Used with the `contains` function.
+# shellcheck disable=SC2034
 exclude_crates=(
   # The following are not working yet, but known to be fixable
   reth-exex-types # https://github.com/paradigmxyz/reth/issues/9946
   # The following require investigation if they can be fixed
-  reth-auto-seal-consensus
   reth-basic-payload-builder
   reth-beacon-consensus
   reth-bench
   reth-blockchain-tree
-  reth-chain-state
   reth-cli
   reth-cli-commands
   reth-cli-runner
@@ -24,23 +25,19 @@ exclude_crates=(
   reth-dns-discovery
   reth-downloaders
   reth-e2e-test-utils
-  reth-engine-primitives
   reth-engine-service
   reth-engine-tree
   reth-engine-util
   reth-eth-wire
   reth-ethereum-cli
-  reth-ethereum-engine-primitives
   reth-ethereum-payload-builder
   reth-etl
-  reth-evm-ethereum
   reth-exex
   reth-exex-test-utils
   reth-ipc
   reth-net-nat
   reth-network
   reth-node-api
-  reth-node-types
   reth-node-builder
   reth-node-core
   reth-node-ethereum
@@ -50,8 +47,7 @@ exclude_crates=(
   reth-optimism-node
   reth-optimism-payload-builder
   reth-optimism-rpc
-  reth-payload-builder
-  reth-payload-primitives
+  reth-optimism-primitives
   reth-rpc
   reth-rpc-api
   reth-rpc-api-testing-util
@@ -73,6 +69,8 @@ exclude_crates=(
   reth-static-file # tokio
   reth-transaction-pool # c-kzg
   reth-trie-parallel # tokio
+  reth-testing-utils
+  reth-network-peers
 )
 
 # Array to hold the results

.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"]

.github/assets/hive/expected_failures.yaml

@@ -41,8 +41,6 @@ engine-withdrawals:
   - Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org (Paris) (reth)
   - Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org Sync (Paris) (reth)
 
-# https://github.com/paradigmxyz/reth/issues/8305
-# https://github.com/paradigmxyz/reth/issues/6217
 engine-api: []
 
 # https://github.com/paradigmxyz/reth/issues/8305
@@ -58,6 +56,4 @@ engine-cancun:
   - 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:
-  - sync reth -> reth
+sync: []

.github/assets/hive/no_sim_build.diff

@@ -1,24 +1,23 @@
 diff --git a/internal/libdocker/builder.go b/internal/libdocker/builder.go
-index 4731c9d..d717f52 100644
+index e4bf99b6..2023f7e2 100644
 --- a/internal/libdocker/builder.go
 +++ b/internal/libdocker/builder.go
-@@ -7,9 +7,7 @@ import (
- 	"fmt"
+@@ -8,7 +8,6 @@ import (
  	"io"
  	"io/fs"
+ 	"log/slog"
 -	"os"
  	"path/filepath"
--	"strings"
-
- 	"github.com/ethereum/hive/internal/libhive"
- 	docker "github.com/fsouza/go-dockerclient"
-@@ -53,24 +51,8 @@ func (b *Builder) BuildClientImage(ctx context.Context, client libhive.ClientDes
+ 	"slices"
+ 	"strings"
+@@ -49,25 +48,8 @@ func (b *Builder) BuildClientImage(ctx context.Context, client libhive.ClientDes
 
  // BuildSimulatorImage builds a docker image of a simulator.
- func (b *Builder) BuildSimulatorImage(ctx context.Context, name string) (string, error) {
+ func (b *Builder) BuildSimulatorImage(ctx context.Context, name string, buildArgs map[string]string) (string, error) {
 -	dir := b.config.Inventory.SimulatorDirectory(name)
 -	buildContextPath := dir
 -	buildDockerfile := "Dockerfile"
+-
 -	// build context dir of simulator can be overridden with "hive_context.txt" file containing the desired build path
 -	if contextPathBytes, err := os.ReadFile(filepath.Join(filepath.FromSlash(dir), "hive_context.txt")); err == nil {
 -		buildContextPath = filepath.Join(dir, strings.TrimSpace(string(contextPathBytes)))
@@ -32,14 +31,14 @@ index 4731c9d..d717f52 100644
 -		}
 -	}
  	tag := fmt.Sprintf("hive/simulators/%s:latest", name)
--	err := b.buildImage(ctx, buildContextPath, buildDockerfile, tag, nil)
+-	err := b.buildImage(ctx, buildContextPath, buildDockerfile, tag, buildArgs)
 -	return tag, err
 +	return tag, nil
  }
 
  // BuildImage creates a container by archiving the given file system,
 diff --git a/internal/libdocker/proxy.go b/internal/libdocker/proxy.go
-index a53e5af..0bb2ea9 100644
+index d3a14ae6..8779671e 100644
 --- a/internal/libdocker/proxy.go
 +++ b/internal/libdocker/proxy.go
 @@ -16,7 +16,7 @@ const hiveproxyTag = "hive/hiveproxy"

.github/assets/kurtosis_network_params.yaml

@@ -2,8 +2,6 @@ participants:
   - el_type: geth
     cl_type: lighthouse
   - el_type: reth
-    el_extra_params:
-      - --engine.experimental
     el_image: "ghcr.io/paradigmxyz/reth:kurtosis-ci"
     cl_type: teku
 additional_services:

.github/assets/kurtosis_op_network_params.yaml

@@ -0,0 +1,15 @@
+ethereum_package:
+  participants:
+    - el_type: reth
+      cl_type: lighthouse
+optimism_package:
+  chains:
+    - participants:
+      - el_type: op-geth
+        cl_type: op-node
+      - el_type: op-reth
+        el_image: "ghcr.io/paradigmxyz/op-reth:kurtosis-ci"
+        cl_type: op-node
+      batcher_params:
+        extra_params:
+          - "--throttle-interval=0"

.github/workflows/compact.yml

@@ -0,0 +1,47 @@
+# Ensures that `Compact` codec changes are backwards compatible.
+# 
+# 1) checkout `main`
+# 2) randomly generate and serialize to disk many different type vectors with `Compact` (eg. Header, Transaction, etc)
+# 3) checkout `pr`
+# 4) deserialize previously generated test vectors
+
+on:
+
+  pull_request:
+  merge_group:
+  push:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+
+name: compact-codec
+jobs:
+  compact-codec:
+    runs-on:
+      group: Reth
+    strategy:
+      matrix:
+        bin:
+          - cargo run --bin reth --features "dev"
+          - cargo run --bin op-reth --features "optimism dev" --manifest-path crates/optimism/bin/Cargo.toml
+    steps:
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - 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`.
+      - name: Generate compact vectors
+        run: |
+          ${{ matrix.bin }} -- test-vectors compact --write
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          clean: false
+      # On incoming merge try to read and decode previously generated vectors with `Compact`
+      - name: Read vectors
+        run: ${{ matrix.bin }} -- test-vectors compact --read