Revert "companion for 14754: cli: move no-beefy flag to sc-cli (#7600)…

…" (#7613)

* Revert "companion for 14754: cli: move no-beefy flag to sc-cli (#7600)"

This reverts commit 8f05479.

* update lockfile for {"substrate"}

* fix merge damage

---------

Co-authored-by: parity-processbot <>

cli/src/cli.rs

@@ -99,6 +99,11 @@ pub struct RunCmd {
 	#[arg(long = "grandpa-pause", num_args = 2)]
 	pub grandpa_pause: Vec<u32>,
 
+	/// Disable the BEEFY gadget
+	/// (currently enabled by default on Rococo, Wococo and Versi).
+	#[arg(long)]
+	pub no_beefy: bool,
+
 	/// Add the destination address to the jaeger agent.
 	///
 	/// Must be valid socket address, of format `IP:Port`

cli/src/command.rs

@@ -235,11 +235,15 @@ fn run_node_inner<F>(
 where
 	F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration),
 {
-	let mut runner = cli
+	let runner = cli
 		.create_runner_with_logger_hook::<sc_cli::RunCmd, F>(&cli.run.base, logger_hook)
 		.map_err(Error::from)?;
 	let chain_spec = &runner.config().chain_spec;
 
+	// By default, enable BEEFY on test networks.
+	let enable_beefy = (chain_spec.is_rococo() || chain_spec.is_wococo() || chain_spec.is_versi()) &&
+		!cli.run.no_beefy;
+
 	set_default_ss58_version(chain_spec);
 
 	let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
@@ -255,10 +259,6 @@ where
 		info!("     KUSAMA FOUNDATION      ");
 		info!("----------------------------");
 	}
-	// BEEFY allowed only on test networks.
-	if !(chain_spec.is_rococo() || chain_spec.is_wococo() || chain_spec.is_versi()) {
-		runner.config_mut().disable_beefy = true;
-	}
 
 	let jaeger_agent = if let Some(ref jaeger_agent) = cli.run.jaeger_agent {
 		Some(
@@ -289,6 +289,7 @@ where
 			service::NewFullParams {
 				is_parachain_node: service::IsParachainNode::No,
 				grandpa_pause,
+				enable_beefy,
 				jaeger_agent,
 				telemetry_worker_handle: None,
 				node_version,

node/service/src/lib.rs

@@ -629,6 +629,7 @@ where
 pub struct NewFullParams<OverseerGenerator: OverseerGen> {
 	pub is_parachain_node: IsParachainNode,
 	pub grandpa_pause: Option<(u32, u32)>,
+	pub enable_beefy: bool,
 	pub jaeger_agent: Option<std::net::SocketAddr>,
 	pub telemetry_worker_handle: Option<TelemetryWorkerHandle>,
 	/// The version of the node. TESTING ONLY: `None` can be passed to skip the node/worker version
@@ -719,6 +720,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	NewFullParams {
 		is_parachain_node,
 		grandpa_pause,
+		enable_beefy,
 		jaeger_agent,
 		telemetry_worker_handle,
 		node_version,
@@ -752,7 +754,6 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 		Some(backoff)
 	};
 
-	let enable_beefy = !config.disable_beefy;
 	// If not on a known test network, warn the user that BEEFY is still experimental.
 	if enable_beefy &&
 		!config.chain_spec.is_rococo() &&

node/test/service/src/lib.rs

@@ -81,6 +81,7 @@ pub fn new_full(
 		polkadot_service::NewFullParams {
 			is_parachain_node,
 			grandpa_pause: None,
+			enable_beefy: true,
 			jaeger_agent: None,
 			telemetry_worker_handle: None,
 			node_version: None,
@@ -186,7 +187,6 @@ pub fn node_config(
 		offchain_worker: Default::default(),
 		force_authoring: false,
 		disable_grandpa: false,
-		disable_beefy: false,
 		dev_key_seed: Some(key_seed),
 		tracing_targets: None,
 		tracing_receiver: Default::default(),

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

@@ -57,7 +57,6 @@ fn main() -> Result<()> {
 			runner.run_node_until_exit(|mut config| async move {
 				let collator = Collator::new();
 
-				config.disable_beefy = true;
 				// Zombienet is spawning all collators currently with the same CLI, this means it
 				// sets `--validator` and this is wrong here.
 				config.role = Role::Full;
@@ -68,6 +67,7 @@ fn main() -> Result<()> {
 							collator.collator_key(),
 						),
 						grandpa_pause: None,
+						enable_beefy: false,
 						jaeger_agent: None,
 						telemetry_worker_handle: None,
 

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

@@ -57,7 +57,6 @@ fn main() -> Result<()> {
 			runner.run_node_until_exit(|mut config| async move {
 				let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity);
 
-				config.disable_beefy = true;
 				// Zombienet is spawning all collators currently with the same CLI, this means it
 				// sets `--validator` and this is wrong here.
 				config.role = Role::Full;
@@ -68,6 +67,7 @@ fn main() -> Result<()> {
 							collator.collator_key(),
 						),
 						grandpa_pause: None,
+						enable_beefy: false,
 						jaeger_agent: None,
 						telemetry_worker_handle: None,