Skip to content

chore(l1): improve discv5 new_nonce #5652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ElFantasma merged 1 commit into from
Dec 16, 2025
Merged

chore(l1): improve discv5 new_nonce #5652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions crates/networking/p2p/discv5/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ impl Discv5Codec {
}
}

fn new_nonce(&mut self) -> Vec<u8> {
fn new_nonce(&mut self) -> [u8; 12] {
self.nonce = self.nonce.wrapping_add(1);
self.nonce.to_be_bytes()[4..].to_vec()
let mut bytes = [0u8; 12];
bytes.copy_from_slice(&self.nonce.to_be_bytes()[4..]);
bytes
}
}

Expand All @@ -49,6 +51,6 @@ impl Encoder<Packet> for Discv5Codec {
fn encode(&mut self, package: Packet, buf: &mut BytesMut) -> Result<(), Self::Error> {
let masking_iv: u128 = rand::random();
let nonce = self.new_nonce();
package.encode(buf, masking_iv, nonce, &self.dest_id)
package.encode(buf, masking_iv, &nonce, &self.dest_id)
}
}
13 changes: 4 additions & 9 deletions crates/networking/p2p/discv5/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ impl Packet {
&self,
buf: &mut dyn BufMut,
masking_iv: u128,
nonce: Vec<u8>,
nonce: &[u8],
dest_id: &H256,
) -> Result<(), PacketDecodeErr> {
let masking_as_bytes = masking_iv.to_be_bytes();
Expand Down Expand Up @@ -218,13 +218,13 @@ impl WhoAreYou {
&self,
buf: &mut dyn BufMut,
cipher: &mut T,
nonce: Vec<u8>,
nonce: &[u8],
) -> Result<(), PacketDecodeErr> {
let mut static_header = Vec::new();
static_header.put_slice(PROTOCOL_ID);
static_header.put_slice(&PROTOCOL_VERSION.to_be_bytes());
static_header.put_u8(0x01);
static_header.put_slice(&nonce);
static_header.put_slice(nonce);
static_header.put_slice(&24u16.to_be_bytes());
cipher.try_apply_keystream(&mut static_header)?;
buf.put_slice(&static_header);
Expand Down Expand Up @@ -520,12 +520,7 @@ mod tests {
let dest_id = node_id(&public_key_from_signing_key(&node_b_key));
let mut buf = Vec::new();

let _ = packet.encode(
&mut buf,
0,
hex!("0102030405060708090a0b0c").to_vec(),
&dest_id,
);
let _ = packet.encode(&mut buf, 0, &hex!("0102030405060708090a0b0c"), &dest_id);
let expected = &hex!(
"00000000000000000000000000000000088b3d434277464933a1ccc59f5967ad1d6035f15e528627dde75cd68292f9e6c27d6b66c8100a873fcbaed4e16b8d"
);
Expand Down