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: move pk2id and id2pk to primitives (#7382)

Browse Source
This commit is contained in:
Dan Cline
2024-03-29 17:43:52 -04:00
committed by GitHub
parent b1026e0e23
commit c13d7da68d
17 changed files with 89 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/net/discv4/src/lib.rs
View File

@ -201,14 +201,14 @@ impl Discv4 {
/// # use std::io;
/// use rand::thread_rng;
/// use reth_discv4::{Discv4, Discv4Config};
/// use reth_primitives::{NodeRecord, PeerId};
/// use reth_primitives::{pk2id, NodeRecord, PeerId};
/// use secp256k1::SECP256K1;
/// use std::{net::SocketAddr, str::FromStr};
/// # async fn t() -> io::Result<()> {
/// // generate a (random) keypair
/// let mut rng = thread_rng();
/// let (secret_key, pk) = SECP256K1.generate_keypair(&mut rng);
/// let id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
/// let id = pk2id(&pk);
///
/// let socket = SocketAddr::from_str("0.0.0.0:0").unwrap();
/// let local_enr =

6
crates/net/discv4/src/proto.rs
View File

@ -7,7 +7,7 @@ use alloy_rlp::{
use enr::{Enr, EnrKey};
use reth_primitives::{
bytes::{Buf, BufMut, Bytes, BytesMut},
keccak256, ForkId, NodeRecord, B256,
keccak256, pk2id, ForkId, NodeRecord, B256,
};
use secp256k1::{
ecdsa::{RecoverableSignature, RecoveryId},
@ -161,7 +161,7 @@ impl Message {
let msg = secp256k1::Message::from_slice(keccak256(&packet[97..]).as_slice())?;
let pk = SECP256K1.recover_ecdsa(&msg, &recoverable_sig)?;
let node_id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
let node_id = pk2id(&pk);
let msg_type = packet[97];
let payload = &mut &packet[98..];
@ -724,7 +724,7 @@ mod tests {
for _ in 0..100 {
let msg = rng_message(&mut rng);
let (secret_key, pk) = SECP256K1.generate_keypair(&mut rng);
let sender_id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
let sender_id = pk2id(&pk);
let (buf, _) = msg.encode(&secret_key);

6
crates/net/discv4/src/test_utils.rs
View File

@ -6,7 +6,7 @@ use crate::{
IngressReceiver, PeerId, SAFE_MAX_DATAGRAM_NEIGHBOUR_RECORDS,
};
use rand::{thread_rng, Rng, RngCore};
use reth_primitives::{hex, ForkHash, ForkId, NodeRecord, B256};
use reth_primitives::{hex, pk2id, ForkHash, ForkId, NodeRecord, B256};
use secp256k1::{SecretKey, SECP256K1};
use std::{
collections::{HashMap, HashSet},
@ -49,7 +49,7 @@ impl MockDiscovery {
let mut rng = thread_rng();
let socket = SocketAddr::from_str("0.0.0.0:0").unwrap();
let (secret_key, pk) = SECP256K1.generate_keypair(&mut rng);
let id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
let id = pk2id(&pk);
let socket = Arc::new(UdpSocket::bind(socket).await?);
let local_addr = socket.local_addr()?;
let local_enr = NodeRecord {
@ -241,7 +241,7 @@ pub async fn create_discv4_with_config(config: Discv4Config) -> (Discv4, Discv4S
let mut rng = thread_rng();
let socket = SocketAddr::from_str("0.0.0.0:0").unwrap();
let (secret_key, pk) = SECP256K1.generate_keypair(&mut rng);
let id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
let id = pk2id(&pk);
let local_enr =
NodeRecord { address: socket.ip(), tcp_port: socket.port(), udp_port: socket.port(), id };
Discv4::bind(socket, local_enr, secret_key, config).await.unwrap()