ICA Client testing

framework/Cargo.toml

@@ -60,6 +60,14 @@ polytone = { package = "abstract-polytone", version = "2.0.0" }
 polytone-note = { package = "abstract-polytone-note", version = "4.0.1" }
 cw-orch-polytone = { package = "abstract-cw-orch-polytone", version = "5.0.0" }
 
+## evm
+evm-note = { version = "0.3.0", features = ["library"] }
+polytone-evm = { version = "0.3.0" }
+# polytone-evm = { git = "https://github.com/abstractsdk/evm-ibc", branch = "development/create-union-bundle" }
+# evm-note = { git = "https://github.com/abstractsdk/evm-ibc", branch = "development/create-union-bundle", features = [
+#   "library",
+# ] }
+
 
 ## crates in order of publishing ## see docs/Publishing.md
 
@@ -69,6 +77,8 @@ abstract-standalone = { path = "packages/abstract-standalone" }
 
 # Keep these as path, creates cirular dependency otherwise
 # Only need to re-publish all contracts if a re-publish of abstract-interface is required
+
+abstract-client = { version = "0.24.1-beta.1", path = "packages/abstract-client" }
 abstract-interface = { version = "0.24.1-beta.1", path = "packages/abstract-interface" }
 module-factory = { package = "abstract-module-factory", path = "contracts/native/module-factory" }
 ans-host = { package = "abstract-ans-host", path = "contracts/native/ans-host" }
@@ -80,7 +90,6 @@ ibc-host = { package = "abstract-ibc-host", path = "contracts/native/ibc-host" }
 
 abstract-account = { path = "contracts/account", default-features = false }
 
-abstract-ica = { version = "0.24.1-beta.2", path = "packages/abstract-ica" }
 abstract-sdk = { version = "0.24.1-beta.2", path = "packages/abstract-sdk" }
 abstract-testing = { version = "0.24.1-beta.2", path = "packages/abstract-testing" }
 abstract-std = { version = "0.24.1-beta.2", path = "packages/abstract-std" }
@@ -109,6 +118,7 @@ opt-level = 3
 
 # Backup release profile, will result in warnings during optimization
 [profile.release]
+
 rpath = false
 lto = true
 overflow-checks = true

framework/contracts/account/Cargo.toml

@@ -45,8 +45,6 @@ abstract-std = { workspace = true }
 semver = { workspace = true }
 abstract-macros = { workspace = true }
 
-abstract-ica = { workspace = true }
-
 abstract-xion = { version = "0.24.1-beta.2", path = "../../packages/abstract-xion", default-features = false, optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

framework/contracts/account/src/execution.rs

@@ -160,7 +160,7 @@ pub fn ica_action(mut deps: DepsMut, msg_info: MessageInfo, action_query: Binary
             ))
         })?;
 
