From f275536f31665157cfbd8ffcf1b7035e9ed4630e Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Tue, 20 Dec 2022 18:33:48 +0000 Subject: [PATCH] rolls back merkle shreds on testnet (#29340) https://github.com/solana-labs/solana/pull/29339 adds hash domain to merkle shreds. In order to merge that change, need to temporarily disable merkle shreds on testnet. (cherry picked from commit 558292466bc2581ab3397e8b38d8cdaa72e985bb) --- core/src/broadcast_stage/standard_broadcast_run.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/broadcast_stage/standard_broadcast_run.rs b/core/src/broadcast_stage/standard_broadcast_run.rs index b0addfb5ad1827..3e75e237da1b3e 100644 --- a/core/src/broadcast_stage/standard_broadcast_run.rs +++ b/core/src/broadcast_stage/standard_broadcast_run.rs @@ -473,8 +473,8 @@ impl BroadcastRun for StandardBroadcastRun { } } -fn should_use_merkle_variant(slot: Slot, cluster_type: ClusterType, shred_version: u16) -> bool { - cluster_type == ClusterType::Testnet && shred_version == 6995 && (slot % 19 < 4) +fn should_use_merkle_variant(_slot: Slot, _cluster_type: ClusterType, _shred_version: u16) -> bool { + false } #[cfg(test)]