Merge branch 'main' into randygrok/client-viem-ev-reth

Author: randygrok

Cargo.lock

@@ -2,12 +2,12 @@
 resolver = "2"
 members = [
   "bin/ev-reth",
-    "crates/common",
-    "crates/evolve",
-    "crates/node",
-    "crates/tests",
-    "crates/ev-precompiles",
-    "crates/ev-revm",
+  "crates/common",
+  "crates/evolve",
+  "crates/node",
+  "crates/tests",
+  "crates/ev-precompiles",
+  "crates/ev-revm",
 ]
 
 [workspace.package]
@@ -43,7 +43,7 @@ reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth.git", tag
 reth-provider = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
 reth-network = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
@@ -54,18 +54,18 @@ reth-engine-local = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1
 reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
-reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
+reth-evm = { git = "https://github.com/paradigmxyz/reth.git", default-features = false, tag = "v1.8.4" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth.git", default-features = false, tag = "v1.8.4" }
 reth-execution-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-node-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", default-features = false, tag = "v1.8.4" }
 reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth.git", default-features = false, tag = "v1.8.4" }
 reth-rpc-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
@@ -86,19 +86,11 @@ reth-tasks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4",
 revm = { version = "29.0.1", default-features = false }
 revm-context-interface = { version = "10.2.0", default-features = false }
 
-# vergen 9.1.0 requires vergen-lib 9.1.0, but reth v1.8.4 uses vergen-git2 1.0.7
-# which depends on vergen-lib 0.1.6. This causes trait incompatibility errors.
-# TODO: Remove this pin when upgrading to reth >= v1.10.0 (uses vergen-git2 9.1.0)
-vergen = "=9.0.6"
-
-# Alloy dependencies
-alloy = { version = "1.0.37", features = [
+alloy = { version = "=1.0.37", default-features = false, features = [
   "contract",
-  "providers",
-  "provider-http",
-  "signers",
-  "reqwest-rustls-tls",
-], default-features = false }
+  "sol-types",
+] }
+# Alloy dependencies
 # Alloy family versions aligned to 1.0.37 compatibility (reth v1.8.4)
 alloy-evm = { version = "0.21.3", default-features = false }
 alloy-eips = { version = "1.0.37", default-features = false }
@@ -117,12 +109,14 @@ alloy-genesis = { version = "1.0.37", default-features = false }
 alloy-rpc-types-txpool = { version = "1.0.37", default-features = false }
 alloy-sol-types = { version = "1.3.1", default-features = false }
 
-revm-inspector = { version = "10.0.1" }
+revm-inspector = { version = "10.0.1", default-features = false }
 # Core dependencies
 eyre = "0.6"
 tracing = "0.1"
 tokio = { version = "1.38", features = ["full"] }
-serde = { version = "=1.0.228", default-features = false, features = ["derive"] }
+serde = { version = "=1.0.228", default-features = false, features = [
+  "derive",
+] }
 serde_json = "1.0"
 thiserror = "2.0"
 async-trait = "0.1"

Cargo.toml

@@ -54,7 +54,7 @@ RUN cp /app/target/$BUILD_PROFILE/ev-reth /ev-reth
 FROM ubuntu:24.04 AS runtime
 
 RUN apt-get update && \
-    apt-get install -y ca-certificates curl jq libssl-dev pkg-config strace && \
+    apt-get install -y ca-certificates curl jq libssl-dev pkg-config strace tini && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
@@ -69,4 +69,4 @@ EXPOSE 30303 30303/udp 9001 8545 8546 7545 8551
 HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
     CMD /usr/local/bin/ev-reth --version || exit 1
 
-ENTRYPOINT ["/usr/local/bin/ev-reth"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/ev-reth"]

Dockerfile

@@ -9,10 +9,10 @@ ARG BUILDPLATFORM
 # Copy the pre-built binary based on the target platform
 COPY dist/bin/${TARGETPLATFORM}/ev-reth /usr/local/bin/ev-reth
 
-RUN apt-get update && apt-get install -y --no-install-recommends curl jq && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends curl jq tini && rm -rf /var/lib/apt/lists/*
 
 # Expose default ports
 EXPOSE 8545 8546 30303 6060 9001
 
 # Set the entrypoint
-ENTRYPOINT ["/usr/local/bin/ev-reth"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/ev-reth"]