Merge branch 'bat/genesis-io' (#1746)

.changelog/unreleased/features/1746-generic-io.md

@@ -0,0 +1,2 @@
+- Replaced standard IO in SDK and client code with a trait that allows custom
+  handling. ([\#1746](https://github.com/anoma/namada/pull/1746))

apps/src/bin/namada-client/main.rs

@@ -1,5 +1,5 @@
 use color_eyre::eyre::Result;
-use namada_apps::cli::api::CliApi;
+use namada_apps::cli::api::{CliApi, CliIo};
 use namada_apps::facade::tendermint_rpc::HttpClient;
 use namada_apps::{cli, logging};
 use tracing_subscriber::filter::LevelFilter;
@@ -13,7 +13,7 @@ async fn main() -> Result<()> {
     let _log_guard = logging::init_from_env_or(LevelFilter::INFO)?;
 
     // run the CLI
-    CliApi::<()>::handle_client_command::<HttpClient>(
+    CliApi::<CliIo>::handle_client_command::<HttpClient>(
         None,
         cli::namada_client_cli()?,
     )

apps/src/bin/namada-relayer/main.rs

@@ -1,6 +1,6 @@
 use color_eyre::eyre::Result;
 use namada::tendermint_rpc::HttpClient;
-use namada_apps::cli::api::CliApi;
+use namada_apps::cli::api::{CliApi, CliIo};
 use namada_apps::{cli, logging};
 use tracing_subscriber::filter::LevelFilter;
 
@@ -14,5 +14,5 @@ async fn main() -> Result<()> {
 
     let cmd = cli::namada_relayer_cli()?;
     // run the CLI
-    CliApi::<()>::handle_relayer_command::<HttpClient>(None, cmd).await
+    CliApi::<CliIo>::handle_relayer_command::<HttpClient>(None, cmd).await
 }

apps/src/bin/namada-wallet/main.rs

@@ -1,10 +1,10 @@
 use color_eyre::eyre::Result;
 use namada_apps::cli;
-use namada_apps::cli::api::CliApi;
+use namada_apps::cli::api::{CliApi, CliIo};
 
 pub fn main() -> Result<()> {
     color_eyre::install()?;
     let (cmd, ctx) = cli::namada_wallet_cli()?;
     // run the CLI
-    CliApi::<()>::handle_wallet_command(cmd, ctx)
+    CliApi::<CliIo>::handle_wallet_command(cmd, ctx)
 }

apps/src/lib/cli.rs

@@ -15,10 +15,12 @@ pub mod wallet;
 
 use clap::{ArgGroup, ArgMatches, ColorChoice};
 use color_eyre::eyre::Result;
+use namada::types::io::DefaultIo;
 use utils::*;
 pub use utils::{dispatch_prompt, safe_exit, Cmd, TESTIN};
 
 pub use self::context::Context;
+use crate::cli::api::CliIo;
 
 include!("../../version.rs");
 
@@ -2585,6 +2587,14 @@ pub mod args {
         arg_default("gas-limit", DefaultFn(|| GasLimit::from(20_000)));
     pub const FEE_TOKEN: ArgDefaultFromCtx<WalletAddress> =
         arg_default_from_ctx("gas-token", DefaultFn(|| "NAM".parse().unwrap()));
+    pub const FEE_PAYER: Arg<WalletAddress> = arg("fee-payer");
+    pub const FEE_AMOUNT: ArgDefault<token::DenominatedAmount> = arg_default(
+        "fee-amount",
+        DefaultFn(|| token::DenominatedAmount {
+            amount: token::Amount::default(),
+            denom: NATIVE_MAX_DECIMAL_PLACES.into(),
+        }),
+    );
     pub const GENESIS_PATH: Arg<PathBuf> = arg("genesis-path");
     pub const GENESIS_VALIDATOR: ArgOpt<String> =
         arg("genesis-validator").opt();
@@ -4233,14 +4243,6 @@ pub mod args {
         }
     }
 
-    impl CliToSdk<QueryPgf<SdkTypes>> for QueryPgf<CliTypes> {
-        fn to_sdk(self, ctx: &mut Context) -> QueryPgf<SdkTypes> {
-            QueryPgf::<SdkTypes> {
-                query: self.query.to_sdk(ctx),
-            }
-        }
-    }
-
     impl Args for QueryPgf<CliTypes> {
         fn parse(matches: &ArgMatches) -> Self {
             let query = Query::parse(matches);
@@ -4253,6 +4255,14 @@ pub mod args {
         }
     }
 
+    impl CliToSdk<QueryPgf<SdkTypes>> for QueryPgf<CliTypes> {
+        fn to_sdk(self, ctx: &mut Context) -> QueryPgf<SdkTypes> {
+            QueryPgf::<SdkTypes> {
+                query: self.query.to_sdk(ctx),
+            }
+        }
+    }
+
     impl CliToSdk<Withdraw<SdkTypes>> for Withdraw<CliTypes> {
         fn to_sdk(self, ctx: &mut Context) -> Withdraw<SdkTypes> {
             Withdraw::<SdkTypes> {
@@ -5653,7 +5663,7 @@ pub fn namada_client_cli() -> Result<NamadaClient> {
             let global_args = args::Global::parse(&matches);
             match cmd {
                 cmds::NamadaClient::WithContext(sub_cmd) => {
-                    let context = Context::new(global_args)?;
+                    let context = Context::new::<CliIo>(global_args)?;
                     Ok(NamadaClient::WithContext(Box::new((sub_cmd, context))))
                 }
                 cmds::NamadaClient::WithoutContext(sub_cmd) => {
@@ -5689,7 +5699,7 @@ pub fn namada_relayer_cli() -> Result<NamadaRelayer> {
                 cmds::EthBridgePool::WithContext(sub_cmd),
             ) => {
                 let global_args = args::Global::parse(&matches);
-                let context = Context::new(global_args)?;
+                let context = Context::new::<DefaultIo>(global_args)?;
                 Ok(NamadaRelayer::EthBridgePoolWithCtx(Box::new((
                     sub_cmd, context,
                 ))))

apps/src/lib/cli/api.rs

@@ -4,6 +4,7 @@ use namada::sdk::queries::Client;
 use namada::sdk::rpc::wait_until_node_is_synched;
 use namada::tendermint_rpc::HttpClient;
 use namada::types::control_flow::Halt;
+use namada::types::io::Io;
 use tendermint_config::net::Address as TendermintAddress;
 
 use crate::client::utils;
@@ -12,7 +13,7 @@ use crate::client::utils;
 #[async_trait::async_trait(?Send)]
 pub trait CliClient: Client + Sync {
     fn from_tendermint_address(address: &mut TendermintAddress) -> Self;
-    async fn wait_until_node_is_synced(&self) -> Halt<()>;
+    async fn wait_until_node_is_synced<IO: Io>(&self) -> Halt<()>;
 }
 
 #[async_trait::async_trait(?Send)]
@@ -21,9 +22,14 @@ impl CliClient for HttpClient {
         HttpClient::new(utils::take_config_address(address)).unwrap()
     }
 
-    async fn wait_until_node_is_synced(&self) -> Halt<()> {
-        wait_until_node_is_synched(self).await
+    async fn wait_until_node_is_synced<IO: Io>(&self) -> Halt<()> {
+        wait_until_node_is_synched::<_, IO>(self).await
     }
 }
 
-pub struct CliApi<IO>(PhantomData<IO>);
+pub struct CliIo;
+
+#[async_trait::async_trait(?Send)]
+impl Io for CliIo {}
+
+pub struct CliApi<IO: Io = CliIo>(PhantomData<IO>);