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

fix(discv5): fix bug flip byte lookup tgt (#7764)

Browse Source 
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
This commit is contained in:
Emilia Hane
2024-04-20 22:39:55 +02:00
committed by GitHub
parent 3750edd905
commit d81cf8aa5c
1 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
crates/net/discv5/src/lib.rs
View File

@ -22,6 +22,7 @@ use discv5::ListenConfig;
use enr::{discv4_id_to_discv5_id, EnrCombinedKeyWrapper}; use enr::{discv4_id_to_discv5_id, EnrCombinedKeyWrapper};
use futures::future::join_all; use futures::future::join_all;
use itertools::Itertools; use itertools::Itertools;
use rand::{Rng, RngCore};
use reth_primitives::{bytes::Bytes, ForkId, NodeRecord, PeerId}; use reth_primitives::{bytes::Bytes, ForkId, NodeRecord, PeerId};
use secp256k1::SecretKey; use secp256k1::SecretKey;
use tokio::{sync::mpsc, task}; use tokio::{sync::mpsc, task};
@ -387,10 +388,10 @@ impl Discv5 {
None None
} }
discv5::Event::SessionEstablished(enr, remote_socket) => { discv5::Event::SessionEstablished(enr, remote_socket) => {
// covers `reth_discv4::DiscoveryUpdate` equivalents `DiscoveryUpdate::Added(_)` // covers `reth_discv4::DiscoveryUpdate` equivalents `DiscoveryUpdate::Added(_)`
// and `DiscoveryUpdate::DiscoveredAtCapacity(_) // and `DiscoveryUpdate::DiscoveredAtCapacity(_)
// peer has been discovered as part of query, or, by incoming session (peer has // peer has been discovered as part of query, or, by incoming session (peer has
// discovered us) // discovered us)
self.metrics.discovered_peers_advertised_networks.increment_once_by_network_type(&enr); self.metrics.discovered_peers_advertised_networks.increment_once_by_network_type(&enr);
@ -541,19 +542,24 @@ pub fn get_lookup_target(
let mut target = local_node_id.raw(); let mut target = local_node_id.raw();
// make sure target has a 'log2distance'-long suffix that differs from local node id // make sure target has a 'log2distance'-long suffix that differs from local node id
if kbucket_index != 0 { let bit_offset = MAX_KBUCKET_INDEX.saturating_sub(kbucket_index);
let suffix_bit_offset = MAX_KBUCKET_INDEX.saturating_sub(kbucket_index); let (byte, bit) = (bit_offset / 8, bit_offset % 8);
let suffix_byte_offset = suffix_bit_offset / 8; // Flip the target bit.
// todo: flip the precise bit target[byte] ^= 1 << (7 - bit);
// let rel_suffix_bit_offset = suffix_bit_offset % 8;
target[suffix_byte_offset] = !target[suffix_byte_offset];
if suffix_byte_offset != 31 { // Randomize the bits after the target.
for b in target.iter_mut().take(31).skip(suffix_byte_offset + 1) { let mut rng = rand::thread_rng();
*b = rand::random::<u8>(); // Randomize remaining bits in the byte we modified.
} if bit < 7 {
} // Compute the mask of the bits that need to be randomized.
let bits_to_randomize = 0xff >> (bit + 1);
// Clear.
target[byte] &= !bits_to_randomize;
// Randomize.
target[byte] |= rng.gen::<u8>() & bits_to_randomize;
} }
// Randomize remaining bytes.
rng.fill_bytes(&mut target[byte + 1..]);
target.into() target.into()
} }
@ -595,13 +601,11 @@ pub async fn lookup(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*;
use ::enr::{CombinedKey, EnrKey}; use ::enr::{CombinedKey, EnrKey};
use rand::Rng;
use secp256k1::rand::thread_rng; use secp256k1::rand::thread_rng;
use tracing::trace; use tracing::trace;
use super::*;
fn discv5_noop() -> Discv5 { fn discv5_noop() -> Discv5 {
let sk = CombinedKey::generate_secp256k1(); let sk = CombinedKey::generate_secp256k1();
Discv5 { Discv5 {
@ -786,11 +790,7 @@ mod tests {
pub fn log2_distance<U>(&self, other: &Key<U>) -> Option<u64> { pub fn log2_distance<U>(&self, other: &Key<U>) -> Option<u64> {
let xor_dist = self.distance(other); let xor_dist = self.distance(other);
let log_dist = (256 - xor_dist.0.leading_zeros() as u64); let log_dist = (256 - xor_dist.0.leading_zeros() as u64);
if log_dist == 0 { (log_dist != 0).then_some(log_dist)
None
} else {
Some(log_dist)
}
} }
} }
@ -807,30 +807,15 @@ mod tests {
#[test] #[test]
fn select_lookup_target() { fn select_lookup_target() {
// bucket index ceiled to the next multiple of 4 for bucket_index in 0..=MAX_KBUCKET_INDEX {
const fn expected_bucket_index(kbucket_index: usize) -> u64 { let sk = CombinedKey::generate_secp256k1();
let log2distance = kbucket_index + 1; let local_node_id = discv5::enr::NodeId::from(sk.public());
let log2distance = log2distance / 8; let target = get_lookup_target(bucket_index, local_node_id);
((log2distance + 1) * 8) as u64
}
let bucket_index = rand::thread_rng().gen_range(0..=MAX_KBUCKET_INDEX); let local_node_id = sigp::Key::from(local_node_id);
let target = sigp::Key::from(target);
let sk = CombinedKey::generate_secp256k1(); assert_eq!(local_node_id.log2_distance(&target), Some(bucket_index as u64 + 1));
let local_node_id = discv5::enr::NodeId::from(sk.public());
let target = get_lookup_target(bucket_index, local_node_id);
let local_node_id = sigp::Key::from(local_node_id);
let target = sigp::Key::from(target);
if bucket_index == 0 {
// log2distance undef (inf)
assert!(local_node_id.log2_distance(&target).is_none())
} else {
assert_eq!(
expected_bucket_index(bucket_index),
local_node_id.log2_distance(&target).unwrap()
);
} }
} }
} }