Merge branch 'main' into raw-cap-msg

.config/zepter.yaml

@@ -33,7 +33,7 @@ help:
   text: |
     Reth uses the Zepter CLI to detect abnormalities in Cargo features, e.g. missing propagation.
 
-    It looks like one more more checks failed; please check the console output.
+    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:

.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:
+        - None
+        - Docker
+        - Kubernetes
+        - LXC/LXD
+        - Other
     validations:
       required: true
   - type: textarea

.github/assets/check_rv32imac.sh

@@ -4,10 +4,11 @@ set +e  # Disable immediate exit on error
 # Array of crates to check
 crates_to_check=(
     reth-codecs-derive
+    reth-ethereum-forks
+    reth-primitives-traits
+    reth-optimism-forks
     # reth-evm
     # reth-primitives
-    # reth-primitives-traits
-    # reth-optimism-forks
     # reth-optimism-chainspec
 )
 

.github/assets/check_wasm.sh

@@ -70,6 +70,7 @@ exclude_crates=(
   reth-transaction-pool # c-kzg
   reth-trie-parallel # tokio
   reth-testing-utils
+  reth-network-peers
 )
 
 # Array to hold the results

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