From 2b6e2cf70f42ddc73282ca3281a5e2abfadd44a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wo=C5=BAniak?= Date: Thu, 19 Dec 2024 12:44:16 +0100 Subject: [PATCH] chore: Update cosmwasm to version 2.2 --- Cargo.lock | 72 ++++++++++++++++++++++++------------- Cargo.toml | 8 ++--- examples/Cargo.lock | 88 ++++++++++++++++++++++++++++----------------- examples/Cargo.toml | 4 +-- sylvia/Cargo.toml | 3 +- 5 files changed, 112 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32f925c9..134eaeaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,21 +227,22 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cabbba3cbcf1ebdf61c782509916657a3b4e079ed68cb3ec38866f9ecb492ba4" +checksum = "c34c440d4d8e3ecec783d0f9c89d25565168b0f4cdb80a1f6a387cf2168c0740" [[package]] name = "cosmwasm-crypto" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58587c713490d96f92c36584dcb29f324df58907d9185f762b71ac2b08ac07eb" +checksum = "134e765161d60228cc27635032d2a466542ca83fd6c87f3c87f4963c0bd51008" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ff", "ark-serialize", "cosmwasm-core", + "curve25519-dalek", "digest", "ecdsa", "ed25519-zebra", @@ -256,9 +257,9 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae47fa8399bfe9a5b92a6312a1144912231fa1665759562dddb0497c1c917712" +checksum = "3c94a4b93e722c91d2e58471cfe69480f4a656cfccacd8bfda5638f2a5d4512b" dependencies = [ "proc-macro2", "quote", @@ -267,9 +268,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7f53fb0011af2ce8d79379ff21a34cd90622e387ebaa00920bac1099ea71d1" +checksum = "3e9a7b56d154870ec4b57b224509854f706c9744449548d8a3bf91ac75c59192" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -280,9 +281,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae75370266380e777f075be5a0e092792af69469ed1231825505f9c4bd17e54" +checksum = "edd3d80310cd7b86b09dbe886f4f2ca235a5ddb8d478493c6e50e720a3b38a42" dependencies = [ "proc-macro2", "quote", @@ -291,9 +292,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5165aa666dfa923b480babec2ddba16ab91617179d9fb404dfb600c3f0733cef" +checksum = "4434e556b0aebff34bf082e75d175b5d7edbcf1d90d4cedb59623a1249fff567" dependencies = [ "base64", "bech32", @@ -304,6 +305,7 @@ dependencies = [ "derive_more", "hex", "rand_core", + "rmp-serde", "schemars", "serde", "serde-json-wasm", @@ -412,7 +414,7 @@ dependencies = [ "schemars", "serde", "sha2", - "thiserror 2.0.6", + "thiserror 2.0.8", ] [[package]] @@ -949,6 +951,28 @@ dependencies = [ "subtle", ] +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -1009,9 +1033,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] @@ -1036,9 +1060,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -1127,7 +1151,7 @@ dependencies = [ "serde-cw-value", "serde-json-wasm", "sylvia-derive", - "thiserror 2.0.6", + "thiserror 2.0.8", "trybuild", ] @@ -1150,7 +1174,7 @@ dependencies = [ "sylvia", "sylvia-runtime-macros", "syn 2.0.90", - "thiserror 2.0.6", + "thiserror 2.0.8", ] [[package]] @@ -1212,11 +1236,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.6" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" dependencies = [ - "thiserror-impl 2.0.6", + "thiserror-impl 2.0.8", ] [[package]] @@ -1232,9 +1256,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.6" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 54173298..7415e539 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,15 +8,15 @@ version = "1.3.3" [workspace.dependencies] anyhow = "1.0.94" -cosmwasm-schema = "2.1.5" -cosmwasm-std = "2.1.5" +cosmwasm-schema = "2.2.0" +cosmwasm-std = "2.2.0" cw-multi-test = "2.2.0" cw-storage-plus = "2.0.0" cw-utils = "2.0.0" schemars = "0.8.21" -serde = { version = "1.0.215", default-features = false, features = ["derive"] } +serde = { version = "1.0.216", default-features = false, features = ["derive"] } sylvia-derive = { version = "1.3.3", path = "sylvia-derive" } -thiserror = "2.0.6" +thiserror = "2.0.8" [workspace.metadata.docs.rs] all-features = true diff --git a/examples/Cargo.lock b/examples/Cargo.lock index 77c70f58..c50a2859 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -233,21 +233,22 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cabbba3cbcf1ebdf61c782509916657a3b4e079ed68cb3ec38866f9ecb492ba4" +checksum = "c34c440d4d8e3ecec783d0f9c89d25565168b0f4cdb80a1f6a387cf2168c0740" [[package]] name = "cosmwasm-crypto" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58587c713490d96f92c36584dcb29f324df58907d9185f762b71ac2b08ac07eb" +checksum = "134e765161d60228cc27635032d2a466542ca83fd6c87f3c87f4963c0bd51008" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ff", "ark-serialize", "cosmwasm-core", + "curve25519-dalek", "digest", "ecdsa", "ed25519-zebra", @@ -262,9 +263,9 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae47fa8399bfe9a5b92a6312a1144912231fa1665759562dddb0497c1c917712" +checksum = "3c94a4b93e722c91d2e58471cfe69480f4a656cfccacd8bfda5638f2a5d4512b" dependencies = [ "proc-macro2", "quote", @@ -273,9 +274,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7f53fb0011af2ce8d79379ff21a34cd90622e387ebaa00920bac1099ea71d1" +checksum = "3e9a7b56d154870ec4b57b224509854f706c9744449548d8a3bf91ac75c59192" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -286,9 +287,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae75370266380e777f075be5a0e092792af69469ed1231825505f9c4bd17e54" +checksum = "edd3d80310cd7b86b09dbe886f4f2ca235a5ddb8d478493c6e50e720a3b38a42" dependencies = [ "proc-macro2", "quote", @@ -297,9 +298,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5165aa666dfa923b480babec2ddba16ab91617179d9fb404dfb600c3f0733cef" +checksum = "4434e556b0aebff34bf082e75d175b5d7edbcf1d90d4cedb59623a1249fff567" dependencies = [ "base64", "bech32", @@ -310,6 +311,7 @@ dependencies = [ "derive_more", "hex", "rand_core", + "rmp-serde", "schemars", "serde", "serde-json-wasm", @@ -434,7 +436,7 @@ dependencies = [ "schemars", "serde", "sha2", - "thiserror 2.0.4", + "thiserror 2.0.8", ] [[package]] @@ -478,7 +480,7 @@ dependencies = [ "cw1-whitelist", "cw2", "sylvia", - "thiserror 2.0.4", + "thiserror 2.0.8", "whitelist", ] @@ -491,7 +493,7 @@ dependencies = [ "cw1", "cw2", "sylvia", - "thiserror 2.0.4", + "thiserror 2.0.8", "whitelist", ] @@ -531,7 +533,7 @@ dependencies = [ "cw20-minting", "semver", "sylvia", - "thiserror 2.0.4", + "thiserror 2.0.8", ] [[package]] @@ -759,7 +761,7 @@ dependencies = [ "cw1", "generic", "sylvia", - "thiserror 2.0.4", + "thiserror 2.0.8", ] [[package]] @@ -872,9 +874,9 @@ dependencies = [ [[package]] name = "konst" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f00fb3910881e52bf0850ae2a82aea411488a557e1c02820ceaa60963dce3" +checksum = "298ddf99f06a97c1ecd0e910932662b7842855046234b0d0376d35d93add087f" dependencies = [ "const_panic", "konst_kernel", @@ -884,9 +886,9 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599c1232f55c72c7fc378335a3efe1c878c92720838c8e6a4fd87784ef7764de" +checksum = "e4b1eb7788f3824c629b1116a7a9060d6e898c358ebff59070093d51103dcc3c" dependencies = [ "typewit", ] @@ -1112,6 +1114,28 @@ dependencies = [ "subtle", ] +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -1166,15 +1190,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] @@ -1199,9 +1223,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -1327,11 +1351,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.4" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" dependencies = [ - "thiserror-impl 2.0.4", + "thiserror-impl 2.0.8", ] [[package]] @@ -1347,9 +1371,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.4" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" dependencies = [ "proc-macro2", "quote", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 8a8ef011..8f1e34be 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -31,6 +31,6 @@ sylvia = { path = "../sylvia" } cw-storage-plus = "2.0.0" cw-utils = "2.0.0" cw2 = "2.0.0" -semver = "1.0.23" -thiserror = "2.0.0" +semver = "1.0.24" +thiserror = "2.0.8" assert_matches = "1.5.0" diff --git a/sylvia/Cargo.toml b/sylvia/Cargo.toml index 5e52f57b..7a7427a8 100644 --- a/sylvia/Cargo.toml +++ b/sylvia/Cargo.toml @@ -42,6 +42,7 @@ cosmwasm_2_1 = [ "cw-multi-test/cosmwasm_2_1", "cosmwasm_2_0", ] +cosmwasm_2_2 = ["cosmwasm-std/cosmwasm_2_2", "cosmwasm_2_1"] [dependencies] sylvia-derive = { workspace = true } @@ -51,7 +52,7 @@ schemars = { workspace = true } serde = { workspace = true } serde-cw-value = "0.7.0" serde-json-wasm = "1.0.1" -konst = "0.3.11" +konst = "0.3.15" cw-multi-test = { workspace = true, features = ["staking"], optional = true } anyhow = { workspace = true, optional = true } cw-utils = { workspace = true }