update and un-ibc app template

Cargo.toml

@@ -28,7 +28,7 @@ abstract-standalone = { version = "0.24.1" }
 abstract-interface = { version = "0.24.1" }
 abstract-client = { version = "0.24.1" }
 cw-orch = { version = "0.27.0" }
-{% if with_ibc %}
+{% if include_ibc_app %}
 cw-orch-interchain = { version = "0.8.0" }
 {% endif %}
 
@@ -48,3 +48,8 @@ clap = { version = "4.5.19" }
 {% if include_standalone %}
 {{standalone_name | kebab_case}} = { path = "contracts/{{standalone_name}}" }
 {% endif %}
+
+[patch.crates-io]
+abstract-client = { git = "https://github.com/AbstractSDK/abstract.git", branch = "buckram/fix-abstract-client-fetch_or_build_account" }
+abstract-std = { git = "https://github.com/AbstractSDK/abstract.git", branch = "buckram/fix-abstract-client-fetch_or_build_account" }
+abstract-interface = { git = "https://github.com/AbstractSDK/abstract.git", branch = "buckram/fix-abstract-client-fetch_or_build_account" }

cargo-generate.toml

@@ -9,10 +9,9 @@ post = ["post-script.rhai"]
 include_app = { prompt = "Include App Module", default = true, type = "bool" }
 include_adapter = { prompt = "Include Adapter Module", default = true, type = "bool" }
 include_standalone = { prompt = "Include Standalone Module", default = true, type = "bool" }
+include_ibc_app = { prompt = "Include IBC App Module", default = true, type = "bool" }
 
 [conditional.'include_app'.placeholders]
-# App can have IBC
-with_ibc = { prompt = "Would you like to include IBC template in the app?", default = false, type = "bool" }
 app_name = { prompt = "Enter App Name", default = "my_app", type = "string" }
 
 [conditional.'include_adapter'.placeholders]
