chore: make reth-network-peers risc compatible (#13210)

paradigmxyz · Dec 7, 2024 · abaeb35 · abaeb35
1 parent 828ddba
commit abaeb35
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.github/assets/check_rv32imac.sh b/.github/assets/check_rv32imac.sh
@@ -8,6 +8,7 @@ crates_to_check=(
     reth-ethereum-primitives
     reth-primitives-traits
     reth-optimism-forks
+    reth-network-peers
     # reth-evm
     # reth-primitives
     # reth-optimism-chainspec

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -432,7 +432,7 @@ revm-primitives = { version = "14.0.0", default-features = false }
 alloy-chains = { version = "0.1.32", default-features = false }
 alloy-dyn-abi = "0.8.11"
 alloy-primitives = { version = "0.8.11", default-features = false }
-alloy-rlp = { version = "0.3.4", default-features = false }
+alloy-rlp = { version = "0.3.10", default-features = false }
 alloy-sol-types = "0.8.11"
 alloy-trie = { version = "0.7", default-features = false }
 

diff --git a/crates/net/peers/Cargo.toml b/crates/net/peers/Cargo.toml
@@ -15,8 +15,8 @@ workspace = true
 
 # eth
 alloy-primitives = { workspace = true, features = ["rlp"] }
-alloy-rlp = { workspace = true, features = ["derive"] }
-enr.workspace = true
+alloy-rlp = { workspace = true, features = ["derive", "core-net", "core-error"] }
+enr = { workspace = true, optional = true }
 
 # crypto
 
@@ -32,6 +32,7 @@ alloy-primitives = { workspace = true, features = ["rand"] }
 rand.workspace = true
 secp256k1 = { workspace = true, features = ["rand"] }
 serde_json.workspace = true
+enr.workspace = true
 tokio = { workspace = true, features = ["net", "macros", "rt"] }
 
 [features]
@@ -42,7 +43,7 @@ std = [
 	"secp256k1?/std",
 	"serde_with/std",
 	"thiserror/std",
-	"url/std"
+	"url/std",
 ]
 secp256k1 = ["dep:secp256k1", "enr/secp256k1"]
-net = ["dep:tokio", "tokio?/net"]
+net = ["std", "dep:tokio", "tokio?/net"]
diff --git a/crates/net/peers/src/lib.rs b/crates/net/peers/src/lib.rs
@@ -64,6 +64,7 @@ use alloy_primitives::B512;
 use core::str::FromStr;
 
 // Re-export PeerId for ease of use.
+#[cfg(feature = "secp256k1")]
 pub use enr::Enr;
 
 /// Alias for a peer identifier
@@ -115,8 +116,8 @@ pub fn id2pk(id: PeerId) -> Result<secp256k1::PublicKey, secp256k1::Error> {
 pub enum AnyNode {
     /// An "enode:" peer with full ip
     NodeRecord(NodeRecord),
-    #[cfg(feature = "secp256k1")]
     /// An "enr:" peer
+    #[cfg(feature = "secp256k1")]
     Enr(Enr<secp256k1::SecretKey>),
     /// An incomplete "enode" with only a peer id
     PeerId(PeerId),