From d5233cb8b377296cbe454bbed418d7fa7d3ec35f Mon Sep 17 00:00:00 2001 From: srdtrk <59252793+srdtrk@users.noreply.github.com> Date: Thu, 9 Nov 2023 01:02:21 +0300 Subject: [PATCH] deps: bump cosmwasm to 1.5 (#19) * deps: updated cw * style: ran 'cargo fmt' * imp(owner): updated Cargo.lock --- Cargo.lock | 94 ++++++++++++++--------- Cargo.toml | 10 +-- src/contract.rs | 8 +- src/helpers.rs | 10 +-- src/ibc/relay.rs | 4 +- src/ibc/types/packet.rs | 12 +-- src/types/callbacks.rs | 10 ++- src/types/state.rs | 8 +- testing/contracts/cw-ica-owner/Cargo.lock | 15 +++- 9 files changed, 103 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5aba2c53..8d43e48c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,6 +49,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + [[package]] name = "block-buffer" version = "0.9.0" @@ -113,11 +119,12 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fb22494cf7d23d0c348740e06e5c742070b2991fd41db77bba0bcfbae1a723" +checksum = "d8bb3c77c3b7ce472056968c745eb501c440fbc07be5004eba02782c35bfbbe3" dependencies = [ "digest 0.10.7", + "ecdsa", "ed25519-zebra", "k256", "rand_core 0.6.4", @@ -126,18 +133,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e199424486ea97d6b211db6387fd72e26b4a439d40cc23140b2d8305728055b" +checksum = "fea73e9162e6efde00018d55ed0061e93a108b5d6ec4548b4f8ce3c706249687" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef683a9c1c4eabd6d31515719d0d2cc66952c4c87f7eb192bfc90384517dc34" +checksum = "0df41ea55f2946b6b43579659eec048cc2f66e8c8e2e3652fc5e5e476f673856" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -148,9 +155,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9567025acbb4c0c008178393eb53b3ac3c2e492c25949d3bf415b9cbe80772d8" +checksum = "43609e92ce1b9368aa951b334dd354a2d0dd4d484931a5f83ae10e12a26c8ba9" dependencies = [ "proc-macro2", "quote", @@ -159,11 +166,12 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d89d680fb60439b7c5947b15f9c84b961b88d1f8a3b20c4bd178a3f87db8bae" +checksum = "04d6864742e3a7662d024b51a94ea81c9af21db6faea2f9a6d2232bb97c6e53e" dependencies = [ "base64 0.21.4", + "bech32", "bnum", "cosmwasm-crypto", "cosmwasm-derive", @@ -172,8 +180,9 @@ dependencies = [ "hex", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 0.5.1", "sha2 0.10.7", + "static_assertions", "thiserror", ] @@ -234,7 +243,7 @@ dependencies = [ "schemars", "semver", "serde", - "serde-json-wasm", + "serde-json-wasm 1.0.0", "thiserror", ] @@ -251,9 +260,9 @@ dependencies = [ [[package]] name = "cw2" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ac2dc7a55ad64173ca1e0a46697c31b7a5c51342f55a1e84a724da4eb99908" +checksum = "9431d14f64f49e41c6ef5561ed11a5391c417d0cb16455dea8cdcb9037a8d197" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -532,9 +541,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -559,7 +568,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.39", ] [[package]] @@ -573,9 +582,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -613,9 +622,9 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "dyn-clone", "schemars_derive", @@ -625,9 +634,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -657,9 +666,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -673,6 +682,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde-json-wasm" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c37d03f3b0f6b5f77c11af1e7c772de1c9af83e50bef7bb6069601900ba67b" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.11" @@ -684,13 +702,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.39", ] [[package]] @@ -759,6 +777,12 @@ dependencies = [ "der", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "subtle" version = "2.5.0" @@ -787,9 +811,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -816,22 +840,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.39", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c691cbcc..19fd0a08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,8 @@ optimize = """docker run --rm -v "$(pwd)":/code \ """ [dependencies] -cosmwasm-schema = "1.4.0" -cosmwasm-std = { version = "1.4.0", features = [ +cosmwasm-schema = "1.5.0" +cosmwasm-std = { version = "1.5.0", features = [ "cosmwasm_1_2", # Enable this if you only deploy to chains that have CosmWasm 1.4 or higher # "cosmwasm_1_4", @@ -53,11 +53,11 @@ cosmwasm-std = { version = "1.4.0", features = [ "ibc3", ] } cw-storage-plus = "1.1.0" -cw2 = "1.1.0" +cw2 = "1.1.1" schemars = "0.8.10" serde = { version = "1.0", default-features = false, features = ["derive"] } -serde-json-wasm = "0.5.1" -thiserror = { version = "1.0.31" } +serde-json-wasm = "1.0.0" +thiserror = { version = "1.0.50" } cosmos-sdk-proto = { version = "0.20.0", default-features = false } semver = "1.0" diff --git a/src/contract.rs b/src/contract.rs index 9e2dbf1d..2cdebad7 100644 --- a/src/contract.rs +++ b/src/contract.rs @@ -1,7 +1,7 @@ //! This module handles the execution logic of the contract. use cosmwasm_std::entry_point; -use cosmwasm_std::{to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult}; +use cosmwasm_std::{to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult}; use crate::ibc::types::stargate::channel::new_ica_channel_open_init_cosmos_msg; use crate::types::keys::{CONTRACT_NAME, CONTRACT_VERSION}; @@ -84,9 +84,9 @@ pub fn execute( #[entry_point] pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult { match msg { - QueryMsg::GetContractState {} => to_binary(&query::state(deps)?), - QueryMsg::GetChannel {} => to_binary(&query::channel(deps)?), - QueryMsg::GetCallbackCounter {} => to_binary(&query::callback_counter(deps)?), + QueryMsg::GetContractState {} => to_json_binary(&query::state(deps)?), + QueryMsg::GetChannel {} => to_json_binary(&query::channel(deps)?), + QueryMsg::GetCallbackCounter {} => to_json_binary(&query::callback_counter(deps)?), } } diff --git a/src/helpers.rs b/src/helpers.rs index aac8a7ac..a83e25c3 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -4,7 +4,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use cosmwasm_std::{to_binary, Addr, Binary, CosmosMsg, QuerierWrapper, StdResult, WasmMsg}; +use cosmwasm_std::{to_json_binary, Addr, Binary, CosmosMsg, QuerierWrapper, StdResult, WasmMsg}; use crate::types::{msg, state}; @@ -31,7 +31,7 @@ impl CwIcaControllerContract { /// call creates a [`WasmMsg::Execute`] message targeting this contract, pub fn call(&self, msg: impl Into) -> StdResult { - let msg = to_binary(&msg.into())?; + let msg = to_json_binary(&msg.into())?; Ok(WasmMsg::Execute { contract_addr: self.addr().into(), msg, @@ -81,7 +81,7 @@ impl CwIcaControllerContract { msg: impl Into, new_code_id: u64, ) -> StdResult { - let msg = to_binary(&msg.into())?; + let msg = to_json_binary(&msg.into())?; Ok(WasmMsg::Migrate { contract_addr: self.addr().into(), new_code_id, @@ -109,7 +109,7 @@ impl CwIcaControllerCode { label: impl Into, admin: Option>, ) -> StdResult { - let msg = to_binary(&msg.into())?; + let msg = to_json_binary(&msg.into())?; Ok(WasmMsg::Instantiate { code_id: self.code_id(), msg, @@ -128,7 +128,7 @@ impl CwIcaControllerCode { admin: Option>, salt: impl Into, ) -> StdResult { - let msg = to_binary(&msg.into())?; + let msg = to_json_binary(&msg.into())?; Ok(WasmMsg::Instantiate2 { code_id: self.code_id(), msg, diff --git a/src/ibc/relay.rs b/src/ibc/relay.rs index 31d0b47b..9ff0220a 100644 --- a/src/ibc/relay.rs +++ b/src/ibc/relay.rs @@ -5,7 +5,7 @@ use cosmwasm_std::entry_point; use cosmwasm_std::{ - from_binary, DepsMut, Env, IbcBasicResponse, IbcPacketAckMsg, IbcPacketReceiveMsg, + from_json, DepsMut, Env, IbcBasicResponse, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, Never, }; @@ -24,7 +24,7 @@ pub fn ibc_packet_ack( ack: IbcPacketAckMsg, ) -> Result { // This lets the ICA controller know whether or not the sent transactions succeeded. - match from_binary(&ack.acknowledgement.data)? { + match from_json(&ack.acknowledgement.data)? { AcknowledgementData::Result(res) => { ibc_packet_ack::success(deps, ack.original_packet, ack.relayer, res) } diff --git a/src/ibc/types/packet.rs b/src/ibc/types/packet.rs index 95542953..258a7a98 100644 --- a/src/ibc/types/packet.rs +++ b/src/ibc/types/packet.rs @@ -3,7 +3,7 @@ //! This module contains the packet data to be send to the ica host and acknowledgement data types. use cosmwasm_schema::cw_serde; -use cosmwasm_std::{to_binary, Env, IbcMsg, IbcTimeout, StdResult}; +use cosmwasm_std::{to_json_binary, Env, IbcMsg, IbcTimeout, StdResult}; pub use cosmos_sdk_proto::ibc::applications::interchain_accounts::v1::CosmosTx; use cosmos_sdk_proto::traits::Message; @@ -100,7 +100,7 @@ impl IcaPacketData { .plus_seconds(timeout_seconds.unwrap_or(DEFAULT_TIMEOUT_SECONDS)); Ok(IbcMsg::SendPacket { channel_id: channel_id.into(), - data: to_binary(&self)?, + data: to_json_binary(&self)?, timeout: IbcTimeout::with_timestamp(timeout_timestamp), }) } @@ -126,7 +126,7 @@ pub mod acknowledgement { #[cfg(test)] mod tests { use acknowledgement::AcknowledgementData; - use cosmwasm_std::{coins, from_binary, Binary}; + use cosmwasm_std::{coins, from_json, Binary}; use crate::types::cosmos_msg::ExampleCosmosMessages; @@ -143,7 +143,7 @@ mod tests { vec![r#"{"@type": "/cosmos.bank.v1beta1.MsgSend", "from_address": "cosmos15ulrf36d4wdtrtqzkgaan9ylwuhs7k7qz753uk", "to_address": "cosmos15ulrf36d4wdtrtqzkgaan9ylwuhs7k7qz753uk", "amount": [{"denom": "stake", "amount": "5000"}]}"#.to_string()], None); let packet_data = packet_from_string.data; - let cosmos_tx: TestCosmosTx = from_binary(&Binary(packet_data)).unwrap(); + let cosmos_tx: TestCosmosTx = from_json(&Binary(packet_data)).unwrap(); let expected = ExampleCosmosMessages::MsgSend { from_address: "cosmos15ulrf36d4wdtrtqzkgaan9ylwuhs7k7qz753uk".to_string(), @@ -163,7 +163,7 @@ mod tests { 123, 34, 114, 101, 115, 117, 108, 116, 34, 58, 34, 99, 51, 86, 106, 89, 50, 86, 122, 99, 119, 61, 61, 34, 125, ]); - let ack: AcknowledgementData = from_binary(&cw_success_binary).unwrap(); + let ack: AcknowledgementData = from_json(&cw_success_binary).unwrap(); assert_eq!( ack, AcknowledgementData::Result(Binary::from_base64("c3VjY2Vzcw==").unwrap()) @@ -173,7 +173,7 @@ mod tests { let error_bytes = br#"{"error":"ABCI code: 1: error handling packet: see events for details"}"#; let cw_error_binary = Binary(error_bytes.to_vec()); - let ack: AcknowledgementData = from_binary(&cw_error_binary).unwrap(); + let ack: AcknowledgementData = from_json(&cw_error_binary).unwrap(); assert_eq!( ack, AcknowledgementData::Error( diff --git a/src/types/callbacks.rs b/src/types/callbacks.rs index 6ab48ea3..45736a5c 100644 --- a/src/types/callbacks.rs +++ b/src/types/callbacks.rs @@ -4,7 +4,9 @@ //! channel and packet lifecycle events. use cosmwasm_schema::cw_serde; -use cosmwasm_std::{to_binary, Addr, Binary, CosmosMsg, IbcChannel, IbcPacket, StdResult, WasmMsg}; +use cosmwasm_std::{ + to_json_binary, Addr, Binary, CosmosMsg, IbcChannel, IbcPacket, StdResult, WasmMsg, +}; use crate::ibc::types::{metadata::TxEncoding, packet::acknowledgement::AcknowledgementData}; @@ -43,9 +45,9 @@ pub enum IcaControllerCallbackMsg { impl IcaControllerCallbackMsg { /// serializes the message - pub fn into_binary(self) -> StdResult { + pub fn into_json_binary(self) -> StdResult { let msg = ReceiverExecuteMsg::ReceiveIcaCallback(self); - to_binary(&msg) + to_json_binary(&msg) } /// into_cosmos_msg converts this message into a WasmMsg::Execute message to be sent to the @@ -56,7 +58,7 @@ impl IcaControllerCallbackMsg { { let execute = WasmMsg::Execute { contract_addr: contract_addr.into(), - msg: self.into_binary()?, + msg: self.into_json_binary()?, funds: vec![], }; diff --git a/src/types/state.rs b/src/types/state.rs index cd75c9ea..d4bef8a5 100644 --- a/src/types/state.rs +++ b/src/types/state.rs @@ -257,9 +257,9 @@ mod tests { ica_info: None, }; - let serialized = cosmwasm_std::to_binary(&mock_state).unwrap(); + let serialized = cosmwasm_std::to_json_binary(&mock_state).unwrap(); - let deserialized: v0_1_3::ContractState = cosmwasm_std::from_binary(&serialized).unwrap(); + let deserialized: v0_1_3::ContractState = cosmwasm_std::from_json(&serialized).unwrap(); let exp_state = v0_1_3::ContractState { admin: Addr::unchecked("admin"), @@ -278,9 +278,9 @@ mod tests { allow_channel_open_init: false, }; - let serialized = cosmwasm_std::to_binary(&mock_state).unwrap(); + let serialized = cosmwasm_std::to_json_binary(&mock_state).unwrap(); - let deserialized: ContractState = cosmwasm_std::from_binary(&serialized).unwrap(); + let deserialized: ContractState = cosmwasm_std::from_json(&serialized).unwrap(); let exp_state = ContractState { admin: Addr::unchecked("admin"), diff --git a/testing/contracts/cw-ica-owner/Cargo.lock b/testing/contracts/cw-ica-owner/Cargo.lock index 062eef47..bfb27777 100644 --- a/testing/contracts/cw-ica-owner/Cargo.lock +++ b/testing/contracts/cw-ica-owner/Cargo.lock @@ -180,7 +180,7 @@ dependencies = [ "hex", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 0.5.1", "sha2 0.10.8", "static_assertions", "thiserror", @@ -254,7 +254,7 @@ dependencies = [ "schemars", "semver", "serde", - "serde-json-wasm", + "serde-json-wasm 1.0.0", "thiserror", ] @@ -271,7 +271,7 @@ dependencies = [ "cw2", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 0.5.1", "thiserror", ] @@ -901,6 +901,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde-json-wasm" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c37d03f3b0f6b5f77c11af1e7c772de1c9af83e50bef7bb6069601900ba67b" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.12"