Aether Features

contracts/counter/Cargo.toml

@@ -9,6 +9,10 @@ exclude = [".env"]
 [lib]
 crate-type = ["cdylib", "rlib"]
 
+[[example]]
+name = "async"
+required-features = ["interface"]
+
 [features]
 default = ["export"]
 export = []

contracts/counter/examples/async.rs

@@ -0,0 +1,32 @@
+// ANCHOR: full_counter_example
+use counter_contract::{
+    msg::InstantiateMsg, AsyncCounterQueryMsgFns, CounterContract, CounterExecuteMsgFns,
+};
+use cw_orch::{anyhow, prelude::*, tokio};
+use tokio::runtime::Runtime;
+
+const LOCAL_MNEMONIC: &str = "clip hire initial neck maid actor venue client foam budget lock catalog sweet steak waste crater broccoli pipe steak sister coyote moment obvious choose";
+
+#[tokio::main]
+pub async fn main() -> anyhow::Result<()> {
+    std::env::set_var("TEST_MNEMONIC", LOCAL_MNEMONIC);
+    // ANCHOR: chain_construction
+    dotenv::dotenv().ok(); // Used to load the `.env` file if any
+    pretty_env_logger::init(); // Used to log contract and chain interactions
+
+    let network = networks::UNI_6;
+    let chain = DaemonAsyncBuilder::default().chain(network).build().await?;
+    // ANCHOR_END: chain_construction
+
+    // ANCHOR: contract_interaction
+
+    let counter = CounterContract::new(chain);
+
+    let count = counter.get_count().await?;
+    assert_eq!(count.count, 1);
+    // ANCHOR_END: clean_example
+    // ANCHOR_END: contract_interaction
+
+    Ok(())
+}
+// ANCHOR_END: full_counter_example

contracts/counter/src/lib.rs

@@ -7,7 +7,10 @@ pub mod state;
 
 pub use crate::error::ContractError;
 // ANCHOR: fn_re_export
-pub use crate::msg::{ExecuteMsgFns as CounterExecuteMsgFns, QueryMsgFns as CounterQueryMsgFns};
+pub use crate::msg::{
+    AsyncQueryMsgFns as AsyncCounterQueryMsgFns, ExecuteMsgFns as CounterExecuteMsgFns,
+    QueryMsgFns as CounterQueryMsgFns,
+};
 // ANCHOR_END: fn_re_export
 
 // ANCHOR: custom_interface

cw-orch-daemon/src/core.rs

