From e4b6e7fb63e9db3be440a0a55fca879ae82db0e5 Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Sun, 15 Dec 2024 23:58:52 +0000 Subject: [PATCH] rolls out chained Merkle shreds to ~5% of mainnet slots (#4019) (cherry picked from commit d3fe8f8a01725e02c9ca594ffe8b1461f10b0e9a) # Conflicts: # turbine/src/broadcast_stage/standard_broadcast_run.rs --- turbine/src/broadcast_stage/standard_broadcast_run.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/turbine/src/broadcast_stage/standard_broadcast_run.rs b/turbine/src/broadcast_stage/standard_broadcast_run.rs index 6723ed6f32aafe..1201b2efffd268 100644 --- a/turbine/src/broadcast_stage/standard_broadcast_run.rs +++ b/turbine/src/broadcast_stage/standard_broadcast_run.rs @@ -503,12 +503,18 @@ impl BroadcastRun for StandardBroadcastRun { } } -fn should_chain_merkle_shreds(_slot: Slot, cluster_type: ClusterType) -> bool { +fn should_chain_merkle_shreds(slot: Slot, cluster_type: ClusterType) -> bool { match cluster_type { ClusterType::Development => true, ClusterType::Devnet => true, +<<<<<<< HEAD ClusterType::MainnetBeta => false, ClusterType::Testnet => false, +======= + // Roll out chained Merkle shreds to ~5% of mainnet slots. + ClusterType::MainnetBeta => slot % 19 == 1, + ClusterType::Testnet => true, +>>>>>>> d3fe8f8a0 (rolls out chained Merkle shreds to ~5% of mainnet slots (#4019)) } }