chore: disable reth-ethereum-forks default features in workspace (#13054

)
paradigmxyz · Dec 2, 2024 · 8d5668a · 8d5668a
1 parent 0884611
commit 8d5668a
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -339,7 +339,7 @@ reth-eth-wire-types = { path = "crates/net/eth-wire-types" }
 reth-ethereum-cli = { path = "crates/ethereum/cli" }
 reth-ethereum-consensus = { path = "crates/ethereum/consensus" }
 reth-ethereum-engine-primitives = { path = "crates/ethereum/engine-primitives" }
-reth-ethereum-forks = { path = "crates/ethereum-forks" }
+reth-ethereum-forks = { path = "crates/ethereum-forks", default-features = false }
 reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-etl = { path = "crates/etl" }
 reth-evm = { path = "crates/evm" }

diff --git a/crates/chainspec/Cargo.toml b/crates/chainspec/Cargo.toml
@@ -48,7 +48,8 @@ std = [
 	"reth-primitives-traits/std",
 	"alloy-consensus/std",
 	"once_cell/std",
-	"alloy-rlp/std"
+	"alloy-rlp/std",
+	"reth-ethereum-forks/std"
 ]
 arbitrary = [
 	"alloy-chains/arbitrary",

diff --git a/crates/ethereum/evm/Cargo.toml b/crates/ethereum/evm/Cargo.toml
@@ -50,5 +50,6 @@ std = [
 	"alloy-genesis/std",
 	"alloy-primitives/std",
 	"revm-primitives/std",
-	"secp256k1/std"
+	"secp256k1/std",
+	"reth-ethereum-forks/std"
 ]
diff --git a/crates/evm/Cargo.toml b/crates/evm/Cargo.toml
@@ -46,17 +46,18 @@ metrics-util = { workspace = true, features = ["debugging"] }
 [features]
 default = ["std"]
 std = [
-    "dep:metrics",
-    "dep:reth-metrics",
-    "reth-consensus/std",
-    "reth-primitives/std",
-    "reth-primitives-traits/std",
-    "reth-revm/std",
-    "alloy-eips/std",
-    "alloy-primitives/std",
-    "alloy-consensus/std",
-    "revm-primitives/std",
-    "revm/std",
+	"dep:metrics",
+	"dep:reth-metrics",
+	"reth-consensus/std",
+	"reth-primitives/std",
+	"reth-primitives-traits/std",
+	"reth-revm/std",
+	"alloy-eips/std",
+	"alloy-primitives/std",
+	"alloy-consensus/std",
+	"revm-primitives/std",
+	"revm/std",
+	"reth-ethereum-forks/std"
 ]
 test-utils = [
     "dep:parking_lot",

diff --git a/crates/net/discv4/Cargo.toml b/crates/net/discv4/Cargo.toml
@@ -60,6 +60,7 @@ serde = [
 	"generic-array/serde",
 	"parking_lot/serde",
 	"rand?/serde",
-	"secp256k1/serde"
+	"secp256k1/serde",
+	"reth-ethereum-forks/serde"
 ]
 test-utils = ["dep:rand"]
diff --git a/crates/net/dns/Cargo.toml b/crates/net/dns/Cargo.toml
@@ -58,5 +58,6 @@ serde = [
 	"parking_lot/serde",
 	"rand/serde",
 	"secp256k1/serde",
-	"trust-dns-resolver/serde"
+	"trust-dns-resolver/serde",
+	"reth-ethereum-forks/serde"
 ]
diff --git a/crates/net/eth-wire-types/Cargo.toml b/crates/net/eth-wire-types/Cargo.toml
@@ -17,6 +17,7 @@ reth-chainspec.workspace = true
 reth-codecs-derive.workspace = true
 reth-primitives.workspace = true
 reth-primitives-traits.workspace = true
+reth-ethereum-forks.workspace = true
 
 # ethereum
 alloy-chains = { workspace = true, features = ["rlp"] }
@@ -46,24 +47,26 @@ rand.workspace = true
 
 [features]
 arbitrary = [
-    "reth-primitives/arbitrary",
-    "alloy-chains/arbitrary",
-    "dep:arbitrary",
-    "dep:proptest",
-    "dep:proptest-arbitrary-interop",
-    "reth-chainspec/arbitrary",
-    "alloy-consensus/arbitrary",
-    "alloy-eips/arbitrary",
-    "alloy-primitives/arbitrary",
-    "reth-primitives-traits/arbitrary",
+	"reth-primitives/arbitrary",
+	"alloy-chains/arbitrary",
+	"dep:arbitrary",
+	"dep:proptest",
+	"dep:proptest-arbitrary-interop",
+	"reth-chainspec/arbitrary",
+	"alloy-consensus/arbitrary",
+	"alloy-eips/arbitrary",
+	"alloy-primitives/arbitrary",
+	"reth-primitives-traits/arbitrary",
+	"reth-ethereum-forks/arbitrary"
 ]
 serde = [
-    "dep:serde",
-    "alloy-chains/serde",
-    "alloy-consensus/serde",
-    "alloy-eips/serde",
-    "alloy-primitives/serde",
-    "bytes/serde",
-    "rand/serde",
-    "reth-primitives-traits/serde",
+	"dep:serde",
+	"alloy-chains/serde",
+	"alloy-consensus/serde",
+	"alloy-eips/serde",
+	"alloy-primitives/serde",
+	"bytes/serde",
+	"rand/serde",
+	"reth-primitives-traits/serde",
+	"reth-ethereum-forks/serde"
 ]
diff --git a/crates/net/eth-wire-types/src/status.rs b/crates/net/eth-wire-types/src/status.rs
@@ -4,7 +4,7 @@ use alloy_primitives::{hex, B256, U256};
 use alloy_rlp::{RlpDecodable, RlpEncodable};
 use reth_chainspec::{EthChainSpec, Hardforks, MAINNET};
 use reth_codecs_derive::add_arbitrary_tests;
-use reth_primitives::{EthereumHardfork, ForkId, Head};
+use reth_ethereum_forks::{EthereumHardfork, ForkId, Head};
 use std::fmt::{Debug, Display};
 
 /// The status message is used in the eth protocol handshake to ensure that peers are on the same

diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml
@@ -89,6 +89,7 @@ serde = [
 	"reth-codecs/serde",
 	"alloy-chains/serde",
 	"reth-primitives-traits/serde",
+	"reth-ethereum-forks/serde"
 ]
 
 [[test]]

diff --git a/crates/net/network-api/Cargo.toml b/crates/net/network-api/Cargo.toml
@@ -45,5 +45,6 @@ serde = [
 	"reth-eth-wire-types/serde",
 	"reth-network-types/serde",
 	"alloy-primitives/serde",
-	"enr/serde"
+	"enr/serde",
+	"reth-ethereum-forks/serde"
 ]
diff --git a/crates/net/network-types/Cargo.toml b/crates/net/network-types/Cargo.toml
@@ -26,5 +26,9 @@ serde_json = { workspace = true }
 tracing.workspace = true
 
 [features]
-serde = ["dep:serde", "dep:humantime-serde"]
+serde = [
+	"dep:serde",
+	"dep:humantime-serde",
+	"reth-ethereum-forks/serde"
+]
 test-utils = []
diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml
@@ -123,6 +123,7 @@ serde = [
 	"smallvec/serde",
 	"url/serde",
 	"reth-primitives-traits/serde",
+	"reth-ethereum-forks/serde"
 ]
 test-utils = [
 	"dep:reth-provider",

diff --git a/crates/optimism/evm/Cargo.toml b/crates/optimism/evm/Cargo.toml
@@ -63,7 +63,8 @@ std = [
 	"alloy-genesis/std",
 	"alloy-primitives/std",
 	"revm-primitives/std",
-	"revm/std"
+	"revm/std",
+	"reth-ethereum-forks/std"
 ]
 optimism = [
 	"reth-primitives/optimism",

diff --git a/crates/optimism/hardforks/Cargo.toml b/crates/optimism/hardforks/Cargo.toml
@@ -31,10 +31,12 @@ std = [
 	"alloy-primitives/std",
 	"once_cell/std",
 	"serde?/std",
-	"alloy-chains/std"
+	"alloy-chains/std",
+	"reth-ethereum-forks/std"
 ]
 serde = [
 	"dep:serde",
 	"alloy-chains/serde",
-	"alloy-primitives/serde"
+	"alloy-primitives/serde",
+	"reth-ethereum-forks/serde"
 ]
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -105,7 +105,8 @@ std = [
 	"serde/std",
 	"alloy-trie/std",
 	"serde_with?/std",
-	"alloy-rlp/std"
+	"alloy-rlp/std",
+	"reth-ethereum-forks/std"
 ]
 reth-codec = [
 	"dep:reth-codecs",

diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
@@ -37,12 +37,13 @@ alloy-consensus.workspace = true
 [features]
 default = ["std"]
 std = [
-    "reth-primitives/std",
-    "alloy-primitives/std",
-    "revm/std",
-    "alloy-eips/std",
-    "alloy-consensus/std",
-    "reth-primitives-traits/std",
+	"reth-primitives/std",
+	"alloy-primitives/std",
+	"revm/std",
+	"alloy-eips/std",
+	"alloy-consensus/std",
+	"reth-primitives-traits/std",
+	"reth-ethereum-forks/std"
 ]
 witness = ["dep:reth-trie"]
 test-utils = [
@@ -54,10 +55,11 @@ test-utils = [
     "reth-primitives-traits/test-utils",
 ]
 serde = [
-    "revm/serde",
-    "alloy-eips/serde",
-    "alloy-primitives/serde",
-    "alloy-consensus/serde",
-    "reth-primitives-traits/serde",
-    "reth-trie?/serde",
+	"revm/serde",
+	"alloy-eips/serde",
+	"alloy-primitives/serde",
+	"alloy-consensus/serde",
+	"reth-primitives-traits/serde",
+	"reth-trie?/serde",
+	"reth-ethereum-forks/serde"
 ]