Merge pull request #187 from osmosis-labs/upgrade-deps

Upgrade deps

Cargo.toml

@@ -25,23 +25,23 @@ mesh-simple-price-feed    = { path = "./contracts/consumer/simple-price-feed" }
 mesh-virtual-staking    = { path = "./contracts/consumer/virtual-staking" }
 
 sylvia           = "0.8.1"
-cosmwasm-schema  = "1.3.3"
-cosmwasm-std     = { version = "1.3.3", features = ["ibc3", "cosmwasm_1_3"] }
-cw-storage-plus  = "1.1.0"
-cw-utils         = "1.0.1"
-cw2              = "1.0.1"
+cosmwasm-schema  = "1.5.4"
+cosmwasm-std     = { version = "1.5.4", features = ["ibc3", "cosmwasm_1_3"] }
+cw-storage-plus  = "1.2.0"
+cw-utils         = "1.0.3"
+cw2              = "1.1.2"
 osmosis-std      = "0.20.1"
-schemars         = "0.8.11"
-serde            = { version = "1.0.152", default-features = false, features = ["derive"] }
-thiserror        = "1.0.38"
-semver = "1.0.4"
-itertools = "0.11.0"
+schemars         = "0.8.17"
+serde            = { version = "1.0.199", default-features = false, features = ["derive"] }
+thiserror        = "1.0.59"
+semver = "1.0.22"
+itertools = "0.12.1"
 
 # dev deps
 anyhow        = "1"
 cw-multi-test = "0.16.5"
 derivative    = "2"
-test-case     = "2.2.0"
+test-case     = "3.3.1"
 
 [profile.release]
 codegen-units    = 1

contracts/consumer/converter/src/contract.rs

@@ -1,6 +1,6 @@
 use cosmwasm_std::{
-    ensure_eq, to_binary, Addr, BankMsg, Coin, CosmosMsg, Decimal, Deps, DepsMut, Event, Fraction,
-    MessageInfo, Reply, Response, SubMsg, SubMsgResponse, Uint128, Validator, WasmMsg,
+    ensure_eq, to_json_binary, Addr, BankMsg, Coin, CosmosMsg, Decimal, Deps, DepsMut, Event,
+    Fraction, MessageInfo, Reply, Response, SubMsg, SubMsgResponse, Uint128, Validator, WasmMsg,
 };
 use cw2::set_contract_version;
 use cw_storage_plus::Item;
@@ -203,7 +203,7 @@ impl ConverterContract<'_> {
         let msg = virtual_staking_api::ExecMsg::Bond { validator, amount };
         let msg = WasmMsg::Execute {
             contract_addr: self.virtual_stake.load(deps.storage)?.into(),
-            msg: to_binary(&msg)?,
+            msg: to_json_binary(&msg)?,
             funds: vec![],
         };
 
@@ -227,7 +227,7 @@ impl ConverterContract<'_> {
         let msg = virtual_staking_api::ExecMsg::Unbond { validator, amount };
         let msg = WasmMsg::Execute {
             contract_addr: self.virtual_stake.load(deps.storage)?.into(),
-            msg: to_binary(&msg)?,
+            msg: to_json_binary(&msg)?,
             funds: vec![],
         };
 
@@ -254,7 +254,7 @@ impl ConverterContract<'_> {
         };
         let msg = WasmMsg::Execute {
             contract_addr: self.virtual_stake.load(deps.storage)?.into(),
-            msg: to_binary(&msg)?,
+            msg: to_json_binary(&msg)?,
             funds: vec![],
         };
 

contracts/consumer/converter/src/ibc.rs

@@ -2,7 +2,7 @@
 use cosmwasm_std::entry_point;
 
 use cosmwasm_std::{
-    from_slice, to_binary, DepsMut, Env, Event, Ibc3ChannelOpenResponse, IbcBasicResponse,
+    from_json, to_json_binary, DepsMut, Env, Event, Ibc3ChannelOpenResponse, IbcBasicResponse,
     IbcChannel, IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg,
     IbcChannelOpenResponse, IbcMsg, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg,
     IbcReceiveResponse, IbcTimeout, Validator,
@@ -73,7 +73,7 @@ pub fn ibc_channel_open(
             version: SUPPORTED_IBC_PROTOCOL_VERSION.to_string(),
         }
     } else {
-        let v: ProtocolVersion = from_slice(channel.version.as_bytes())?;
+        let v: ProtocolVersion = from_json(channel.version.as_bytes())?;
         // if we can build a response to this, then it is compatible. And we use the highest version there
         v.build_response(SUPPORTED_IBC_PROTOCOL_VERSION, MIN_IBC_PROTOCOL_VERSION)?
     };
