Skip to content

chained cleanup continuation; subsequent to #8079 #8111

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
steviez merged 15 commits into from
Oct 9, 2025
Merged

chained cleanup continuation; subsequent to #8079 #8111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9e79506
remove option from setup_erasure_shreds_with_index_and_chained_merkle…
puhtaytow Sep 17, 2025
373cf63
remove option from chained_merkle_root param in setup_erasure_shreds_…
puhtaytow Sep 18, 2025
0fc3359
remove option from chained_merkle_root param in ledger/benches/make_s…
puhtaytow Sep 18, 2025
7ddeef5
remove option from chained_merkle_root param in shredder/entries_to_m…
puhtaytow Sep 18, 2025
9971c6f
remove option from chained_merkle_root in shredder/make_merkle_shreds…
puhtaytow Sep 18, 2025
e412d46
remove option from chained_merkle_root in shredder/make_shreds_from_d…
puhtaytow Sep 18, 2025
4e09c69
remove chained switch from ledger/shred/merkle/run_make_shreds_from_d…
puhtaytow Sep 19, 2025
f37eb3a
remove option from chained_merkle_root param in ledger/shred/merkle/m…
puhtaytow Sep 19, 2025
047f035
remove chained switch from ledger/shred/merkle/shred_leftover_data
puhtaytow Sep 19, 2025
638e6a9
remove chained switch param from ledger/shred/merkle/get_merkle_root
puhtaytow Sep 19, 2025
7bcff7a
remove chained field from both ShredVariant(s)
puhtaytow Sep 22, 2025
810ed79
remove signed / unsigned option
puhtaytow Sep 22, 2025
4ab4936
remove redundant unused overrides
puhtaytow Sep 23, 2025
4b2acf1
add missing comments / fix formatting
puhtaytow Oct 9, 2025
fced42a
remove obsolete comment in make_shreds_from_data / everything is chai…
puhtaytow Oct 9, 2025
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
110 changes: 19 additions & 91 deletions ledger/src/shred.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,12 @@ pub const MAX_CODE_SHREDS_PER_SLOT: usize = MAX_DATA_SHREDS_PER_SLOT;
// 2. Merkles are chained
// 3. No retransmit signature (only included for last batch)
pub const fn get_data_shred_bytes_per_batch_typical() -> u64 {
let capacity =
match merkle::ShredData::const_capacity(PROOF_ENTRIES_FOR_32_32_BATCH, true, false) {
Ok(v) => v,
Err(_proof_size) => {
panic!("this is unreachable");
}
};
let capacity = match merkle::ShredData::const_capacity(PROOF_ENTRIES_FOR_32_32_BATCH, false) {
Ok(v) => v,
Err(_proof_size) => {
Comment thread
puhtaytow marked this conversation as resolved.
panic!("this is unreachable");
}
};
(DATA_SHREDS_PER_FEC_BLOCK * capacity) as u64
}

Expand Down Expand Up @@ -226,22 +225,12 @@ enum ShredVariant {
// proof_size is the number of Merkle proof entries, and is encoded in the
// lowest 4 bits of the binary representation. The first 4 bits identify
// the shred variant:
// 0b0100_???? MerkleCode
// 0b0110_???? MerkleCode chained
// 0b0111_???? MerkleCode chained resigned
// 0b1000_???? MerkleData
// 0b1001_???? MerkleData chained
// 0b1011_???? MerkleData chained resigned
MerkleCode {
proof_size: u8,
chained: bool,
resigned: bool,
}, // 0b01??_????
MerkleData {
proof_size: u8,
chained: bool,
resigned: bool,
}, // 0b10??_????
MerkleCode { proof_size: u8, resigned: bool }, // 0b01??_????
MerkleData { proof_size: u8, resigned: bool }, // 0b10??_????
}

/// A common header that is present in data and code shred headers
Expand Down Expand Up @@ -622,44 +611,20 @@ impl From<ShredVariant> for u8 {
match shred_variant {
ShredVariant::MerkleCode {
proof_size,
chained: false,
resigned: false,
} => proof_size | 0x40,
ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned: false,
} => proof_size | 0x60,
ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned: true,
} => proof_size | 0x70,
ShredVariant::MerkleData {
proof_size,
chained: false,
resigned: false,
} => proof_size | 0x80,
ShredVariant::MerkleData {
proof_size,
chained: true,
resigned: false,
} => proof_size | 0x90,
ShredVariant::MerkleData {
proof_size,
chained: true,
resigned: true,
} => proof_size | 0xb0,
ShredVariant::MerkleCode {
proof_size: _,
chained: false,
resigned: true,
}
| ShredVariant::MerkleData {
proof_size: _,
chained: false,
resigned: true,
} => panic!("Invalid shred variant: {shred_variant:?}"),
}
}
}
Expand All @@ -674,34 +639,20 @@ impl TryFrom<u8> for ShredVariant {
} else {
let proof_size = shred_variant & 0x0F;
match shred_variant & 0xF0 {
0x40 => Ok(ShredVariant::MerkleCode {
proof_size,
chained: false,
resigned: false,
}),
0x60 => Ok(ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned: false,
}),
0x70 => Ok(ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned: true,
}),
0x80 => Ok(ShredVariant::MerkleData {
proof_size,
chained: false,
resigned: false,
}),
0x90 => Ok(ShredVariant::MerkleData {
proof_size,
chained: true,
resigned: false,
}),
0xb0 => Ok(ShredVariant::MerkleData {
proof_size,
chained: true,
resigned: true,
}),
_ => Err(Error::InvalidShredVariant),
Expand Down Expand Up @@ -858,15 +809,11 @@ where
}