-    let res: abstract_ica::msg::IcaActionResult = deps.querier.query(
+    let res: abstract_std::ica_client::IcaActionResult = deps.querier.query(
         &WasmQuery::Smart {
             contract_addr: ica_client_address.into(),
             msg: action_query,
@@ -395,7 +395,7 @@ mod test {
     }
 
     mod ica_action {
-        use abstract_ica::msg::IcaActionResult;
+        use abstract_std::ica_client::IcaActionResult;
         use abstract_std::ICA_CLIENT;
         use cosmwasm_std::{Binary, Empty};
 

framework/contracts/native/ica-client/Cargo.toml

@@ -29,11 +29,10 @@ thiserror = { workspace = true }
 abstract-std = { workspace = true }
 abstract-sdk = { workspace = true }
 semver = { workspace = true }
-abstract-ica = { workspace = true }
 abstract-macros = { workspace = true }
 
-evm-note = { version = "0.1.0", features = ["library"] }
-polytone-evm = "0.1.0"
+evm-note = { workspace = true }
+polytone-evm = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../../workspace-hack" }

framework/contracts/native/ica-client/src/chain_types/evm.rs

@@ -1,8 +1,8 @@
-use abstract_ica::EVM_NOTE_ID;
 use abstract_sdk::{
     feature_objects::{AnsHost, RegistryContract},
     Resolve,
 };
+use abstract_std::ica_client::EVM_NOTE_ID;
 use abstract_std::objects::{module::ModuleInfo, ChannelEntry, ContractEntry, TruncatedChainId};
 use cosmwasm_std::{
     wasm_execute, Addr, Binary, Coin, CosmosMsg, Deps, Env, HexBinary, QuerierWrapper, WasmMsg,
@@ -94,16 +94,18 @@ pub fn send_funds(
 }
 
 fn evm_note_addr(vc: &RegistryContract, querier: &QuerierWrapper) -> IcaClientResult<Addr> {
-    let evm_note_entry =
-        ModuleInfo::from_id(EVM_NOTE_ID, abstract_ica::POLYTONE_EVM_VERSION.parse()?)?;
+    let evm_note_entry = ModuleInfo::from_id(
+        EVM_NOTE_ID,
+        abstract_std::ica_client::POLYTONE_EVM_VERSION.parse()?,
+    )?;
 
     vc.query_module(evm_note_entry, querier)?
         .reference
         .unwrap_native()
         .map_err(Into::into)
 }
 
-pub(crate) mod types {
+pub mod types {
     use super::*;
 
     pub const UCS01_PROTOCOL: &str = "ucs01";

framework/contracts/native/ica-client/src/contract.rs

@@ -97,10 +97,7 @@ mod tests {
         let mut deps = mock_dependencies();
         let env = mock_env_validated(deps.api);
         let abstr = AbstractMockAddrs::new(deps.api);
-        let msg = InstantiateMsg {
-            ans_host_address: abstr.ans_host.to_string(),
-            registry_address: abstr.registry.to_string(),
-        };
+        let msg = InstantiateMsg {};
         let info = message_info(&abstr.owner, &[]);
         let res = instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
         assert!(res.messages.is_empty());

framework/contracts/native/ica-client/src/lib.rs

@@ -2,8 +2,8 @@
 
 pub mod contract;
 pub mod error;
-pub use abstract_ica::msg;
-mod chain_types;
+pub use abstract_std::ica_client as msg;
+pub mod chain_types;
 mod queries;
 
 #[cfg(test)]
@@ -19,10 +19,7 @@ mod test_common {
 
     pub fn mock_init(deps: &mut OwnedDeps<MockStorage, MockApi, MockQuerier>) -> IcaClientResult {
         let abstr = AbstractMockAddrs::new(deps.api);
-        let msg = InstantiateMsg {
-            ans_host_address: abstr.ans_host.to_string(),
-            registry_address: abstr.registry.to_string(),
-        };
+        let msg = InstantiateMsg {};
         let info = message_info(&abstr.owner, &[]);
         let env = mock_env_validated(deps.api);
 

framework/contracts/native/ica-client/src/queries.rs

@@ -1,5 +1,5 @@
-use abstract_ica::{msg::ConfigResponse, ChainType, IcaAction, IcaActionResponse};
 use abstract_sdk::feature_objects::{AnsHost, RegistryContract};
+use abstract_std::ica_client::{ChainType, ConfigResponse, IcaAction, IcaActionResponse};
 use abstract_std::objects::TruncatedChainId;
 use cosmwasm_std::{ensure_eq, CosmosMsg, Deps, Env};
 
@@ -10,8 +10,8 @@ pub const PACKET_LIFETIME: u64 = 60 * 60;
 
 pub fn config(deps: Deps, env: &Env) -> IcaClientResult<ConfigResponse> {
     Ok(ConfigResponse {
-        ans_host: AnsHost::new(deps.api, env)?.address,
-        registry_address: RegistryContract::new(deps.api, env)?.address,
+        ans_host_address: AnsHost::new(deps.api, env)?.address.to_string(),
+        registry_address: RegistryContract::new(deps.api, env)?.address.to_string(),
     })
 }
 
@@ -23,15 +23,15 @@ pub(crate) fn ica_action(
     actions: Vec<IcaAction>,
 ) -> IcaClientResult<IcaActionResponse> {
     // match chain-id with cosmos or EVM
-    use abstract_ica::CastChainType;
+    use abstract_std::ica_client::CastChainType;
     let chain_type = chain.chain_type().ok_or(IcaClientError::NoChainType {
         chain: chain.to_string(),
     })?;
 
     let process_action = |action: IcaAction| -> IcaClientResult<Vec<CosmosMsg>> {
         match action {
             IcaAction::Execute(ica_exec) => match ica_exec {
-                abstract_ica::IcaExecute::Evm { msgs, callback } => {
+                abstract_std::ica_client::IcaExecute::Evm { msgs, callback } => {
                     ensure_eq!(
                         chain_type,
                         ChainType::Evm,
@@ -145,7 +145,9 @@ mod tests {
                             infos[0],
                             ModuleInfo::from_id(
                                 EVM_NOTE_ID,
-                                abstract_ica::POLYTONE_EVM_VERSION.parse().unwrap()
+                                abstract_std::ica_client::POLYTONE_EVM_VERSION
+                                    .parse()
+                                    .unwrap()
                             )
                             .unwrap()
                         );
@@ -155,7 +157,9 @@ mod tests {
                                 module: Module {
                                     info: ModuleInfo::from_id(
                                         EVM_NOTE_ID,
-                                        abstract_ica::POLYTONE_EVM_VERSION.parse().unwrap(),
+                                        abstract_std::ica_client::POLYTONE_EVM_VERSION
+                                            .parse()
+                                            .unwrap(),
                                     )
                                     .unwrap(),
                                     reference: ModuleReference::Native(env_note_addr(api)),
@@ -175,7 +179,7 @@ mod tests {
         use super::*;
         use std::str::FromStr;
 
-        use abstract_ica::msg::QueryMsg;
+        use abstract_std::ica_client::QueryMsg;
         use abstract_std::objects::TruncatedChainId;
 
         use abstract_testing::mock_env_validated;
@@ -199,8 +203,8 @@ mod tests {
             assert_eq!(
                 res,
                 ConfigResponse {
-                    ans_host: abstr.ans_host,
-                    registry_address: abstr.registry
+                    ans_host_address: abstr.ans_host.to_string(),
+                    registry_address: abstr.registry.to_string()
                 }
             );
             Ok(())
@@ -220,15 +224,17 @@ mod tests {
             let msg = QueryMsg::IcaAction {
                 account_address: abstr.account.addr().to_string(),
                 chain: chain_name,
-                actions: vec![IcaAction::Execute(abstract_ica::IcaExecute::Evm {
-                    msgs: vec![EvmMsg::Call {
-                        to: "to".to_string(),
-                        data: vec![0x01].into(),
-                        value: None,
-                        allow_failure: None,
-                    }],
-                    callback: None,
-                })],
+                actions: vec![IcaAction::Execute(
+                    abstract_std::ica_client::IcaExecute::Evm {
+                        msgs: vec![EvmMsg::Call {
+                            to: "to".to_string(),
+                            data: vec![0x01].into(),
+                            allow_failure: None,
+                            value: None,
+                        }],
+                        callback: None,
+                    },
+                )],
             };
 
             let res = query(deps.as_ref(), env, msg)?;
@@ -244,8 +250,8 @@ mod tests {
                             msgs: vec![EvmMsg::Call {
                                 to: "to".to_string(),
                                 data: vec![0x01].into(),
-                                value: None,
                                 allow_failure: None,
+                                value: None,
                             }],
                             timeout_seconds: PACKET_LIFETIME.into(),
                         },
@@ -361,15 +367,17 @@ mod tests {
             let msg = QueryMsg::IcaAction {
                 account_address: abstr.account.addr().to_string(),
                 chain: chain_name.clone(),
-                actions: vec![IcaAction::Execute(abstract_ica::IcaExecute::Evm {
-                    msgs: vec![EvmMsg::Call {
-                        to: "to".to_string(),
-                        data: vec![0x01].into(),
-                        value: None,
-                        allow_failure: None,
-                    }],
-                    callback: None,
-                })],
+                actions: vec![IcaAction::Execute(
+                    abstract_std::ica_client::IcaExecute::Evm {
+                        msgs: vec![EvmMsg::Call {
+                            to: "to".to_string(),
+                            data: vec![0x01].into(),
+                            allow_failure: None,
+                            value: None,
+                        }],
+                        callback: None,
+                    },
+                )],
             };
 
             let err = query(deps.as_ref(), mock_env_validated(deps.api), msg).unwrap_err();

framework/packages/abstract-client/src/client.rs

@@ -30,7 +30,7 @@
 //! ```
 
 use abstract_interface::{
-    Abstract, AccountI, AnsHost, IbcClient, ModuleFactory, RegisteredModule, Registry,
+    Abstract, AccountI, AnsHost, IbcClient, IcaClient, ModuleFactory, RegisteredModule, Registry,
 };
 use abstract_std::objects::{
     module::{ModuleInfo, ModuleStatus, ModuleVersion},
@@ -138,6 +138,13 @@ impl<Chain: CwEnv> AbstractClient<Chain> {
         &self.abstr.ibc.client
     }
 
+    /// Abstract Ica Client contract API
+    ///
+    /// The Abstract Ica Client contract allows users to query messages to send messages across chains (EVM)
+    pub fn ica_client(&self) -> &IcaClient<Chain> {
+        &self.abstr.ibc.ica_client
+    }
+
     /// Service contract API
     pub fn service<M: RegisteredModule + From<Contract<Chain>>>(
         &self,

framework/packages/abstract-client/src/error.rs

@@ -2,6 +2,7 @@
 
 use abstract_interface::AbstractInterfaceError;
 use abstract_std::{objects::validation::ValidationError, AbstractError};
+use cosmwasm_std::StdError;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -17,6 +18,9 @@ pub enum AbstractClientError {
     #[error("{0}")]
     CwOrch(#[from] cw_orch::prelude::CwOrchError),
 
+    #[error("{0}")]
+    StdError(#[from] StdError),
+
     #[error("{0}")]
     Semver(#[from] semver::Error),