Remove asset-hub specific CLI args and logic (#101)

* Remove asset-hub specific CLI args and logic
Refactor parachain support to use them only from config

* Optional pass rc and paras to cli args

Author: mchristou

examples/README.md

@@ -18,10 +18,7 @@ Zombie Bite now supports configuration files to simplify the management of syste
 zombie-bite bite --config examples/all-system-chains.toml
 
 # Override specific values from CLI (CLI takes precedence)
-zombie-bite bite --config examples/kusama-network.toml --relay polkadot
-
-# Mix config file with CLI overrides
-zombie-bite bite --config examples/asset-hub-only.toml --parachains asset-hub,coretime,people
+zombie-bite bite --config examples/kusama-network.toml --rc polkadot
 ```
 
 ### Basic Structure

src/cli.rs

@@ -1,9 +1,10 @@
-use std::env;
-use std::path::PathBuf;
-use std::time::{SystemTime, UNIX_EPOCH};
-
 use clap::{Parser, Subcommand};
-use std::str::FromStr;
+use std::{
+    env,
+    path::PathBuf,
+    str::FromStr,
+    time::{SystemTime, UNIX_EPOCH},
+};
 use tracing::warn;
 
 use crate::config::{Parachain, Relaychain, ZombieBiteConfig};
@@ -22,26 +23,21 @@ pub enum Commands {
         /// Configuration file path to use for the bite operation. CLI args override config file values.
         #[arg(long, short = 'c', verbatim_doc_comment)]
         config: Option<String>,
-        /// The network will be using for bite (will try the network + ah)
-        #[arg(short = 'r', long = "rc", value_parser = clap::builder::PossibleValuesParser::new(["polkadot", "kusama", "paseo"]), default_value="polkadot")]
-        relay: String,
+        /// The network will be using for bite
+        /// If not specified, will use the value from config.
+        /// If not in config, defaults to polkadot.
+        #[arg(short = 'r', long = "rc", value_parser = clap::builder::PossibleValuesParser::new(["polkadot", "kusama", "paseo"]))]
+        relay: Option<String>,
         /// If provided we will override the runtime as part of the process of 'bite'
         /// The resulting network will be running with this runtime.
         #[arg(long = "rc-override", verbatim_doc_comment)]
         relay_runtime: Option<String>,
         /// If provided we will _bite_ the live network at the supplied block hieght
         #[arg(long = "rc-bite-at", verbatim_doc_comment)]
         relay_bite_at: Option<u32>,
-        /// If provided we will override the runtime as part of the process of 'bite'
-        /// The resulting version of AH will be running with this runtime.
-        #[arg(long = "ah-override", verbatim_doc_comment)]
-        ah_runtime: Option<String>,
         /// Parachains to include: asset-hub, coretime, people, bridge-hub, collectives (comma-separated)
         #[arg(long, short = 'p', value_delimiter = ',', verbatim_doc_comment)]
         parachains: Option<Vec<String>>,
-        /// If provided we will _bite_ the live network at the supplied block hieght
-        #[arg(long = "ah-bite-at", verbatim_doc_comment)]
-        ah_bite_at: Option<u32>,
         /// Base path to use. if not provided we will check the env 'ZOMBIE_BITE_BASE_PATH' and if not present we will use `<cwd>_timestamp`
         #[arg(long, short = 'd', verbatim_doc_comment)]
         base_path: Option<String>,
@@ -148,11 +144,9 @@ pub struct ResolvedSpawnConfig {
 #[allow(clippy::too_many_arguments)]
 pub fn resolve_bite_config(
     config_path: Option<String>,
-    relay: String,
+    relay: Option<String>,
     relay_runtime: Option<String>,
     relay_bite_at: Option<u32>,
-    ah_runtime: Option<String>,
-    ah_bite_at: Option<u32>,
     parachains: Option<Vec<String>>,
     base_path: Option<String>,
     rc_sync_url: Option<String>,
@@ -165,27 +159,29 @@ pub fn resolve_bite_config(
         None
     };
 
-    // Resolve relaychain (CLI overrides config file)
+    // Resolve relaychain (CLI always overrides config file)
+    // Determine relay network: CLI > config > default
+    let relay_network = if let Some(ref cli_relay) = relay {
+        cli_relay.clone()
+    } else if let Some(ref config) = config_file {
+        config.relaychain.network.clone()
+    } else {
+        "polkadot".to_string()
+    };
+   
     let relaychain = if relay_runtime.is_some() || rc_sync_url.is_some() || relay_bite_at.is_some()
     {
         // CLI args provided, use them
-        Relaychain::new_with_values(&relay, relay_runtime, rc_sync_url, relay_bite_at)
+        Relaychain::new_with_values(&relay_network, relay_runtime, rc_sync_url, relay_bite_at)
     } else if let Some(ref config) = config_file {
-        // Use config file settings, but override network if CLI specifies it
-        let network = if relay != "polkadot" {
-            &relay
-        } else {
-            &config.relaychain.network
-        };
         Relaychain::new_with_values(
-            network,
+            &relay_network,
             config.relaychain.runtime_override.clone(),
             config.relaychain.sync_url.clone(),
             config.relaychain.bite_at,
         )
     } else {
-        // No config file, use CLI values
-        Relaychain::new_with_values(&relay, relay_runtime, rc_sync_url, relay_bite_at)
+        Relaychain::new_with_values(&relay_network, relay_runtime, rc_sync_url, relay_bite_at)
     };
 
     // Resolve parachains (CLI overrides config file)
@@ -195,8 +191,8 @@ pub fn resolve_bite_config(
             .iter()
             .filter_map(|p| match p.as_str() {
                 "asset-hub" => Some(Parachain::AssetHub {
-                    maybe_override: ah_runtime.clone(),
-                    maybe_bite_at: ah_bite_at,
+                    maybe_override: None,
+                    maybe_bite_at: None,
                     maybe_rpc_endpoint: None,
                 }),
                 "coretime" => Some(Parachain::Coretime {
@@ -230,30 +226,10 @@ pub fn resolve_bite_config(
             })
             .collect()
     } else if let Some(ref config) = config_file {
-        // Use config file parachains but apply ah_runtime and ah_bite_at override if specified
-        config
-            .get_parachains()
-            .iter()
-            .map(|p| match p {
-                Parachain::AssetHub {
-                    maybe_rpc_endpoint, ..
-                } if ah_runtime.is_some() || ah_bite_at.is_some() => Parachain::AssetHub {
-                    maybe_override: ah_runtime
-                        .clone()
-                        .or_else(|| p.wasm_overrides().map(|s| s.to_string())),
-                    maybe_bite_at: ah_bite_at.or(p.at_block()),
-                    maybe_rpc_endpoint: maybe_rpc_endpoint.clone(),
-                },
-                _ => p.clone(),
-            })
-            .collect()
+        // Use config file parachains
+        config.get_parachains().to_vec()
     } else {
-        // Default to just asset-hub for backward compatibility
-        vec![Parachain::AssetHub {
-            maybe_override: ah_runtime,
-            maybe_bite_at: ah_bite_at,
-            maybe_rpc_endpoint: None,
-        }]
+        vec![]
     };
 
     // Resolve base_path (CLI overrides config file)

src/doppelganger.rs

@@ -111,7 +111,7 @@ pub async fn doppelganger_inner(
             sync_para(
                 ns.clone(),
                 "doppelganger-parachain",
-                &para,
+                para,
                 &relay_chain,
                 relay_chain.sync_endpoint(),
                 para_default_overrides_path,

src/main.rs

@@ -52,21 +52,17 @@ async fn resolve_if_dir_exist(base_path: &Path, step: Step) {
 }
 
 async fn ensure_startup_producing_blocks(network: &Network<LocalFileSystem>) {
-    // first wait until the collator replies with metrics
+    // Check metrics for all parachains and their collators
     let parachains = network.parachains();
-    let para = parachains
-        .first()
-        .expect("At least one parachain should exist");
-    let collators = para.collators();
-    let collator = collators
-        .first()
-        .expect("At least one collator should exist");
-    debug!("Waiting metrics for collator {}", collator.name());
-
-    collator
-        .wait_metric_with_timeout("node_roles", |x| x > 1.0, 300_u64)
-        .await
-        .unwrap();
+    for para in parachains {
+        for collator in para.collators() {
+            debug!("Waiting metrics for collator {}", collator.name());
+            collator
+                .wait_metric_with_timeout("node_roles", |x| x > 1.0, 300_u64)
+                .await
+                .unwrap();
+        }
+    }
 
     // ensure block production
     let client = network
@@ -157,9 +153,7 @@ async fn main() -> Result<(), anyhow::Error> {
             relay,
             relay_runtime,
             relay_bite_at,
-            ah_runtime,
             parachains,
-            ah_bite_at,
             base_path,
             rc_sync_url,
             and_spawn,
@@ -176,8 +170,6 @@ async fn main() -> Result<(), anyhow::Error> {
                 relay,
                 relay_runtime,
                 relay_bite_at,
-                ah_runtime,
-                ah_bite_at,
                 parachains,
                 base_path,
                 rc_sync_url,

src/overrides.rs

@@ -334,8 +334,8 @@ pub async fn generate_default_overrides_for_para(
 fn generate_paras_parachains_value(ids: impl Into<Vec<u32>>) -> String {
     let para_ids = ids.into();
     let para_ids: Vec<ParaId> = para_ids.iter().map(|id| ParaId(*id)).collect();
-    let paras_parachains = array_bytes::bytes2hex("", para_ids.encode());
-    paras_parachains
+
+    array_bytes::bytes2hex("", para_ids.encode())
 }
 
 #[cfg(test)]