diff --git a/demos/rust-cosmos-broadcaster-client/src/commands/commands.rs b/demos/rust-cosmos-broadcaster-client/src/commands/commands.rs index a2e77e8193..7f97745178 100644 --- a/demos/rust-cosmos-broadcaster-client/src/commands/commands.rs +++ b/demos/rust-cosmos-broadcaster-client/src/commands/commands.rs @@ -27,10 +27,16 @@ pub async fn offline_sign(mnemonic: bip39::Mnemonic, to: AccountId) -> String { // possibly remote client that doesn't do ANY signing // (only broadcasts + queries for sequence numbers) let broadcaster = HttpClient::new(validator).unwrap(); - + +/////////////// to go on server side: need client from main passed as arg to send w sdk!! + // get sequence information and chain ID from the service + // add sdk, send req for sequence // get signer information let sequence_response = broadcaster.get_sequence(&signer_address).await.unwrap(); let chain_id = broadcaster.get_chain_id().await.unwrap(); +/////////////// + + // use the response to create SignerData instance let signer_data = SignerData::new_from_sequence_response(sequence_response, chain_id); // create (and sign) the send message @@ -66,17 +72,10 @@ pub async fn offline_sign(mnemonic: bip39::Mnemonic, to: AccountId) -> String { } -pub async fn send_tx(base58_tx: String, sp_address: Recipient) -> Option> /*String*/ { - // TODO move to its own function and pass created client as arg - let config_dir = std::path::PathBuf::from("/tmp/mixnet-client"); - let storage_paths = mixnet::StoragePaths::new_from_dir(&config_dir).unwrap(); - let client = mixnet::MixnetClientBuilder::new_with_default_storage(storage_paths) - .await - .unwrap() - .build() - .await - .unwrap(); - let mut client = client.connect_to_mixnet().await.unwrap(); +pub async fn send_tx(base58_tx: String, sp_address: Recipient) -> Option> { + + // TODO pass created client as arg frm main instead + let mut client = mixnet::MixnetClient::connect_new().await.unwrap(); let our_address = client.nym_address(); println!("Our client nym address is: {our_address}"); diff --git a/demos/rust-cosmos-broadcaster-client/src/main.rs b/demos/rust-cosmos-broadcaster-client/src/main.rs index 83c7b1f87c..f2a6f5d40f 100644 --- a/demos/rust-cosmos-broadcaster-client/src/main.rs +++ b/demos/rust-cosmos-broadcaster-client/src/main.rs @@ -1,8 +1,9 @@ use clap::{ Parser, Subcommand, Args}; -use nym_sdk::mixnet::Recipient; +use nym_sdk::mixnet::{Recipient, MixnetClient}; use nym_validator_client::nyxd::AccountId; mod commands; use nym_bin_common::logging::setup_logging; +// use nym_sdk::mixnet; #[derive(Debug, Parser)] #[clap(name = "nym cosmos tx signer ")] @@ -35,6 +36,8 @@ struct OfflineSignTx { mnemonic: bip39::Mnemonic, /// recipient nyx chain address to: AccountId + // / nym client connection + // nym_client: MixnetClient } #[derive(Debug, Args)] @@ -49,7 +52,7 @@ struct SendTx { async fn main() { setup_logging(); let cli = Cli::parse(); - + // TODO look @ arg env setup from NR main.rs // TODO take from args let sp_address = Recipient::try_from_base58_string("6e5KeP3Ks6iA3832K2MvCvQJb9zF3HMHwY8XjLhwAGGt.ZCH8YTky6GkApmra3EGbfgQk2VwdPaRH8R1wUfAnv3Q@BNjYZPxzcJwczXHHgBxCAyVJKxN6LPteDRrKapxWmexv").unwrap();