Roll back feature cosmwasm_2_0 of cosmwasm std

framework/Cargo.toml

@@ -31,7 +31,7 @@ license = "GPL-3.0-or-later"
 keywords = ["cosmos", "cosmwasm", "framework"]
 
 [workspace.dependencies]
-cosmwasm-std = { version = "2.0.0", features = ["cosmwasm_2_0"] }
+cosmwasm-std = { version = "2.0.0", features = ["cosmwasm_1_2"] }
 cosmwasm-schema = { version = "2.0" }
 cw-controllers = { version = "2.0" }
 cw-utils = { version = "2.0" }

framework/contracts/account/Cargo.toml

@@ -34,6 +34,7 @@ xion = [
     "ripemd",
     "cosmos-sdk-proto",
     "prost",
+    "cosmwasm-std/cosmwasm_2_0",
 ]
 
 [package.metadata.optimizer]

framework/contracts/native/ibc-client/src/commands.rs

@@ -21,8 +21,8 @@ use abstract_std::{
     IBC_CLIENT, ICS20,
 };
 use cosmwasm_std::{
-    ensure, to_json_binary, wasm_execute, AnyMsg, Binary, Coin, CosmosMsg, Deps, DepsMut, Empty,
-    Env, IbcMsg, MessageInfo, QueryRequest, WasmQuery,
+    ensure, to_json_binary, wasm_execute, Binary, Coin, CosmosMsg, Deps, DepsMut, Empty, Env,
+    IbcMsg, MessageInfo, QueryRequest, WasmQuery,
 };
 use cw_storage_plus::Item;
 use prost::Name;
@@ -446,10 +446,11 @@ fn _ics_20_send_msg(
 
             let value = value.encode_to_vec();
             let value = Binary::from(value);
-            CosmosMsg::Any(AnyMsg {
+            #[allow(deprecated)]
+            CosmosMsg::Stargate {
                 type_url: MsgTransfer::type_url(),
                 value,
-            })
+            }
         }
         None => IbcMsg::Transfer {
             channel_id: ics20_channel_id,
@@ -474,7 +475,8 @@ fn map_query(ibc_host: &str, query: QueryRequest<ModuleQuery>) -> QueryRequest<E
         }
         QueryRequest::Bank(query) => QueryRequest::Bank(query),
         QueryRequest::Staking(query) => QueryRequest::Staking(query),
-        QueryRequest::Grpc(grpc) => QueryRequest::Grpc(grpc),
+        #[allow(deprecated)]
+        QueryRequest::Stargate { path, data } => QueryRequest::Stargate { path, data },
         QueryRequest::Ibc(query) => QueryRequest::Ibc(query),
         QueryRequest::Wasm(query) => QueryRequest::Wasm(query),
         // Distribution flag not enabled on polytone, so should not be accepted.

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

@@ -606,7 +606,7 @@ mod tests {
             objects::{registry::RegistryError, ChannelEntry, TruncatedChainId},
             ICS20,
         };
-        use cosmwasm_std::{coins, AnyMsg, Binary, CosmosMsg, IbcMsg};
+        use cosmwasm_std::{coins, Binary, CosmosMsg, IbcMsg};
         use prost::Name;
         use std::str::FromStr;
 