@@ -14,7 +14,7 @@ use cosmrs::{
 use cosmwasm_std::{Addr, Binary, Coin};
 use cw_orch_core::{
     contract::interface_traits::Uploadable,
-    environment::{ChainState, IndexResponse},
+    environment::{AsyncWasmQuerier, ChainState, IndexResponse, Querier},
     log::transaction_target,
 };
 use flate2::{write, Compression};
@@ -127,6 +127,23 @@ impl DaemonAsync {
         Ok(result)
     }
 
+    /// Query a contract.
+    pub async fn query<Q: Serialize + Debug, T: Serialize + DeserializeOwned>(
+        &self,
+        query_msg: &Q,
+        contract_address: &Addr,
+    ) -> Result<T, DaemonError> {
+        let mut client = cosmos_modules::cosmwasm::query_client::QueryClient::new(self.channel());
+        let resp = client
+            .smart_contract_state(cosmos_modules::cosmwasm::QuerySmartContractStateRequest {
+                address: contract_address.to_string(),
+                query_data: serde_json::to_vec(&query_msg)?,
+            })
+            .await?;
+
+        Ok(from_str(from_utf8(&resp.into_inner().data).unwrap())?)
+    }
+
     /// Instantiate a contract.
     pub async fn instantiate<I: Serialize + Debug>(
         &self,
@@ -192,23 +209,6 @@ impl DaemonAsync {
         Ok(result)
     }
 
-    /// Query a contract.
-    pub async fn query<Q: Serialize + Debug, T: Serialize + DeserializeOwned>(
-        &self,
-        query_msg: &Q,
-        contract_address: &Addr,
-    ) -> Result<T, DaemonError> {
-        let mut client = cosmos_modules::cosmwasm::query_client::QueryClient::new(self.channel());
-        let resp = client
-            .smart_contract_state(cosmos_modules::cosmwasm::QuerySmartContractStateRequest {
-                address: contract_address.to_string(),
-                query_data: serde_json::to_vec(&query_msg)?,
-            })
-            .await?;
-
-        Ok(from_str(from_utf8(&resp.into_inner().data).unwrap())?)
-    }
-
     /// Migration a contract.
     pub async fn migrate<M: Serialize + Debug>(
         &self,
@@ -315,6 +315,29 @@ impl DaemonAsync {
     }
 }
 
+impl Querier for DaemonAsync {
+    type Error = DaemonError;
+}
+
+impl AsyncWasmQuerier for DaemonAsync {
+    /// Query a contract.
+    async fn smart_query<Q: Serialize, T: DeserializeOwned>(
+        &self,
+        address: impl Into<String>,
+        query_msg: &Q,
+    ) -> Result<T, DaemonError> {
+        let mut client = cosmos_modules::cosmwasm::query_client::QueryClient::new(self.channel());
+        let resp = client
+            .smart_contract_state(cosmos_modules::cosmwasm::QuerySmartContractStateRequest {
+                address: address.into(),
+                query_data: serde_json::to_vec(&query_msg)?,
+            })
+            .await?;
+
+        Ok(from_str(from_utf8(&resp.into_inner().data).unwrap())?)
+    }
+}
+
 pub(crate) fn parse_cw_coins(
     coins: &[cosmwasm_std::Coin],
 ) -> Result<Vec<cosmrs::Coin>, DaemonError> {

cw-orch/src/prelude.rs

@@ -12,8 +12,8 @@
 
 // Contract traits
 pub use crate::contract::interface_traits::{
-    CallAs, ConditionalMigrate, ConditionalUpload, ContractInstance, CwOrchExecute,
-    CwOrchInstantiate, CwOrchMigrate, CwOrchQuery, CwOrchUpload, ExecutableContract,
+    AsyncCwOrchQuery, CallAs, ConditionalMigrate, ConditionalUpload, ContractInstance,
+    CwOrchExecute, CwOrchInstantiate, CwOrchMigrate, CwOrchQuery, CwOrchUpload, ExecutableContract,
     InstantiableContract, MigratableContract, QueryableContract, Uploadable,
 };
 

packages/cw-orch-contract-derive/src/lib.rs

@@ -123,7 +123,7 @@ The interface can be linked to its source code by implementing the `Uploadable`
 ```ignore
 use cw_orch::prelude::*;
 
-impl <Chain: CwEnv> Uploadable for Cw20<Chain> {
+impl <Chain> Uploadable for Cw20<Chain> {
     fn wrapper(&self) -> <Mock as cw_orch::TxHandler>::ContractSource {
         Box::new(
             ContractWrapper::new_with_empty(
@@ -204,7 +204,7 @@ pub fn interface(attrs: TokenStream, input: TokenStream) -> TokenStream {
     let name = cw_orch_struct.ident.clone();
     let default_num = if let Some(id_expr) = default_id {
         quote!(
-            impl <Chain: ::cw_orch::prelude::CwEnv, #all_generics> #name<Chain, #all_generics> {
+            impl <Chain, #all_generics> #name<Chain, #all_generics> {
                 pub fn new(chain: Chain) -> Self {
                     Self(
                         ::cw_orch::contract::Contract::new(#id_expr, chain)
@@ -214,7 +214,7 @@ pub fn interface(attrs: TokenStream, input: TokenStream) -> TokenStream {
         )
     } else {
         quote!(
-            impl <Chain: ::cw_orch::prelude::CwEnv, #all_generics> #name<Chain, #all_generics> {
+            impl <Chain, #all_generics> #name<Chain, #all_generics> {
                 pub fn new(contract_id: impl ToString, chain: Chain) -> Self {
                     Self(
                         ::cw_orch::contract::Contract::new(contract_id, chain)
@@ -228,7 +228,7 @@ pub fn interface(attrs: TokenStream, input: TokenStream) -> TokenStream {
         #[derive(
             ::std::clone::Clone,
         )]
-        pub struct #name<Chain: ::cw_orch::prelude::CwEnv, #all_generics>(::cw_orch::contract::Contract<Chain>, #(#all_phantom_markers,)*);
+        pub struct #name<Chain, #all_generics>(::cw_orch::contract::Contract<Chain>, #(#all_phantom_markers,)*);
 
         #[cfg(target_arch = "wasm32")]
         #[derive(
@@ -240,7 +240,7 @@ pub fn interface(attrs: TokenStream, input: TokenStream) -> TokenStream {
         #default_num
 
         #[cfg(not(target_arch = "wasm32"))]
-        impl<Chain: ::cw_orch::prelude::CwEnv, #all_generics> ::cw_orch::prelude::ContractInstance<Chain> for #name<Chain, #all_generics> {
+        impl<Chain: ::cw_orch::environment::ChainState, #all_generics> ::cw_orch::prelude::ContractInstance<Chain> for #name<Chain, #all_generics> {
             fn as_instance(&self) -> &::cw_orch::contract::Contract<Chain> {
                 &self.0
             }
@@ -250,22 +250,19 @@ pub fn interface(attrs: TokenStream, input: TokenStream) -> TokenStream {
         }
 
         #[cfg(not(target_arch = "wasm32"))]
-        impl<Chain: ::cw_orch::prelude::CwEnv, #all_generics> ::cw_orch::prelude::InstantiableContract for #name<Chain, #all_generics> #all_debug_serialize {
-            type InstantiateMsg = #init;
+        impl<Chain, #all_generics> ::cw_orch::prelude::QueryableContract for #name<Chain, #all_generics> #all_debug_serialize {
+            type QueryMsg = #query;
         }
-
         #[cfg(not(target_arch = "wasm32"))]
-        impl<Chain: ::cw_orch::prelude::CwEnv, #all_generics> ::cw_orch::prelude::ExecutableContract for #name<Chain, #all_generics> #all_debug_serialize {
-            type ExecuteMsg = #exec;
+        impl<Chain, #all_generics> ::cw_orch::prelude::InstantiableContract for #name<Chain, #all_generics> #all_debug_serialize {
+            type InstantiateMsg = #init;
         }
-
         #[cfg(not(target_arch = "wasm32"))]
-        impl<Chain: ::cw_orch::prelude::CwEnv, #all_generics> ::cw_orch::prelude::QueryableContract for #name<Chain, #all_generics> #all_debug_serialize {
-            type QueryMsg = #query;
+        impl<Chain, #all_generics> ::cw_orch::prelude::ExecutableContract for #name<Chain, #all_generics> #all_debug_serialize {
+            type ExecuteMsg = #exec;
         }
-
         #[cfg(not(target_arch = "wasm32"))]
-        impl<Chain: ::cw_orch::prelude::CwEnv, #all_generics> ::cw_orch::prelude::MigratableContract for #name<Chain, #all_generics> #all_debug_serialize {
+        impl<Chain, #all_generics> ::cw_orch::prelude::MigratableContract for #name<Chain, #all_generics> #all_debug_serialize {
             type MigrateMsg = #migrate;
         }
     );