Guard production behind a feature

chain/client/src/client.rs

@@ -96,9 +96,6 @@ const BLOCK_HORIZON: u64 = 500;
 /// number of blocks at the epoch start for which we will log more detailed info
 pub const EPOCH_START_INFO_BLOCKS: u64 = 500;
 
-/// Cache size for the produced optimistic blocks.
-pub const PRODUCED_OPTIMISTIC_BLOCK_POOL: usize = 10;
-
 /// Defines whether in case of adversarial block production invalid blocks can
 /// be produced.
 #[cfg(feature = "test_features")]

chain/client/src/client_actor.rs

@@ -1156,11 +1156,14 @@ impl ClientActorInner {
             }
         }
 
+        let protocol_version = self.client.epoch_manager.get_epoch_protocol_version(&epoch_id)?;
+        if !ProtocolFeature::ProduceOptimisticBlock.enabled(protocol_version) {
+            return Ok(());
+        }
         let optimistic_block_height = self.client.doomslug.get_timer_height();
         if self.client.epoch_manager.get_block_producer(&epoch_id, optimistic_block_height)? != me {
             return Ok(());
         }
-
         if let Err(err) = self.produce_optimistic_block(optimistic_block_height) {
             // If there is an error, report it and let it retry.
             error!(target: "client", optimistic_block_height, ?err, "Optimistic block production failed!");

core/primitives-core/src/version.rs

@@ -196,6 +196,7 @@ pub enum ProtocolFeature {
     ExcludeExistingCodeFromWitnessForCodeLen,
     /// Use the block height instead of the block hash to calculate the receipt ID.
     BlockHeightForReceiptId,
+    ProduceOptimisticBlock,
     GlobalContracts,
 }
 
@@ -285,7 +286,9 @@ impl ProtocolFeature {
             #[cfg(feature = "protocol_feature_relaxed_chunk_validation")]
             ProtocolFeature::RelaxedChunkValidation => 147,
             ProtocolFeature::ExcludeExistingCodeFromWitnessForCodeLen => 148,
-            ProtocolFeature::BlockHeightForReceiptId => 149,
+            ProtocolFeature::BlockHeightForReceiptId | ProtocolFeature::ProduceOptimisticBlock => {
+                149
+            }
             // Place features that are not yet in Nightly below this line.
             ProtocolFeature::GlobalContracts => 200,
         }