match shred_variant {
ShredVariant::MerkleCode { chained: false, .. }
| ShredVariant::MerkleData { chained: false, .. } => {
return true;
}
ShredVariant::MerkleCode { chained: true, .. } => {
ShredVariant::MerkleCode { .. } => {
stats.num_shreds_merkle_code_chained =
stats.num_shreds_merkle_code_chained.saturating_add(1);
}
ShredVariant::MerkleData { chained: true, .. } => {
ShredVariant::MerkleData { .. } => {
stats.num_shreds_merkle_data_chained =
stats.num_shreds_merkle_data_chained.saturating_add(1);
}
Expand Down Expand Up @@ -907,26 +854,22 @@ pub fn max_entries_per_n_shred_last_or_not(
num_shreds: u64,
is_last_in_slot: bool,
) -> u64 {
// Default 32:32 erasure batches yields 64 shreds; log2(64) = 6.
let merkle_variant_unsigned = Some((
/*proof_size:*/ 6, /*chained:*/ true, /*resigned:*/ false,
));
let merkle_variant_signed = Some((
/*proof_size:*/ 6, /*chained:*/ true, /*resigned:*/ true,
));

let vec_size = bincode::serialized_size(&vec![entry]).unwrap();
let entry_size = bincode::serialized_size(entry).unwrap();
let count_size = vec_size - entry_size;

// Default 32:32 erasure batches yields 64 shreds; log2(64) = 6.
Comment thread
steviez marked this conversation as resolved.
if !is_last_in_slot {
// all shreds are unsigned
let shred_data_size = ShredData::capacity(merkle_variant_unsigned).unwrap() as u64;
let shred_data_size =
ShredData::capacity(/*proof_size:*/ 6, /*resigned:*/ false).unwrap() as u64;
(shred_data_size * num_shreds - count_size) / entry_size
} else {
// last FEC SET is signed, all others are unsigned
let shred_data_size_unsigned = ShredData::capacity(merkle_variant_unsigned).unwrap() as u64;
let shred_data_size_signed = ShredData::capacity(merkle_variant_signed).unwrap() as u64;
let shred_data_size_unsigned =
ShredData::capacity(/*proof_size:*/ 6, /*resigned:*/ false).unwrap() as u64;
let shred_data_size_signed =
ShredData::capacity(/*proof_size:*/ 6, /*resigned:*/ true).unwrap() as u64;
let shreds_per_fec_block = SHREDS_PER_FEC_BLOCK as u64;
(shred_data_size_unsigned * (num_shreds - shreds_per_fec_block)
+ shred_data_size_signed * shreds_per_fec_block
Expand All @@ -941,10 +884,7 @@ pub fn max_entries_per_n_shred(
shred_data_size: Option<usize>,
) -> u64 {
// Default 32:32 erasure batches yields 64 shreds; log2(64) = 6.
let merkle_variant = Some((
/*proof_size:*/ 6, /*chained:*/ true, /*resigned:*/ true,
));
let data_buffer_size = ShredData::capacity(merkle_variant).unwrap();
let data_buffer_size = ShredData::capacity(/*proof_size:*/ 6, /*resigned:*/ true).unwrap();
let shred_data_size = shred_data_size.unwrap_or(data_buffer_size) as u64;
let vec_size = bincode::serialized_size(&vec![entry]).unwrap();
let entry_size = bincode::serialized_size(entry).unwrap();
Expand Down Expand Up @@ -1026,7 +966,7 @@ mod tests {
merkle::make_shreds_from_data(
&thread_pool,
&Keypair::new(),
Some(chained_merkle_root),
chained_merkle_root,
&data[..],
slot,
parent_slot,
Expand All @@ -1046,7 +986,6 @@ mod tests {
signature: Signature::default(),
shred_variant: ShredVariant::MerkleCode {
proof_size: 0,
chained: true,
resigned: false,
},
slot: Slot::MAX,
Expand Down Expand Up @@ -1092,7 +1031,6 @@ mod tests {
SIZE_OF_SHRED_VARIANT,
bincode::serialized_size(&ShredVariant::MerkleCode {
proof_size: 15,
chained: true,
resigned: true
})
.unwrap() as usize
Expand Down Expand Up @@ -1618,15 +1556,13 @@ mod tests {
assert_eq!(
u8::from(ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned,
}),
byte
);
assert_eq!(
ShredType::from(ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned,
}),
ShredType::Code
Expand All @@ -1635,13 +1571,11 @@ mod tests {
ShredVariant::try_from(byte).unwrap(),
ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned,
},
);
let buf = bincode::serialize(&ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned,
})
.unwrap();
Expand All @@ -1650,7 +1584,6 @@ mod tests {
bincode::deserialize::<ShredVariant>(&[byte]).unwrap(),
ShredVariant::MerkleCode {
proof_size,
chained: true,
resigned,
}
);
Expand All @@ -1665,15 +1598,13 @@ mod tests {
assert_eq!(
u8::from(ShredVariant::MerkleData {
proof_size,
chained: true,
resigned,
}),
byte
);
assert_eq!(
ShredType::from(ShredVariant::MerkleData {
proof_size,
chained: true,
resigned,
}),
ShredType::Data
Expand All @@ -1682,13 +1613,11 @@ mod tests {
ShredVariant::try_from(byte).unwrap(),
ShredVariant::MerkleData {
proof_size,
chained: true,
resigned
}
);
let buf = bincode::serialize(&ShredVariant::MerkleData {
proof_size,
chained: true,
resigned,
})
.unwrap();
Expand All @@ -1697,7 +1626,6 @@ mod tests {
bincode::deserialize::<ShredVariant>(&[byte]).unwrap(),
ShredVariant::MerkleData {
proof_size,
chained: true,
resigned
}
);
Expand Down
Loading
Loading