enables chained Merkle shreds for ClusterType::Development

anza-xyz · Mar 4, 2024 · f0b5da4 · f0b5da4
1 parent db2071a
commit f0b5da4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/core/src/shred_fetch_stage.rs b/core/src/shred_fetch_stage.rs
@@ -13,6 +13,7 @@ use {
         clock::{Slot, DEFAULT_MS_PER_SLOT},
         epoch_schedule::EpochSchedule,
         feature_set::{self, FeatureSet},
+        genesis_config::ClusterType,
         packet::{Meta, PACKET_DATA_SIZE},
         pubkey::Pubkey,
     },
@@ -70,6 +71,10 @@ impl ShredFetchStage {
             )
         };
         let mut stats = ShredFetchStats::default();
+        let cluster_type = {
+            let root_bank = bank_forks.read().unwrap().root_bank();
+            root_bank.cluster_type()
+        };
 
         for mut packet_batch in recvr {
             if last_updated.elapsed().as_millis() as u64 > DEFAULT_MS_PER_SLOT {
@@ -113,12 +118,13 @@ impl ShredFetchStage {
                 )
             };
             let enable_chained_merkle_shreds = |shred_slot| {
-                check_feature_activation(
-                    &feature_set::enable_chained_merkle_shreds::id(),
-                    shred_slot,
-                    &feature_set,
-                    &epoch_schedule,
-                )
+                cluster_type == ClusterType::Development
+                    || check_feature_activation(
+                        &feature_set::enable_chained_merkle_shreds::id(),
+                        shred_slot,
+                        &feature_set,
+                        &epoch_schedule,
+                    )
             };
             let turbine_disabled = turbine_disabled.load(Ordering::Relaxed);
             for packet in packet_batch.iter_mut().filter(|p| !p.meta().discard()) {

diff --git a/turbine/src/broadcast_stage/standard_broadcast_run.rs b/turbine/src/broadcast_stage/standard_broadcast_run.rs
@@ -527,8 +527,8 @@ impl BroadcastRun for StandardBroadcastRun {
     }
 }
 
-fn should_chain_merkle_shreds(_slot: Slot, _cluster_type: ClusterType) -> bool {
-    false
+fn should_chain_merkle_shreds(_slot: Slot, cluster_type: ClusterType) -> bool {
+    cluster_type == ClusterType::Development
 }
 
 #[cfg(test)]