move around implementations

cw-orch-daemon/src/core.rs

@@ -1,5 +1,5 @@
 use crate::{
-    queriers::CosmWasm,
+    queriers::{CosmWasm, CosmWasmBase},
     senders::{builder::SenderBuilder, query::QuerySender},
     DaemonAsyncBuilder, DaemonState,
 };
@@ -149,10 +149,10 @@ impl<Sender: QuerySender> DaemonAsyncBase<Sender> {
         query_msg: &Q,
         contract_address: &Addr,
     ) -> Result<R, DaemonError> {
-        let querier = CosmWasm::new(self.channel());
+        let querier = CosmWasmBase::<Sender>::new_async(self.channel());
 
         let resp: Vec<u8> = querier
-            .contract_state(contract_address, serde_json::to_vec(&query_msg)?)
+            ._contract_state(contract_address, serde_json::to_vec(&query_msg)?)
             .await?;
 
         Ok(from_str(from_utf8(&resp).unwrap())?)

cw-orch-daemon/src/lib.rs

@@ -24,18 +24,7 @@ mod state;
 mod sync;
 mod tx_resp;
 
-#[cfg(feature = "rpc")]
-pub mod rpc_channel;
-#[cfg(feature = "rpc")]
-pub use self::rpc_channel::*;
-
-#[cfg(feature = "grpc")]
-pub mod grpc_channel;
-#[cfg(feature = "grpc")]
-pub use self::grpc_channel::*;
-
-
-pub use self::{builder::*, channel::*, core::*, error::*, state::*, sync::*, tx_resp::*};
+pub use self::{builder::*, core::*, error::*, state::*, sync::*, tx_resp::*};
 pub use cw_orch_networks::networks;
 pub use senders::{query::QuerySender, tx::TxSender, CosmosOptions, Wallet};
 pub use tx_builder::TxBuilder;

cw-orch-daemon/src/live_mock.rs

@@ -13,7 +13,6 @@ use cosmwasm_std::Binary;
 use cosmwasm_std::Delegation;
 use cosmwasm_std::Empty;
 use cosmwasm_std::StakingQuery;
-use ibc_chain_registry::chain::ChainData;
 use tokio::runtime::Runtime;
 
 use cosmwasm_std::{
@@ -190,7 +189,7 @@ impl WasmMockQuerier {
     /// Creates a querier from chain information
     pub fn new(chain: ChainInfoOwned) -> Self {
         let channel = RUNTIME
-            .block_on(GrpcChannel::connect(
+            .block_on(CosmosClient::connect(
                 &chain.grpc_urls,
                 chain.chain_id.as_str(),
             ))

cw-orch-daemon/src/proto/injective.rs

@@ -5,7 +5,6 @@ use cosmrs::tx::Raw;
 use cosmrs::tx::SignDoc;
 use cosmrs::{
     proto::traits::{Message, Name},
-    tx::Raw,
 };
 
 #[cfg(feature = "eth")]

cw-orch-daemon/src/queriers.rs

@@ -32,6 +32,8 @@ pub mod grpc;
 #[cfg(feature = "grpc")]
 pub use grpc::*;
 
+pub mod clients;
+
 /// Constructor for a querier over a given channel
 pub trait DaemonQuerier {
     /// Construct an new querier over a given channel
@@ -64,21 +66,21 @@ macro_rules! cosmos_query {
 }
 
 mod authz;
-mod bank;
-mod cosmwasm;
 mod env;
-mod feegrant;
-mod gov;
-mod ibc;
-mod node;
-mod staking;
+// mod bank;
+// mod cosmwasm;
+// mod feegrant;
+// mod gov;
+// mod ibc;
+// mod node;
+// mod staking;
 
 pub use authz::Authz;
-pub use bank::{cosmrs_to_cosmwasm_coins, Bank};
-pub use cosmwasm::{CosmWasm, CosmWasmBase};
-pub use feegrant::FeeGrant;
-pub use ibc::Ibc;
-pub use node::Node;
+// pub use bank::{cosmrs_to_cosmwasm_coins, Bank};
+// pub use cosmwasm::{CosmWasm, CosmWasmBase};
+// pub use feegrant::FeeGrant;
+// pub use ibc::Ibc;
+// pub use node::Node;
 
 // this two containt structs that are helpers for the queries
 pub use gov::*;

cw-orch-daemon/src/queriers/clients/auth.rs

@@ -0,0 +1,32 @@
+// Only a simple implementation to not overload the tx builder
+use tonic::transport::Channel;
+
+use crate::{cosmos_query, queriers::DaemonQuerier, DaemonError};
+
+/// Queries for Cosmos Bank Module
+pub struct Auth {
+    channel: Channel,
+}
+
+impl DaemonQuerier for Auth {
+    fn new(channel: Channel) -> Self {
+        Self { channel }
+    }
+}
+
+impl Auth {
+    /// Query spendable balance for address
+    pub async fn account(&self, address: impl Into<String>) -> Result<Vec<u8>, DaemonError> {
+
+
+        let resp = cosmos_query!(
+            self,
+            auth,
+            account,
+            QueryAccountRequest {
+                address: address.into()
+            }
+        );
+        Ok(resp.account.unwrap().value)
+    }
+}

cw-orch-daemon/src/queriers/grpc/mod.rs → cw-orch-daemon/src/queriers/clients/mod.rs

@@ -56,7 +56,7 @@ mod tx;
 
 pub use auth::Auth;
 pub use bank::Bank;
-pub use cosmwasm::CosmWasm;
+pub use cosmwasm::{CosmWasm, CosmWasmBase};
 pub use feegrant::Feegrant;
 pub use ibc::Ibc;
 pub use node::Node;

cw-orch-daemon/src/queriers/grpc.rs

@@ -0,0 +1,21 @@
+/// macro for constructing and performing a query on a CosmosSDK module.
+#[macro_export]
+macro_rules! cosmos_query {
+    ($self:ident, $module:ident, $func_name:ident, $request_type:ident { $($field:ident : $value:expr),* $(,)?  }) => {
+        {
+        use $crate::cosmos_modules::$module::{
+            query_client::QueryClient, $request_type,
+        };
+        let mut client = QueryClient::new($self.channel.clone());
+        #[allow(clippy::redundant_field_names)]
+        let request = $request_type { $($field : $value),* };
+        let response = client.$func_name(request.clone()).await?.into_inner();
+        ::log::trace!(
+            "cosmos_query: {:?} resulted in: {:?}",
+            request,
+            response
+        );
+        response
+    }
+};
+}