malus: add finality_delay cli flag

cli/src/cli.rs

@@ -144,6 +144,10 @@ pub struct RunCmd {
 	/// **Dangerous!** Do not touch unless explicitly adviced to.
 	#[clap(long)]
 	pub overseer_channel_capacity_override: Option<usize>,
+
+	#[allow(missing_docs)]
+	#[clap(long, hide = true)]
+	pub malus_finality_delay: Option<u32>,
 }
 
 #[allow(missing_docs)]

cli/src/command.rs

@@ -333,6 +333,8 @@ where
 				false,
 				overseer_gen,
 				cli.run.overseer_channel_capacity_override,
+				#[cfg(feature = "malus")]
+				cli.run.malus_finality_delay,
 				hwbench,
 			)
 			.map(|full| full.task_manager)

node/service/src/lib.rs

@@ -725,6 +725,7 @@ pub fn new_full<RuntimeApi, ExecutorDispatch, OverseerGenerator>(
 	overseer_enable_anyways: bool,
 	overseer_gen: OverseerGenerator,
 	overseer_message_channel_capacity_override: Option<usize>,
+	#[cfg(feature = "malus")] malus_finality_delay: Option<u32>,
 	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> Result<NewFull<Arc<FullClient<RuntimeApi, ExecutorDispatch>>>, Error>
 where
@@ -1221,7 +1222,15 @@ where
 		// add a custom voting rule to temporarily stop voting for new blocks
 		// after the given pause block is finalized and restarting after the
 		// given delay.
-		let builder = grandpa::VotingRulesBuilder::default();
+		let mut builder = grandpa::VotingRulesBuilder::default();
+
+		#[cfg(not(feature = "malus"))]
+		let malus_finality_delay = None;
+
+		if let Some(delay) = malus_finality_delay {
+			info!(?delay, "Enabling malus finality delay",);
+			builder = builder.add(grandpa::BeforeBestBlockBy(delay));
+		};
 
 		let voting_rule = match grandpa_pause {
 			Some((block, delay)) => {
@@ -1349,6 +1358,7 @@ pub fn build_full(
 	overseer_enable_anyways: bool,
 	overseer_gen: impl OverseerGen,
 	overseer_message_channel_override: Option<usize>,
+	#[cfg(feature = "malus")] malus_finality_delay: Option<u32>,
 	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> Result<NewFull<Client>, Error> {
 	#[cfg(feature = "rococo-native")]
@@ -1367,6 +1377,8 @@ pub fn build_full(
 			overseer_enable_anyways,
 			overseer_gen,
 			overseer_message_channel_override,
+			#[cfg(feature = "malus")]
+			malus_finality_delay,
 			hwbench,
 		)
 		.map(|full| full.with_client(Client::Rococo))
@@ -1385,6 +1397,8 @@ pub fn build_full(
 			overseer_enable_anyways,
 			overseer_gen,
 			overseer_message_channel_override,
+			#[cfg(feature = "malus")]
+			malus_finality_delay,
 			hwbench,
 		)
 		.map(|full| full.with_client(Client::Kusama))
@@ -1403,6 +1417,8 @@ pub fn build_full(
 			overseer_enable_anyways,
 			overseer_gen,
 			overseer_message_channel_override,
+			#[cfg(feature = "malus")]
+			malus_finality_delay,
 			hwbench,
 		)
 		.map(|full| full.with_client(Client::Westend))
@@ -1424,6 +1440,8 @@ pub fn build_full(
 				gum::warn!("Channel capacity should _never_ be tampered with on polkadot!");
 				capacity
 			}),
+			#[cfg(feature = "malus")]
+			malus_finality_delay,
 			hwbench,
 		)
 		.map(|full| full.with_client(Client::Polkadot))

node/test/service/src/lib.rs

@@ -102,6 +102,7 @@ pub fn new_full(
 		polkadot_service::RealOverseerGen,
 		None,
 		None,
+		None,
 	)
 }
 

parachain/test-parachains/adder/collator/src/main.rs

@@ -72,6 +72,7 @@ fn main() -> Result<()> {
 							polkadot_service::RealOverseerGen,
 							None,
 							None,
+							None,
 						)
 						.map_err(|e| e.to_string())?;
 						let mut overseer_handle = full_node

parachain/test-parachains/undying/collator/src/main.rs

@@ -72,6 +72,7 @@ fn main() -> Result<()> {
 							polkadot_service::RealOverseerGen,
 							None,
 							None,
+							None,
 						)
 						.map_err(|e| e.to_string())?;
 						let mut overseer_handle = full_node