-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
v1.1: Add nonce to shreds repairs, add shred data size to header (#10076
) * Add nonce to shreds/repairs * Add data shred size to header * Align nonce unlock with epoch 47 Co-authored-by: Carl <[email protected]>
- Loading branch information
Showing
15 changed files
with
838 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| use solana_ledger::{ | ||
| blockstore::Blockstore, | ||
| shred::{Nonce, Shred, SIZE_OF_NONCE}, | ||
| }; | ||
| use solana_perf::packet::limited_deserialize; | ||
| use solana_sdk::{clock::Slot, packet::Packet}; | ||
| use std::{io, net::SocketAddr}; | ||
|
|
||
| pub fn repair_response_packet( | ||
| blockstore: &Blockstore, | ||
| slot: Slot, | ||
| shred_index: u64, | ||
| dest: &SocketAddr, | ||
| nonce: Option<Nonce>, | ||
| ) -> Option<Packet> { | ||
| if Shred::is_nonce_unlocked(slot) && nonce.is_none() | ||
| || !Shred::is_nonce_unlocked(slot) && nonce.is_some() | ||
| { | ||
| return None; | ||
| } | ||
| let shred = blockstore | ||
| .get_data_shred(slot, shred_index) | ||
| .expect("Blockstore could not get data shred"); | ||
| shred.map(|shred| repair_response_packet_from_shred(slot, shred, dest, nonce)) | ||
| } | ||
|
|
||
| pub fn repair_response_packet_from_shred( | ||
| slot: Slot, | ||
| shred: Vec<u8>, | ||
| dest: &SocketAddr, | ||
| nonce: Option<Nonce>, | ||
| ) -> Packet { | ||
| let size_of_nonce = { | ||
| if Shred::is_nonce_unlocked(slot) { | ||
| assert!(nonce.is_some()); | ||
| SIZE_OF_NONCE | ||
| } else { | ||
| assert!(nonce.is_none()); | ||
| 0 | ||
| } | ||
| }; | ||
| let mut packet = Packet::default(); | ||
| packet.meta.size = shred.len() + size_of_nonce; | ||
| packet.meta.set_addr(dest); | ||
| packet.data[..shred.len()].copy_from_slice(&shred); | ||
| let mut wr = io::Cursor::new(&mut packet.data[shred.len()..]); | ||
| if let Some(nonce) = nonce { | ||
| bincode::serialize_into(&mut wr, &nonce).expect("Buffer not large enough to fit nonce"); | ||
| } | ||
| packet | ||
| } | ||
|
|
||
| pub fn nonce(buf: &[u8]) -> Option<Nonce> { | ||
| if buf.len() < SIZE_OF_NONCE { | ||
| None | ||
| } else { | ||
| limited_deserialize(&buf[buf.len() - SIZE_OF_NONCE..]).ok() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use super::*; | ||
| use solana_ledger::{ | ||
| shred::{Shred, Shredder, UNLOCK_NONCE_SLOT}, | ||
| sigverify_shreds::verify_shred_cpu, | ||
| }; | ||
| use solana_sdk::signature::{Keypair, Signer}; | ||
| use std::{ | ||
| collections::HashMap, | ||
| net::{IpAddr, Ipv4Addr}, | ||
| }; | ||
|
|
||
| fn run_test_sigverify_shred_cpu_repair(slot: Slot) { | ||
| solana_logger::setup(); | ||
| let mut shred = Shred::new_from_data( | ||
| slot, | ||
| 0xc0de, | ||
| 0xdead, | ||
| Some(&[1, 2, 3, 4]), | ||
| true, | ||
| true, | ||
| 0, | ||
| 0, | ||
| 0xc0de, | ||
| ); | ||
| assert_eq!(shred.slot(), slot); | ||
| let keypair = Keypair::new(); | ||
| Shredder::sign_shred(&keypair, &mut shred); | ||
| trace!("signature {}", shred.common_header.signature); | ||
| let nonce = if Shred::is_nonce_unlocked(slot) { | ||
| Some(9) | ||
| } else { | ||
| None | ||
| }; | ||
| let mut packet = repair_response_packet_from_shred( | ||
| slot, | ||
| shred.payload, | ||
| &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080), | ||
| nonce, | ||
| ); | ||
| packet.meta.repair = true; | ||
|
|
||
| let leader_slots = [(slot, keypair.pubkey().to_bytes())] | ||
| .iter() | ||
| .cloned() | ||
| .collect(); | ||
| let rv = verify_shred_cpu(&packet, &leader_slots); | ||
| assert_eq!(rv, Some(1)); | ||
|
|
||
| let wrong_keypair = Keypair::new(); | ||
| let leader_slots = [(slot, wrong_keypair.pubkey().to_bytes())] | ||
| .iter() | ||
| .cloned() | ||
| .collect(); | ||
| let rv = verify_shred_cpu(&packet, &leader_slots); | ||
| assert_eq!(rv, Some(0)); | ||
|
|
||
| let leader_slots = HashMap::new(); | ||
| let rv = verify_shred_cpu(&packet, &leader_slots); | ||
| assert_eq!(rv, None); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_sigverify_shred_cpu_repair() { | ||
| run_test_sigverify_shred_cpu_repair(UNLOCK_NONCE_SLOT); | ||
| run_test_sigverify_shred_cpu_repair(UNLOCK_NONCE_SLOT + 1); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.