Added bank send function (#526)

* Added bank send function

* formatting

* Update packages/cw-orch-core/src/environment/tx_handler.rs

Co-authored-by: Mykhailo Donchenko <91957742+Buckram123@users.noreply.github.com>

* Changelog

* Insta

* Updated versions and published

* Changelog

---------

Co-authored-by: Mykhailo Donchenko <91957742+Buckram123@users.noreply.github.com>

Author: Kayanski

CHANGELOG.md

@@ -1,13 +1,18 @@
 # cw-orchestrator Changelog
 
-## Unpublished
+## Cw-orch-daemon 0.29.0 - cw-orch-core 2.1.4 [16. December 2024]
 
 - [networks] Replaced union testnet-8 by union-testnet-9
 
 ### Breaking
 
 - [interchain-core] Modify the structure and the names of the IBC analysis and following structure. 
 - [osmosis-test-tube] Update `osmosis-test-tube` to "v27.0.0"
+- [daemon]: Move the bank_send method from the Wallet to the TxSender trait. 
+
+### Added
+
+- [core] bank_send method on TxHandler to facilitate sending funds in script
 
 ## 0.26.0 [8. October 2024]
 

Cargo.toml

@@ -44,8 +44,8 @@ serde  = { version = "1.0.208", default-features = false, features = ["derive"]
 tokio  = { version = "1.39", features = ["full"] }
 
 cw-orch          = { path = "./cw-orch", version = "0.27.0" }
-cw-orch-core     = { path = "packages/cw-orch-core", version = "2.1.3" }
-cw-orch-daemon   = { path = "./cw-orch-daemon", version = "0.28.0" }
+cw-orch-core     = { path = "packages/cw-orch-core", version = "2.1.4" }
+cw-orch-daemon   = { path = "./cw-orch-daemon", version = "0.29.0" }
 cw-orch-mock     = { path = "packages/cw-orch-mock", version = "0.24.2" }
 cw-orch-networks = { path = "packages/cw-orch-networks", version = "0.24.3" }
 cw-orch-traits   = { path = "packages/cw-orch-traits", version = "0.25.0" }

cw-orch-daemon/Cargo.toml

@@ -8,7 +8,7 @@ license     = { workspace = true }
 name        = "cw-orch-daemon"
 readme      = "../README.md"
 repository  = { workspace = true }
-version     = "0.28.1"
+version     = "0.29.0"
 
 exclude = [".env"]
 

cw-orch-daemon/examples/daemon-capabilities.rs

@@ -3,7 +3,8 @@ use std::str::FromStr;
 use cosmrs::{tx::Msg, AccountId, Coin, Denom};
 use cosmwasm_std::{coins, Addr};
 // ANCHOR: full_counter_example
-use cw_orch_daemon::senders::tx::TxSender;
+use cw_orch::prelude::Stargate;
+use cw_orch::prelude::TxHandler;
 use cw_orch_daemon::DaemonBuilder;
 use cw_orch_networks::networks;
 
@@ -19,13 +20,11 @@ pub fn main() -> anyhow::Result<()> {
 
     // We commit the tx (also resimulates the tx)
     // ANCHOR: send_tx
-    let wallet = daemon.sender();
 
-    let rt = daemon.rt_handle.clone();
-    rt.block_on(wallet.bank_send(
+    daemon.bank_send(
         &Addr::unchecked("<address-of-my-sister>"),
-        coins(345, "ujunox"),
-    ))?;
+        &coins(345, "ujunox"),
+    )?;
     // ANCHOR_END: send_tx
 
     // ANCHOR: cosmrs_tx
@@ -45,22 +44,27 @@ pub fn main() -> anyhow::Result<()> {
             denom: Denom::from_str("ujuno").unwrap(),
         },
     };
-    rt.block_on(wallet.commit_tx(vec![tx_msg.clone()], None))?;
+    daemon
+        .rt_handle
+        .block_on(daemon.sender().commit_tx(vec![tx_msg.clone()], None))?;
     // ANCHOR_END: cosmrs_tx
 
     // ANCHOR: any_tx
-    rt.block_on(wallet.commit_tx_any(
-        vec![cosmrs::Any {
+    daemon.commit_any(
+        vec![prost_types::Any {
             type_url: "/cosmos.staking.v1beta1.MsgBeginRedelegate".to_string(),
             value: tx_msg.to_any().unwrap().value,
         }],
         None,
-    ))?;
+    )?;
     // ANCHOR_END: any_tx
 
     // ANCHOR: simulate_tx
-    let (gas_needed, fee_needed) =
-        rt.block_on(wallet.simulate(vec![tx_msg.to_any().unwrap()], None))?;
+    let (gas_needed, fee_needed) = daemon.rt_handle.block_on(
+        daemon
+            .sender()
+            .simulate(vec![tx_msg.to_any().unwrap()], None),
+    )?;
 
     log::info!(
         "Submitting this transaction will necessitate: 

cw-orch-daemon/examples/hd_index.rs

@@ -16,11 +16,7 @@ pub fn main() -> anyhow::Result<()> {
         .authz_granter(&Addr::unchecked(LOCAL_JUNO_GRANTER));
     let chain = Daemon::builder(network).build_sender(sender)?;
 
-    chain.rt_handle.block_on(
-        chain
-            .sender()
-            .bank_send(&Addr::unchecked(LOCAL_JUNO_GRANTER), coins(10000, "ujuno")),
-    )?;
+    chain.bank_send(&Addr::unchecked(LOCAL_JUNO_GRANTER), &coins(10000, "ujuno"))?;
 
     Ok(())
 }

cw-orch-daemon/examples/manual_sender.rs

@@ -5,10 +5,11 @@ use cw_orch_daemon::queriers::Node;
 use cw_orch_daemon::senders::builder::SenderBuilder;
 use cw_orch_daemon::senders::query::QuerySender;
 use cw_orch_daemon::tx_broadcaster::assert_broadcast_code_cosm_response;
-use cw_orch_daemon::{DaemonBase, GrpcChannel, TxBuilder};
+use cw_orch_daemon::{parse_cw_coins, DaemonBase, GrpcChannel, TxBuilder};
 
 use cw_orch_daemon::{CosmTxResponse, DaemonError};
 
+use cosmrs::bank::MsgSend;
 use cosmrs::proto::cosmos;
 use cosmrs::proto::cosmos::auth::v1beta1::BaseAccount;
 use cosmrs::proto::cosmos::vesting::v1beta1::PeriodicVestingAccount;
@@ -20,6 +21,7 @@ use cw_orch::prelude::*;
 use cw_orch_core::environment::ChainInfoOwned;
 use prost::Message;
 use std::io::{self, Write};
+use std::str::FromStr;
 use std::sync::Arc;
 use tonic::transport::Channel;
 
@@ -122,6 +124,22 @@ impl TxSender for ManualSender {
     fn account_id(&self) -> AccountId {
         self.sender.clone().to_string().parse().unwrap()
     }
+
+    async fn bank_send(
+        &self,
+        recipient: &Addr,
+        coins: &[cosmwasm_std::Coin],
+    ) -> Result<CosmTxResponse, DaemonError> {
+        let acc_id = self.msg_sender()?;
+
+        let msg_send = MsgSend {
+            from_address: acc_id,
+            to_address: AccountId::from_str(recipient.as_str())?,
+            amount: parse_cw_coins(coins)?,
+        };
+
+        self.commit_tx(vec![msg_send], Some("sending tokens")).await
+    }
 }
 
 impl ManualSender {

cw-orch-daemon/src/core.rs

@@ -444,9 +444,7 @@ impl AsyncWasmQuerier for DaemonAsync {
     }
 }
 
-pub(crate) fn parse_cw_coins(
-    coins: &[cosmwasm_std::Coin],
-) -> Result<Vec<cosmrs::Coin>, DaemonError> {
+pub fn parse_cw_coins(coins: &[cosmwasm_std::Coin]) -> Result<Vec<cosmrs::Coin>, DaemonError> {
     coins
         .iter()
         .map(|cosmwasm_std::Coin { amount, denom }| {

cw-orch-daemon/src/senders/cosmos.rs

@@ -5,7 +5,6 @@ use super::{
     tx::TxSender,
 };
 use crate::{
-    core::parse_cw_coins,
     cosmos_modules::{self, auth::BaseAccount},
     env::{DaemonEnvVars, LOCAL_MNEMONIC_ENV_NAME, MAIN_MNEMONIC_ENV_NAME, TEST_MNEMONIC_ENV_NAME},
     error::DaemonError,
@@ -19,7 +18,6 @@ use crate::{
 use bitcoin::secp256k1::{All, Secp256k1, Signing};
 use cosmos_modules::vesting::PeriodicVestingAccount;
 use cosmrs::{
-    bank::MsgSend,
     crypto::secp256k1::SigningKey,
     proto::traits::Message,
     tendermint::chain::Id,
@@ -32,7 +30,7 @@ use cw_orch_core::{
     environment::{AccessConfig, ChainInfoOwned, ChainKind},
     CoreEnvVars, CwEnvError,
 };
-use std::{str::FromStr, sync::Arc};
+use std::sync::Arc;
 use tonic::transport::Channel;
 
 #[cfg(feature = "eth")]
@@ -163,22 +161,6 @@ impl Wallet {
         Signer::account_id(self).to_string()
     }
 
-    pub async fn bank_send(
-        &self,
-        recipient: &Addr,
-        coins: Vec<cosmwasm_std::Coin>,
-    ) -> Result<CosmTxResponse, DaemonError> {
-        let acc_id = self.msg_sender()?;
-
-        let msg_send = MsgSend {
-            from_address: acc_id,
-            to_address: AccountId::from_str(recipient.as_str())?,
-            amount: parse_cw_coins(&coins)?,
-        };
-
-        self.commit_tx(vec![msg_send], Some("sending tokens")).await
-    }
-
     /// Computes the gas needed for submitting a transaction
     pub async fn calculate_gas(
         &self,

cw-orch-daemon/src/senders/cosmos_batch.rs

@@ -1,22 +1,21 @@
-use crate::{DaemonBase, INSTANTIATE_2_TYPE_URL};
-
+use super::builder::SenderBuilder;
+use super::cosmos::Wallet;
+use super::query::QuerySender;
+use super::tx::TxSender;
+use crate::parse_cw_coins;
 use crate::{error::DaemonError, tx_resp::CosmTxResponse};
-
+use crate::{DaemonBase, INSTANTIATE_2_TYPE_URL};
+use cosmrs::bank::MsgSend;
 use cosmrs::proto::cosmwasm::wasm::v1::{MsgInstantiateContract, MsgStoreCode};
 use cosmrs::{AccountId, Any};
 use cosmwasm_std::Addr;
 use cw_orch_core::environment::ChainInfoOwned;
 use cw_orch_core::log::transaction_target;
 use options::CosmosBatchOptions;
 use prost::Name;
-
+use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
-use super::builder::SenderBuilder;
-use super::cosmos::Wallet;
-use super::query::QuerySender;
-use super::tx::TxSender;
-
 pub type BatchDaemon = DaemonBase<CosmosBatchSender>;
 
 pub mod options {
@@ -132,4 +131,20 @@ impl TxSender for CosmosBatchSender {
     fn account_id(&self) -> AccountId {
         self.sender.account_id()
     }
+
+    async fn bank_send(
+        &self,
+        recipient: &Addr,
+        coins: &[cosmwasm_std::Coin],
+    ) -> Result<CosmTxResponse, DaemonError> {
+        let acc_id = self.msg_sender()?;
+
+        let msg_send = MsgSend {
+            from_address: acc_id,
+            to_address: AccountId::from_str(recipient.as_str())?,
+            amount: parse_cw_coins(coins)?,
+        };
+
+        self.commit_tx(vec![msg_send], Some("sending tokens")).await
+    }
 }

cw-orch-daemon/src/senders/sign.rs

@@ -1,4 +1,7 @@
+use std::str::FromStr;
+
 use crate::{
+    parse_cw_coins,
     queriers::Node,
     tx_broadcaster::{
         account_sequence_strategy, assert_broadcast_code_cosm_response, insufficient_fee_strategy,
@@ -7,6 +10,7 @@ use crate::{
     CosmTxResponse, DaemonError, QuerySender, TxBuilder, TxSender,
 };
 use cosmrs::{
+    bank::MsgSend,
     proto::cosmos::authz::v1beta1::MsgExec,
     tendermint::chain::Id,
     tx::{Body, Fee, Raw, SignDoc, SignerInfo},
@@ -132,4 +136,20 @@ impl<T: Signer + Sync> TxSender for T {
             Ok(self.account_id())
         }
     }
+
+    async fn bank_send(
+        &self,
+        recipient: &Addr,
+        coins: &[cosmwasm_std::Coin],
+    ) -> Result<CosmTxResponse, DaemonError> {
+        let acc_id = self.msg_sender()?;
+
+        let msg_send = MsgSend {
+            from_address: acc_id,
+            to_address: AccountId::from_str(recipient.as_str())?,
+            amount: parse_cw_coins(coins)?,
+        };
+
+        self.commit_tx(vec![msg_send], Some("sending tokens")).await
+    }
 }