@@ -714,32 +714,31 @@ mod tests {
             let res = execute_as(&mut deps, account.addr(), msg)?;
 
             use prost::Message;
+            #[allow(deprecated)]
             let transfer_msgs: Vec<CosmosMsg> = funds
                 .into_iter()
-                .map(|c| {
-                    CosmosMsg::Any(AnyMsg {
-                        type_url: ibc_proto::ibc::apps::transfer::v1::MsgTransfer::type_url(),
-                        value: Binary::from(
-                            ibc_proto::ibc::apps::transfer::v1::MsgTransfer {
-                                source_port: "transfer".to_owned(),
-                                source_channel: channel_id.clone(),
-                                token: Some(ibc_proto::cosmos::base::v1beta1::Coin {
-                                    denom: c.denom,
-                                    amount: c.amount.to_string(),
-                                }),
-                                sender: mock_env_validated(deps.api).contract.address.to_string(),
-                                receiver: remote_addr.clone(),
-                                timeout_height: None,
-                                timeout_timestamp: mock_env_validated(deps.api)
-                                    .block
-                                    .time
-                                    .plus_seconds(PACKET_LIFETIME)
-                                    .nanos(),
-                                memo: memo.clone().unwrap(),
-                            }
-                            .encode_to_vec(),
-                        ),
-                    })
+                .map(|c| CosmosMsg::Stargate {
+                    type_url: ibc_proto::ibc::apps::transfer::v1::MsgTransfer::type_url(),
+                    value: Binary::from(
+                        ibc_proto::ibc::apps::transfer::v1::MsgTransfer {
+                            source_port: "transfer".to_owned(),
+                            source_channel: channel_id.clone(),
+                            token: Some(ibc_proto::cosmos::base::v1beta1::Coin {
+                                denom: c.denom,
+                                amount: c.amount.to_string(),
+                            }),
+                            sender: mock_env_validated(deps.api).contract.address.to_string(),
+                            receiver: remote_addr.clone(),
+                            timeout_height: None,
+                            timeout_timestamp: mock_env_validated(deps.api)
+                                .block
+                                .time
+                                .plus_seconds(PACKET_LIFETIME)
+                                .nanos(),
+                            memo: memo.clone().unwrap(),
+                        }
+                        .encode_to_vec(),
+                    ),
                 })
                 .collect();
 

framework/packages/abstract-sdk/src/apis.rs

@@ -1,3 +1,5 @@
+// Remove deprecated if we move to cosmwasm_2_0 feature
+
 pub mod adapter;
 pub mod app;
 pub mod bank;
@@ -20,3 +22,12 @@ pub mod distribution;
 pub mod feegrant;
 #[cfg(feature = "stargate")]
 pub mod stargate;
+
+#[cfg(feature = "stargate")]
+pub(crate) fn stargate_msg(
+    type_url: String,
+    value: cosmwasm_std::Binary,
+) -> cosmwasm_std::CosmosMsg {
+    #[allow(deprecated)]
+    cosmwasm_std::CosmosMsg::Stargate { type_url, value }
+}

framework/packages/abstract-sdk/src/apis/authz.rs

@@ -17,7 +17,7 @@ use cosmos_sdk_proto::{
     },
     traits::{Message, Name},
 };
-use cosmwasm_std::{Addr, AnyMsg, Binary, Coin, CosmosMsg, Timestamp, WasmMsg};
+use cosmwasm_std::{Addr, Binary, Coin, CosmosMsg, Timestamp, WasmMsg};
 use ibc_proto::ibc::{applications::transfer::v1::MsgTransfer, core::client::v1::Height};
 
 use super::stargate::{
@@ -104,10 +104,7 @@ impl AuthZ {
         }
         .encode_to_vec();
 
-        CosmosMsg::Any(AnyMsg {
-            type_url: authz::v1beta1::MsgRevoke::type_url(),
-            value: Binary::new(msg),
-        })
+        super::stargate_msg(authz::v1beta1::MsgRevoke::type_url(), Binary::new(msg))
     }
 
     /// Generate cosmwasm message for the AuthZAuthorization type
@@ -124,10 +121,7 @@ impl AuthZ {
         }
         .encode_to_vec();
 
-        CosmosMsg::Any(AnyMsg {
-            type_url: authz::v1beta1::MsgGrant::type_url(),
-            value: Binary::new(msg),
-        })
+        super::stargate_msg(authz::v1beta1::MsgGrant::type_url(), Binary::new(msg))
     }
 
     /// Grants generic authorization to a **grantee**.
@@ -288,7 +282,8 @@ impl AuthZ {
                 ),
                 _ => todo!(),
             },
-            CosmosMsg::Any(AnyMsg { type_url, value }) => (type_url.clone(), value.into()),
+            #[allow(deprecated)]
+            CosmosMsg::Stargate { type_url, value } => (type_url.clone(), value.into()),
             CosmosMsg::Bank(bank_msg) => match bank_msg {
                 cosmwasm_std::BankMsg::Send { to_address, amount } => (
                     MsgSend::type_url(),
@@ -458,10 +453,7 @@ impl AuthZ {
         }
         .encode_to_vec();
 
-        CosmosMsg::Any(AnyMsg {
-            type_url: authz::v1beta1::MsgExec::type_url(),
-            value: Binary::new(msg),
-        })
+        super::stargate_msg(authz::v1beta1::MsgExec::type_url(), Binary::new(msg))
     }
 }
 