@@ -21,16 +20,15 @@ adapter_name = { prompt = "Enter Adapter Name", default = "my_adapter", type = "
 [conditional.'include_standalone'.placeholders]
 standalone_name = { prompt = "Enter Standalone Name", default = "my_standalone", type = "string" }
 
+[conditional.'include_ibc_app'.placeholders]
+ibc_app_name = { prompt = "Enter IBC App Name", default = "my_ibc_app", type = "string" }
+
 # Ignore files if not included
 [conditional.'!include_app']
 ignore = ["contracts/{{app_name}}"]
 [conditional.'!include_adapter']
 ignore = ["contracts/{{adapter_name}}"]
 [conditional.'!include_standalone']
 ignore = ["contracts/{{standalone_name}}"]
-
-[conditional.'!with_ibc']
-ignore = [
-    "contracts/{{app_name}}/src/ibc",
-    "contracts/{{app_name}}/tests/interchain_integration.rs",
-]
+[conditional.'!include_ibc_app']
+ignore = ["contracts/{{ibc_app_name}}"]

contracts/{{adapter_name}}/src/bin/publish.rs

@@ -32,8 +32,10 @@ fn publish(networks: Vec<ChainInfo>) -> anyhow::Result<()> {
 
         // Get the [`Publisher`] that owns the namespace, otherwise create a new one and claim the namespace
         let publisher: Publisher<_> = abstract_client
-            .publisher_builder(adapter_namespace)
-            .build()?;
+            .account_builder()
+            .namespace(adapter_namespace)
+            .build()?
+            .publisher()?;
 
         if publisher.account().owner()? != chain.sender_addr() {
             panic!("The current sender can not publish to this namespace. Please use the wallet that owns the Account that owns the Namespace.")

contracts/{{adapter_name}}/tests/integration.rs

@@ -31,7 +31,11 @@ impl TestEnv<MockBech32> {
         abs_client.set_balance(&sender, &coins(123, "ucosm"))?;
 
         // Publish the adapter
-        let publisher = abs_client.publisher_builder(namespace).build()?;
+        let publisher = abs_client
+            .account_builder()
+            .namespace(namespace)
+            .build()?
+            .publisher()?;
         publisher.publish_adapter::<{{adapter_name | upper_camel_case}}InstantiateMsg, {{adapter_name | upper_camel_case}}Interface<_>>(
             {{adapter_name | upper_camel_case}}InstantiateMsg {},
         )?;
@@ -67,8 +71,8 @@ fn update_config() -> anyhow::Result<()> {
     // Note that it's not a requirement to have it installed in this case
     let publisher_account = env
         .abs
-        .publisher_builder(Namespace::new({{project-name | shouty_snake_case}}_NAMESPACE).unwrap())
-        .build()?;
+        .fetch_account(Namespace::new({{project-name | shouty_snake_case}}_NAMESPACE).unwrap())?
+        .publisher()?;
 
     adapter.execute(
         &AdapterRequestMsg {
@@ -109,7 +113,7 @@ fn set_status() -> anyhow::Result<()> {
     let new_account = env
         .abs
         .account_builder()
-        .install_adapter::<{{adapter_name | upper_camel_case}}Interface<MockBech32>>()?
+        .install_adapter::<{{adapter_name | upper_camel_case}}Interface<MockBech32>>()
         .build()?;
 
     new_account.as_ref().execute_on_module(

contracts/{{app_name}}/Cargo.toml

@@ -49,9 +49,6 @@ const_format = { workspace = true }
 # Dependencies for interface
 cw-orch = { workspace = true }
 abstract-interface = { workspace = true }
-{% if with_ibc %}
-cw-orch-interchain = { workspace = true }
-{% endif %}
 
 # Dependencies for bins
 clap = { workspace = true, optional = true, features = ["derive"] }
@@ -61,5 +58,5 @@ env_logger = { workspace = true, optional = true }
 
 [dev-dependencies]
 {{app_name | kebab_case}} = { workspace = true }
-abstract-client = { workspace = true{%if with_ibc %}, features = ["interchain"]{% endif %}  }
+abstract-client = { workspace = true }
 abstract-app = { workspace = true, features = ["test-utils"] }

contracts/{{app_name}}/src/bin/publish.rs

@@ -30,7 +30,11 @@ fn publish(networks: Vec<ChainInfo>) -> anyhow::Result<()> {
         let abstract_client: AbstractClient<Daemon> = AbstractClient::new(chain.clone())?;
 
         // Get the [`Publisher`] that owns the namespace, otherwise create a new one and claim the namespace
-        let publisher: Publisher<_> = abstract_client.publisher_builder(app_namespace).build()?;
+        let publisher: Publisher<_> = abstract_client
+            .account_builder()
+            .namespace(app_namespace)
+            .build()?
+            .publisher()?;
 
         if publisher.account().owner()? != chain.sender_addr() {
             panic!("The current sender can not publish to this namespace. Please use the wallet that owns the Account that owns the Namespace.")

contracts/{{app_name}}/src/contract.rs

@@ -23,9 +23,7 @@ const APP: {{app_name | upper_camel_case}} = {{app_name | upper_camel_case}}::ne
     .with_execute(handlers::execute_handler)
     .with_query(handlers::query_handler)
     .with_migrate(handlers::migrate_handler)
-    .with_replies(&[(INSTANTIATE_REPLY_ID, replies::instantiate_reply)]){% if with_ibc %}
-    .with_ibc_callback(crate::ibc::ibc_callback)
-    .with_module_ibc(crate::ibc::receive_module_ibc){% endif %}
+    .with_replies(&[(INSTANTIATE_REPLY_ID, replies::instantiate_reply)])
     .with_dependencies(&[]);
 
 // Export handlers

contracts/{{app_name}}/src/lib.rs

@@ -5,8 +5,6 @@ pub mod msg;
 mod replies;
 pub mod state;
 
-{% if with_ibc %}pub mod ibc;{% endif %}
-
 pub use error::{{app_name | upper_camel_case}}Error;
 
 /// The version of your app

contracts/{{app_name}}/src/msg.rs

@@ -45,14 +45,3 @@ pub struct ConfigResponse {}
 pub struct CountResponse {
     pub count: i32,
 }
-
-{% if with_ibc %}
-#[cosmwasm_schema::cw_serde]
-pub enum IbcCallbackMsg {
-    Empty {},
-}
-
-#[cosmwasm_schema::cw_serde]
-pub struct IbcMsg {
-}
-{% endif %}

contracts/{{app_name}}/tests/integration.rs

@@ -32,7 +32,11 @@ impl TestEnv<MockBech32> {
         abs_client.set_balance(&sender, &coins(123, "ucosm"))?;
 
         // Publish the app
-        let publisher = abs_client.publisher_builder(namespace).build()?;
+        let publisher = abs_client
+            .account_builder()
+            .namespace(namespace)
+            .build()?
+            .publisher()?;
         publisher.publish_app::<{{app_name | upper_camel_case}}Interface<_>>()?;
 
         let app = publisher

contracts/{{standalone_name}}/src/bin/publish.rs

@@ -31,8 +31,10 @@ fn publish(networks: Vec<ChainInfo>) -> anyhow::Result<()> {
 
         // Get the [`Publisher`] that owns the namespace, otherwise create a new one and claim the namespace
         let publisher: Publisher<_> = abstract_client
-            .publisher_builder(standalone_namespace)
-            .build()?;
+            .account_builder()
+            .namespace(standalone_namespace)
+            .build()?
+            .publisher()?;
 
         if publisher.account().owner()? != chain.sender_addr() {
             panic!("The current sender can not publish to this namespace. Please use the wallet that owns the Account that owns the Namespace.")

contracts/{{standalone_name}}/tests/integration.rs

@@ -32,7 +32,11 @@ impl TestEnv<MockBech32> {
         abs_client.set_balance(&sender, &coins(123, "ucosm"))?;
 
         // Publish the standalone
-        let publisher = abs_client.publisher_builder(namespace).build()?;
+        let publisher = abs_client
+            .account_builder()
+            .namespace(namespace)
+            .build()?
+            .publisher()?;
         publisher.publish_standalone::<{{standalone_name | upper_camel_case}}Interface<_>>()?;
 
         let standalone = publisher