Merge pull request #408 from consensus-shipyard/use-cli-for-nwtwork

Use cli parameter to set netowrk

Author: adlrocha

ipc/cli/src/commands/mod.rs

@@ -21,6 +21,7 @@ use clap_complete::{generate, Generator, Shell};
 use fvm_shared::econ::TokenAmount;
 use ipc_sdk::ethers_address_to_fil_address;
 
+use fvm_shared::address::set_current_network;
 use ipc_provider::config::{Config, Subnet};
 use ipc_sdk::subnet_id::SubnetID;
 use std::fmt::Debug;
@@ -65,6 +66,23 @@ struct IPCAgentCliCommands {
     command: Option<Commands>,
 }
 
+/// A version of options that does partial matching on the arguments, with its only interest
+/// being the capture of global parameters that need to take effect first, before we parse [Options],
+/// because their value affects how others arse parsed.
+///
+/// This one doesn't handle `--help` or `help` so that it is passed on to the next parser,
+/// where the full set of commands and arguments can be printed properly.
+#[derive(Parser, Debug)]
+#[command(version, disable_help_flag = true)]
+struct GlobalOptions {
+    #[command(flatten)]
+    global_params: GlobalArguments,
+
+    /// Capture all the normal commands, basically to ingore them.
+    #[arg(allow_hyphen_values = true, trailing_var_arg = true)]
+    pub cmd: Vec<String>,
+}
+
 /// The `cli` method exposed to handle all the cli commands, ideally from main.
 ///
 /// # Examples
@@ -94,6 +112,9 @@ struct IPCAgentCliCommands {
 /// }
 /// ```
 pub async fn cli() -> anyhow::Result<()> {
+    let global = GlobalOptions::parse();
+    set_current_network(global.global_params.network);
+
     // parse the arguments
     let args = IPCAgentCliCommands::parse();
 

ipc/cli/src/lib.rs

@@ -3,6 +3,8 @@
 use anyhow::Result;
 use async_trait::async_trait;
 use clap::Args;
+use fvm_shared::address::Network;
+use num_traits::cast::FromPrimitive;
 
 mod commands;
 
@@ -36,6 +38,10 @@ pub struct GlobalArguments {
         help = "The toml config file path for IPC Agent, default to ${HOME}/.ipc-agent/config.toml"
     )]
     config_path: Option<String>,
+
+    /// Set the FVM Address Network. It's value affects whether `f` (main) or `t` (test) prefixed addresses are accepted.
+    #[arg(short, long, default_value = "mainnet", env = "NETWORK", value_parser = parse_network)]
+    pub network: Network,
 }
 
 impl GlobalArguments {
@@ -50,3 +56,20 @@ impl GlobalArguments {
         Config::from_file(config_path)
     }
 }
+
+/// Parse the FVM network and set the global value.
+fn parse_network(s: &str) -> Result<Network, String> {
+    match s.to_lowercase().as_str() {
+        "main" | "mainnet" | "f" => Ok(Network::Mainnet),
+        "test" | "testnet" | "t" => Ok(Network::Testnet),
+        n => {
+            let n: u8 = n
+                .parse()
+                .map_err(|e| format!("expected 0 or 1 for network: {e}"))?;
+
+            let n = Network::from_u8(n).ok_or_else(|| format!("unexpected network: {s}"))?;
+
+            Ok(n)
+        }
+    }
+}

ipc/cli/src/main.rs

@@ -1,11 +1,9 @@
 // Copyright 2022-2023 Protocol Labs
 // SPDX-License-Identifier: MIT
-use ipc_provider::set_fil_network_from_env;
 
 #[tokio::main]
 async fn main() {
     env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-    set_fil_network_from_env();
 
     if let Err(e) = ipc_cli::cli().await {
         log::error!("main process failed: {e:#}");

ipc/provider/src/lib.rs

@@ -7,10 +7,7 @@ use anyhow::anyhow;
 use base64::Engine;
 use config::Config;
 use fvm_shared::{
-    address::{set_current_network, Address, Network},
-    clock::ChainEpoch,
-    crypto::signature::SignatureType,
-    econ::TokenAmount,
+    address::Address, clock::ChainEpoch, crypto::signature::SignatureType, econ::TokenAmount,
 };
 use ipc_identity::{
     EthKeyAddress, EvmKeyStore, KeyStore, KeyStoreConfig, PersistentKeyStore, Wallet,
@@ -24,7 +21,6 @@ use ipc_sdk::{
 };
 use lotus::message::wallet::WalletKeyType;
 use manager::{EthSubnetManager, SubnetGenesisInfo, SubnetInfo, SubnetManager};
-use num_traits::FromPrimitive;
 use serde::{Deserialize, Serialize};
 use std::{
     borrow::Borrow,
@@ -44,16 +40,6 @@ pub mod manager;
 const DEFAULT_REPO_PATH: &str = ".ipc";
 const DEFAULT_CONFIG_NAME: &str = "config.toml";
 
-pub fn set_fil_network_from_env() {
-    let network_raw: u8 = std::env::var("LOTUS_NETWORK")
-        // default to testnet
-        .unwrap_or_else(|_| String::from("1"))
-        .parse()
-        .unwrap();
-    let network = Network::from_u8(network_raw).unwrap();
-    set_current_network(network);
-}
-
 /// The subnet manager connection that holds the subnet config and the manager instance.
 pub struct Connection {
     subnet: config::Subnet,