@@ -487,9 +479,9 @@ mod tests {
             expiration,
         );
 
-        let expected_msg = CosmosMsg::Any(AnyMsg {
-            type_url: "/cosmos.authz.v1beta1.MsgGrant".to_string(),
-            value: Binary::new(
+        let expected_msg = crate::apis::stargate_msg(
+            "/cosmos.authz.v1beta1.MsgGrant".to_string(),
+            Binary::new(
                 authz::v1beta1::MsgGrant {
                     granter: granter.into_string(),
                     grantee: grantee.into_string(),
@@ -506,7 +498,7 @@ mod tests {
                 }
                 .encode_to_vec(),
             ),
-        });
+        );
 
         assert_eq!(generic_authorization_msg, expected_msg);
     }
@@ -523,17 +515,17 @@ mod tests {
         let generic_authorization_msg =
             auth_z.revoke(&grantee, "/cosmos.gov.v1beta1.MsgVote".to_string());
 
-        let expected_msg = CosmosMsg::Any(AnyMsg {
-            type_url: "/cosmos.authz.v1beta1.MsgRevoke".to_string(),
-            value: Binary::new(
+        let expected_msg = crate::apis::stargate_msg(
+            "/cosmos.authz.v1beta1.MsgRevoke".to_string(),
+            Binary::new(
                 authz::v1beta1::MsgRevoke {
                     granter: granter.into_string(),
                     grantee: grantee.into_string(),
                     msg_type_url: "/cosmos.gov.v1beta1.MsgVote".to_string(),
                 }
                 .encode_to_vec(),
             ),
-        });
+        );
 
         assert_eq!(generic_authorization_msg, expected_msg);
     }

framework/packages/abstract-sdk/src/apis/distribution.rs

@@ -7,7 +7,7 @@ use cosmos_sdk_proto::{
     prost::Name,
     traits::Message,
 };
-use cosmwasm_std::{to_json_binary, Addr, AnyMsg, Coin, CosmosMsg};
+use cosmwasm_std::{to_json_binary, Addr, Coin};
 
 use crate::{features::AccountExecutor, AbstractSdkResult, AccountAction};
 
@@ -69,10 +69,10 @@ impl Distribution {
         }
         .encode_to_vec();
 
-        let msg = CosmosMsg::Any(AnyMsg {
-            type_url: distribution::v1beta1::MsgSetWithdrawAddress::type_url(),
-            value: to_json_binary(&msg)?,
-        });
+        let msg = super::stargate_msg(
+            distribution::v1beta1::MsgSetWithdrawAddress::type_url(),
+            to_json_binary(&msg)?,
+        );
 
         Ok(msg.into())
     }
@@ -89,10 +89,10 @@ impl Distribution {
         }
         .encode_to_vec();
 
-        let msg = CosmosMsg::Any(AnyMsg {
-            type_url: distribution::v1beta1::MsgWithdrawDelegatorReward::type_url(),
-            value: to_json_binary(&msg)?,
-        });
+        let msg = super::stargate_msg(
+            distribution::v1beta1::MsgWithdrawDelegatorReward::type_url(),
+            to_json_binary(&msg)?,
+        );
 
         Ok(msg.into())
     }
@@ -107,10 +107,10 @@ impl Distribution {
         }
         .encode_to_vec();
 
-        let msg = CosmosMsg::Any(AnyMsg {
-            type_url: distribution::v1beta1::MsgWithdrawValidatorCommission::type_url(),
-            value: to_json_binary(&msg)?,
-        });
+        let msg = super::stargate_msg(
+            distribution::v1beta1::MsgWithdrawValidatorCommission::type_url(),
+            to_json_binary(&msg)?,
+        );
 
         Ok(msg.into())
     }
@@ -133,10 +133,10 @@ impl Distribution {
         }
         .encode_to_vec();
 
-        let msg = CosmosMsg::Any(AnyMsg {
-            type_url: distribution::v1beta1::MsgFundCommunityPool::type_url(),
-            value: to_json_binary(&msg)?,
-        });
+        let msg = super::stargate_msg(
+            distribution::v1beta1::MsgFundCommunityPool::type_url(),
+            to_json_binary(&msg)?,
+        );
 
         Ok(msg.into())
     }