@@ -108,7 +108,7 @@ pub fn ibc_channel_connect(
 
     // Ensure the counterparty responded with a version we support.
     // Note: here, we error if it is higher than what we proposed originally
-    let v: ProtocolVersion = from_slice(counterparty_version.as_bytes())?;
+    let v: ProtocolVersion = from_json(counterparty_version.as_bytes())?;
     v.verify_compatibility(SUPPORTED_IBC_PROTOCOL_VERSION, MIN_IBC_PROTOCOL_VERSION)?;
 
     // store the channel
@@ -162,7 +162,7 @@ pub(crate) fn valset_update_msg(
     };
     let msg = IbcMsg::SendPacket {
         channel_id: channel.endpoint.channel_id.clone(),
-        data: to_binary(&packet)?,
+        data: to_json_binary(&packet)?,
         timeout: packet_timeout_validator(env),
     };
     Ok(msg)
@@ -188,7 +188,7 @@ pub fn ibc_packet_receive(
     _env: Env,
     msg: IbcPacketReceiveMsg,
 ) -> Result<IbcReceiveResponse, ContractError> {
-    let packet: ProviderPacket = from_slice(&msg.packet.data)?;
+    let packet: ProviderPacket = from_json(msg.packet.data)?;
     let contract = ConverterContract::new();
     let res = match packet {
         ProviderPacket::Stake {
@@ -246,7 +246,7 @@ pub fn ibc_packet_ack(
     _env: Env,
     msg: IbcPacketAckMsg,
 ) -> Result<IbcBasicResponse, ContractError> {
-    let ack: AckWrapper = from_slice(&msg.acknowledgement.data)?;
+    let ack: AckWrapper = from_json(&msg.acknowledgement.data)?;
     let mut res = IbcBasicResponse::new();
     match ack {
         AckWrapper::Result(_) => {}
@@ -286,7 +286,7 @@ pub(crate) fn make_ibc_packet(
     let channel = IBC_CHANNEL.load(ctx.deps.storage)?;
     Ok(IbcMsg::SendPacket {
         channel_id: channel.endpoint.channel_id,
-        data: to_binary(&packet)?,
+        data: to_json_binary(&packet)?,
         timeout: packet_timeout_rewards(&ctx.env),
     })
 }

contracts/consumer/converter/src/multitest.rs

@@ -352,7 +352,9 @@ fn valset_update_works() {
     assert_eq!(
         res.unwrap_err(),
         ContractError::Std(StdError::NotFound {
-            kind: "cosmwasm_std::ibc::IbcChannel".to_string()
+            kind:
+                "type: cosmwasm_std::ibc::IbcChannel; key: [69, 62, 63, 5F, 63, 68, 61, 6E, 6E, 65, 6C]"
+                    .to_string()
         })
     );
 }

contracts/consumer/remote-price-feed/src/ibc.rs

@@ -2,7 +2,7 @@
 use cosmwasm_std::entry_point;
 
 use cosmwasm_std::{
-    from_slice, to_binary, DepsMut, Env, Ibc3ChannelOpenResponse, IbcBasicResponse, IbcChannel,
+    from_json, to_json_binary, DepsMut, Env, Ibc3ChannelOpenResponse, IbcBasicResponse, IbcChannel,
     IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcMsg,
     IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, IbcTimeout,
     Timestamp,
@@ -65,7 +65,7 @@ pub fn ibc_channel_open(
     }
 
     // we handshake with the counterparty version, it must not be empty
-    let v: ProtocolVersion = from_slice(counterparty_version.as_bytes())?;
+    let v: ProtocolVersion = from_json(counterparty_version.as_bytes())?;
     // if we can build a response to this, then it is compatible. And we use the highest version there
     let version = v.build_response(SUPPORTED_IBC_PROTOCOL_VERSION, MIN_IBC_PROTOCOL_VERSION)?;
 
@@ -125,7 +125,7 @@ pub fn ibc_packet_ack(
     _env: Env,
     msg: IbcPacketAckMsg,
 ) -> Result<IbcBasicResponse, ContractError> {
-    let ack: PriceFeedProviderAck = from_slice(&msg.acknowledgement.data)?;
+    let ack: PriceFeedProviderAck = from_json(msg.acknowledgement.data)?;
     let PriceFeedProviderAck::Update { time, twap } = ack;
     let contract = RemotePriceFeedContract::new();
     contract.update_twap(deps, time, twap)?;
@@ -149,7 +149,7 @@ pub(crate) fn make_ibc_packet(
 ) -> Result<IbcMsg, ContractError> {
     Ok(IbcMsg::SendPacket {
         channel_id: channel.endpoint.channel_id,
-        data: to_binary(&packet)?,
+        data: to_json_binary(&packet)?,
         timeout: packet_timeout(now),
     })
 }

contracts/consumer/virtual-staking/src/contract.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use std::collections::{BTreeMap, HashMap, HashSet};
 
 use cosmwasm_std::{
-    coin, ensure_eq, entry_point, to_binary, Coin, CosmosMsg, CustomQuery, DepsMut,
+    coin, ensure_eq, entry_point, to_json_binary, Coin, CosmosMsg, CustomQuery, DepsMut,
     DistributionMsg, Env, Event, Reply, Response, StdResult, Storage, SubMsg, Uint128, Validator,
     WasmMsg,
 };
@@ -262,7 +262,7 @@ impl VirtualStakingContract<'_> {
         };
         let msg = WasmMsg::Execute {
             contract_addr: cfg.converter.to_string(),
-            msg: to_binary(&msg)?,
+            msg: to_json_binary(&msg)?,
             funds: vec![],
         };
         let resp = Response::new().add_message(msg);
@@ -338,7 +338,7 @@ impl VirtualStakingContract<'_> {
             };
             let msg = WasmMsg::Execute {
                 contract_addr: cfg.converter.into_string(),
-                msg: to_binary(&msg)?,
+                msg: to_json_binary(&msg)?,
                 funds: vec![coin(total.into(), cfg.denom)],
             };
             Ok(Response::new().add_message(msg))
@@ -644,7 +644,7 @@ mod tests {
     };
 
     use cosmwasm_std::{
-        coins, from_binary,
+        coins, from_json,
         testing::{mock_env, mock_info, MockApi, MockQuerier, MockStorage},
         Decimal,
     };
@@ -1221,12 +1221,12 @@ mod tests {
                 match msg {
                     mesh_bindings::VirtualStakeQuery::BondStatus { .. } => {
                         cosmwasm_std::SystemResult::Ok(cosmwasm_std::ContractResult::Ok(
-                            to_binary(&*bs_copy.borrow()).unwrap(),
+                            to_json_binary(&*bs_copy.borrow()).unwrap(),
                         ))
                     }
                     mesh_bindings::VirtualStakeQuery::SlashRatio {} => {
                         cosmwasm_std::SystemResult::Ok(cosmwasm_std::ContractResult::Ok(
-                            to_binary(&*slash_ratio.borrow()).unwrap(),
+                            to_json_binary(&*slash_ratio.borrow()).unwrap(),
                         ))
                     }
                 }
@@ -1515,7 +1515,7 @@ mod tests {
                     ..
                 }] => {
                     if let converter_api::ExecMsg::DistributeRewards { mut payments } =
-                        from_binary(bin_msg).unwrap()
+                        from_json(bin_msg).unwrap()
                     {
                         payments.sort();
                         Self::Batch(payments)

contracts/osmosis-price-provider/src/ibc.rs

@@ -2,7 +2,7 @@
 use cosmwasm_std::entry_point;
 
 use cosmwasm_std::{
-    from_slice, to_binary, DepsMut, Env, Ibc3ChannelOpenResponse, IbcBasicResponse,
+    from_json, to_json_binary, DepsMut, Env, Ibc3ChannelOpenResponse, IbcBasicResponse,
     IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg, IbcChannelOpenResponse,
     IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, IbcTimeout,
     StdError, Timestamp,
@@ -46,7 +46,7 @@ pub fn ibc_channel_open(
             version: SUPPORTED_IBC_PROTOCOL_VERSION.to_string(),
         }
     } else {
-        let v: ProtocolVersion = from_slice(channel.version.as_bytes())?;
+        let v: ProtocolVersion = from_json(channel.version.as_bytes())?;
         // if we can build a response to this, then it is compatible. And we use the highest version there
         v.build_response(SUPPORTED_IBC_PROTOCOL_VERSION, MIN_IBC_PROTOCOL_VERSION)?
     };
@@ -77,7 +77,7 @@ pub fn ibc_channel_connect(
 
     // Ensure the counterparty responded with a version we support.
     // Note: here, we error if it is higher than what we proposed originally
-    let v: ProtocolVersion = from_slice(counterparty_version.as_bytes())?;
+    let v: ProtocolVersion = from_json(counterparty_version.as_bytes())?;
     v.verify_compatibility(SUPPORTED_IBC_PROTOCOL_VERSION, MIN_IBC_PROTOCOL_VERSION)?;
 
     let contract = OsmosisPriceProvider::new();
@@ -124,12 +124,17 @@ pub fn ibc_packet_receive(
         pool_id,
         base_asset,
         quote_asset,
-    } = from_slice(&msg.packet.data)?;
+    } = from_json(msg.packet.data)?;
     let contract = OsmosisPriceProvider::new();
 
     let time = env.block.time;
     let twap = contract.query_twap(deps, pool_id, base_asset, quote_asset)?;
-    Ok(IbcReceiveResponse::new().set_ack(to_binary(&PriceFeedProviderAck::Update { time, twap })?))
+    Ok(
+        IbcReceiveResponse::new().set_ack(to_json_binary(&PriceFeedProviderAck::Update {
+            time,
+            twap,
+        })?),
+    )
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]