diff --git a/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs b/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs index e135f5282c..788810c8be 100644 --- a/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs +++ b/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs @@ -1,10 +1,13 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use std::str::FromStr; + use clap::Parser; use log::{debug, info}; use coconut_bandwidth_contract_common::msg::InstantiateMsg; +use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] pub struct Args { @@ -12,7 +15,7 @@ pub struct Args { pub pool_addr: String, #[clap(long)] - pub multisig_addr: Option, + pub multisig_addr: Option, #[clap(long)] pub mix_denom: Option, @@ -24,8 +27,10 @@ pub async fn generate(args: Args) { debug!("Received arguments: {:?}", args); let multisig_addr = args.multisig_addr.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS) - .expect("Multisig address has to be set") + let address = std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS) + .expect("Multisig address has to be set"); + AccountId::from_str(address.as_str()) + .expect("Failed converting multisig address to AccountId") }); let mix_denom = args.mix_denom.unwrap_or_else(|| { @@ -34,7 +39,7 @@ pub async fn generate(args: Args) { let instantiate_msg = InstantiateMsg { pool_addr: args.pool_addr, - multisig_addr, + multisig_addr: multisig_addr.to_string(), mix_denom, }; diff --git a/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs b/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs index 6fe83c4959..9d83de31bf 100644 --- a/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs +++ b/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs @@ -7,6 +7,7 @@ use std::str::FromStr; use coconut_dkg_common::msg::InstantiateMsg; use coconut_dkg_common::types::TimeConfiguration; +use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] pub struct Args { @@ -14,7 +15,7 @@ pub struct Args { pub group_addr: String, #[clap(long)] - pub multisig_addr: Option, + pub multisig_addr: Option, #[clap(long)] pub public_key_submission_time_secs: Option, @@ -44,8 +45,10 @@ pub async fn generate(args: Args) { debug!("Received arguments: {:?}", args); let multisig_addr = args.multisig_addr.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS) - .expect("Multisig address has to be set") + let address = std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS) + .expect("Multisig address has to be set"); + AccountId::from_str(address.as_str()) + .expect("Failed converting multisig address to AccountId") }); let mix_denom = args.mix_denom.unwrap_or_else(|| { @@ -86,7 +89,7 @@ pub async fn generate(args: Args) { let instantiate_msg = InstantiateMsg { group_addr: args.group_addr, - multisig_addr, + multisig_addr: multisig_addr.to_string(), time_configuration: Some(time_configuration), mix_denom, }; diff --git a/common/commands/src/validator/cosmwasm/generators/mixnet.rs b/common/commands/src/validator/cosmwasm/generators/mixnet.rs index f5fb1f4c46..8d47ffbca6 100644 --- a/common/commands/src/validator/cosmwasm/generators/mixnet.rs +++ b/common/commands/src/validator/cosmwasm/generators/mixnet.rs @@ -6,15 +6,17 @@ use log::{debug, info}; use cosmwasm_std::Decimal; use mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent}; +use std::str::FromStr; use std::time::Duration; +use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] pub struct Args { #[clap(long)] - pub rewarding_validator_address: Option, + pub rewarding_validator_address: Option, #[clap(long)] - pub vesting_contract_address: Option, + pub vesting_contract_address: Option, #[clap(long)] pub rewarding_denom: Option, @@ -77,13 +79,17 @@ pub async fn generate(args: Args) { debug!("initial_rewarding_params: {:?}", initial_rewarding_params); let rewarding_validator_address = args.rewarding_validator_address.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS) - .expect("Rewarding validator address has to be set") + let address = std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS) + .expect("Rewarding validator address has to be set"); + AccountId::from_str(address.as_str()) + .expect("Failed converting rewarding validator address to AccountId") }); let vesting_contract_address = args.vesting_contract_address.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::VESTING_CONTRACT_ADDRESS) - .expect("Vesting contract address has to be set") + let address = std::env::var(network_defaults::var_names::VESTING_CONTRACT_ADDRESS) + .expect("Vesting contract address has to be set"); + AccountId::from_str(address.as_str()) + .expect("Failed converting vesting contract address to AccountId") }); let rewarding_denom = args.rewarding_denom.unwrap_or_else(|| { @@ -92,8 +98,8 @@ pub async fn generate(args: Args) { }); let instantiate_msg = InstantiateMsg { - rewarding_validator_address, - vesting_contract_address, + rewarding_validator_address: rewarding_validator_address.to_string(), + vesting_contract_address: vesting_contract_address.to_string(), rewarding_denom, epochs_in_interval: args.epochs_in_interval, epoch_duration: Duration::from_secs(args.epoch_duration), diff --git a/common/commands/src/validator/cosmwasm/generators/multisig.rs b/common/commands/src/validator/cosmwasm/generators/multisig.rs index 38e645aeae..95650fa5d6 100644 --- a/common/commands/src/validator/cosmwasm/generators/multisig.rs +++ b/common/commands/src/validator/cosmwasm/generators/multisig.rs @@ -1,12 +1,14 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use clap::Parser; -use log::{debug, info}; +use std::str::FromStr; +use clap::Parser; use cosmwasm_std::Decimal; use cw_utils::{Duration, Threshold}; +use log::{debug, info}; use multisig_contract_common::msg::InstantiateMsg; +use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] pub struct Args { @@ -20,10 +22,10 @@ pub struct Args { pub max_voting_period: u64, #[clap(long)] - pub coconut_bandwidth_contract_address: Option, + pub coconut_bandwidth_contract_address: Option, #[clap(long)] - pub coconut_dkg_contract_address: Option, + pub coconut_dkg_contract_address: Option, } pub async fn generate(args: Args) { @@ -33,13 +35,17 @@ pub async fn generate(args: Args) { let coconut_bandwidth_contract_address = args.coconut_bandwidth_contract_address.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS) - .expect("Coconut bandwidth contract address has to be set") + let address = + std::env::var(network_defaults::var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS) + .expect("Coconut bandwidth contract address has to be set"); + AccountId::from_str(address.as_str()).expect("Failed converting bandwidth contract address to AccountId") }); let coconut_dkg_contract_address = args.coconut_dkg_contract_address.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::COCONUT_DKG_CONTRACT_ADDRESS) - .expect("Coconut DKG contract address has to be set") + let address = std::env::var(network_defaults::var_names::COCONUT_DKG_CONTRACT_ADDRESS) + .expect("Coconut DKG contract address has to be set"); + AccountId::from_str(address.as_str()) + .expect("Failed converting DKG contract address to AccountId") }); let instantiate_msg = InstantiateMsg { @@ -49,8 +55,8 @@ pub async fn generate(args: Args) { .expect("threshold can't be converted to Decimal"), }, max_voting_period: Duration::Time(args.max_voting_period), - coconut_bandwidth_contract_address, - coconut_dkg_contract_address, + coconut_bandwidth_contract_address: coconut_bandwidth_contract_address.to_string(), + coconut_dkg_contract_address: coconut_dkg_contract_address.to_string(), }; debug!("instantiate_msg: {:?}", instantiate_msg); diff --git a/common/commands/src/validator/cosmwasm/generators/vesting.rs b/common/commands/src/validator/cosmwasm/generators/vesting.rs index 0b0695ef4c..c73885587a 100644 --- a/common/commands/src/validator/cosmwasm/generators/vesting.rs +++ b/common/commands/src/validator/cosmwasm/generators/vesting.rs @@ -1,15 +1,18 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use std::str::FromStr; + use clap::Parser; use log::{debug, info}; +use validator_client::nyxd::AccountId; use vesting_contract_common::InitMsg; #[derive(Debug, Parser)] pub struct Args { #[clap(long)] - pub mixnet_contract_address: Option, + pub mixnet_contract_address: Option, #[clap(long)] pub mix_denom: Option, @@ -21,8 +24,10 @@ pub async fn generate(args: Args) { debug!("Received arguments: {:?}", args); let mixnet_contract_address = args.mixnet_contract_address.unwrap_or_else(|| { - std::env::var(network_defaults::var_names::MIXNET_CONTRACT_ADDRESS) - .expect("Mixnet contract address has to be set") + let address = std::env::var(network_defaults::var_names::MIXNET_CONTRACT_ADDRESS) + .expect("Mixnet contract address has to be set"); + AccountId::from_str(address.as_str()) + .expect("Failed converting mixnet address to AccountId") }); let mix_denom = args.mix_denom.unwrap_or_else(|| { @@ -30,7 +35,7 @@ pub async fn generate(args: Args) { }); let instantiate_msg = InitMsg { - mixnet_contract_address, + mixnet_contract_address: mixnet_contract_address.to_string(), mix_denom, };