jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump discv5 (#7981)

Browse Source
This commit is contained in:
Oliver
2024-08-28 11:09:05 +02:00
committed by GitHub
parent 85ef1fb98d
commit 5b7d637426
5 changed files with 60 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/net/discv5/Cargo.toml
View File

@ -23,8 +23,6 @@ alloy-primitives.workspace = true
alloy-rlp.workspace = true
discv5 = { workspace = true, features = ["libp2p"] }
enr.workspace = true
multiaddr = { version = "0.18", default-features = false }
libp2p-identity = "0.2"
secp256k1.workspace = true
# async/futures

6
crates/net/discv5/src/config.rs
View File

@ -8,8 +8,10 @@ use std::{
use alloy_primitives::Bytes;
use derive_more::Display;
use discv5::ListenConfig;
use multiaddr::{Multiaddr, Protocol};
use discv5::{
multiaddr::{Multiaddr, Protocol},
ListenConfig,
};
use reth_ethereum_forks::{EnrForkIdEntry, ForkId};
use reth_network_peers::NodeRecord;
use tracing::warn;

8
crates/net/discv5/src/enr.rs
View File

@ -24,13 +24,13 @@ pub fn discv4_id_to_discv5_id(peer_id: PeerId) -> Result<NodeId, secp256k1::Erro
Ok(id2pk(peer_id)?.into())
}
/// Converts a [`PeerId`] to a [`libp2p_identity::PeerId `].
/// Converts a [`PeerId`] to a [`reth_network_peers::PeerId`].
pub fn discv4_id_to_multiaddr_id(
peer_id: PeerId,
) -> Result<libp2p_identity::PeerId, secp256k1::Error> {
) -> Result<discv5::libp2p_identity::PeerId, secp256k1::Error> {
let pk = id2pk(peer_id)?.encode();
let pk: libp2p_identity::PublicKey =
libp2p_identity::secp256k1::PublicKey::try_from_bytes(&pk).unwrap().into();
let pk: discv5::libp2p_identity::PublicKey =
discv5::libp2p_identity::secp256k1::PublicKey::try_from_bytes(&pk).unwrap().into();
Ok(pk.to_peer_id())
}