From 3eb94fbff82c59bd2ccf040e279108a411f2c79a Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 5 Jun 2023 15:03:21 +0200 Subject: [PATCH 01/26] Bump module serialization version --- packages/vm/src/modules/file_system_cache.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs index 95b1a3e288..6fcdbc1af4 100644 --- a/packages/vm/src/modules/file_system_cache.rs +++ b/packages/vm/src/modules/file_system_cache.rs @@ -39,7 +39,11 @@ use crate::modules::current_wasmer_module_version; /// the module header version (). In cosmwasm-vm 1.1.0-1.1.1 /// the old value "v3" is still used along with Wasmer 2.3.0 (bug). From cosmwasm 1.1.2 onwards, this is /// fixed by bumping to "v4". -const MODULE_SERIALIZATION_VERSION: &str = "v4"; +/// - **v5**:
+/// A change in memory layout of some types in Rust [std] caused +/// [issues with module deserialization](https://github.com/CosmWasm/wasmvm/issues/426). +/// To work around this, the version was bumped to "v5" here to invalidate these corrupt caches. +const MODULE_SERIALIZATION_VERSION: &str = "v5"; /// Representation of a directory that contains compiled Wasm artifacts. pub struct FileSystemCache { From 0f909291ede7d82926c0bb24199ad623c0a06e51 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 5 Jun 2023 15:08:11 +0200 Subject: [PATCH 02/26] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14215138d7..833c135b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to ## [Unreleased] +- cosmwasm-vm: Bumped serialization version number to invalidate corrupt caches + caused by Rust update ([#1708]) + +[#1708]: https://github.com/CosmWasm/cosmwasm/pull/1708 + ## [1.2.5] - 2023-05-02 ### Added From 539909673901c423572eab9c904a27f903a618f8 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 5 Jun 2023 15:15:11 +0200 Subject: [PATCH 03/26] Fix test --- packages/vm/src/modules/file_system_cache.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs index 6fcdbc1af4..e5041a9900 100644 --- a/packages/vm/src/modules/file_system_cache.rs +++ b/packages/vm/src/modules/file_system_cache.rs @@ -240,7 +240,7 @@ mod tests { cache.store(&checksum, &module).unwrap(); let file_path = format!( - "{}/v4-wasmer1/{}", + "{}/v5-wasmer1/{}", tmp_dir.path().to_string_lossy(), checksum ); From 90084792ba2ea199fcc30ccab4793e2ffbffe201 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 5 Jun 2023 15:38:10 +0200 Subject: [PATCH 04/26] Improve CHANGELOG text --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 833c135b3e..ddf9998211 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,9 @@ and this project adheres to ## [Unreleased] -- cosmwasm-vm: Bumped serialization version number to invalidate corrupt caches - caused by Rust update ([#1708]) +- cosmwasm-vm: Bumped module serialization version from v4 to v5 to invalidate + potentially corrupted caches caused by Rust update. See + https://github.com/CosmWasm/wasmvm/issues/426 for more information. ([#1708]) [#1708]: https://github.com/CosmWasm/cosmwasm/pull/1708 From 054e599a9bd93bfbecc66e8dd83fa1e7925b6004 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 5 Jun 2023 16:09:03 +0200 Subject: [PATCH 05/26] Set version: 1.2.6 --- Cargo.lock | 16 ++++++++-------- contracts/burner/Cargo.lock | 12 ++++++------ contracts/crypto-verify/Cargo.lock | 14 +++++++------- contracts/cyberpunk/Cargo.lock | 14 +++++++------- contracts/floaty/Cargo.lock | 14 +++++++------- contracts/hackatom/Cargo.lock | 14 +++++++------- contracts/ibc-reflect-send/Cargo.lock | 14 +++++++------- contracts/ibc-reflect/Cargo.lock | 14 +++++++------- contracts/queue/Cargo.lock | 12 ++++++------ contracts/reflect/Cargo.lock | 14 +++++++------- contracts/staking/Cargo.lock | 14 +++++++------- contracts/virus/Cargo.lock | 12 ++++++------ packages/check/Cargo.toml | 6 +++--- packages/crypto/Cargo.toml | 2 +- packages/derive/Cargo.toml | 2 +- packages/schema-derive/Cargo.toml | 2 +- packages/schema/Cargo.toml | 6 +++--- packages/std/Cargo.toml | 6 +++--- packages/storage/Cargo.toml | 4 ++-- packages/vm/Cargo.toml | 6 +++--- 20 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c606750c3..82127650ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,7 +285,7 @@ dependencies = [ [[package]] name = "cosmwasm-check" -version = "1.2.5" +version = "1.2.6" dependencies = [ "anyhow", "clap 2.34.0", @@ -296,7 +296,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "criterion", @@ -315,7 +315,7 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "syn", @@ -323,7 +323,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "anyhow", "cosmwasm-schema-derive", @@ -338,7 +338,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -347,7 +347,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "chrono", @@ -369,7 +369,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock index e917f2e4e8..f63e26daa0 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -185,14 +185,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -203,7 +203,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -212,7 +212,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index 7cc1a4fdcb..b8c9d3d4ed 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -169,7 +169,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -180,14 +180,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -198,7 +198,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -207,7 +207,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -233,7 +233,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock index 1e9ed90732..8bb18ba5aa 100644 --- a/contracts/cyberpunk/Cargo.lock +++ b/contracts/cyberpunk/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -203,14 +203,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -221,7 +221,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -248,7 +248,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -256,7 +256,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index e1e9d89c35..36eb594473 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index e8707552a1..226ce03e09 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index 9e708b2477..bbce14b49d 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index 50ebaa8cb5..4029d0861a 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock index 03e20b46bb..0a40946789 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index 905fe4f613..b1249758bd 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index b444477167..8480b75873 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock index a63e69743b..5100789584 100644 --- a/contracts/virus/Cargo.lock +++ b/contracts/virus/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" dependencies = [ "bitflags", "bytecheck", diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml index c046e1b39b..bcdb3cfb43 100644 --- a/packages/check/Cargo.toml +++ b/packages/check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-check" -version = "1.2.5" +version = "1.2.6" authors = ["Mauro Lacy "] edition = "2021" description = "A CLI tool for verifying CosmWasm smart contracts" @@ -11,5 +11,5 @@ license = "Apache-2.0" anyhow = "1.0.57" clap = "2" colored = "2" -cosmwasm-vm = { path = "../vm", version = "1.2.5" } -cosmwasm-std = { path = "../std", version = "1.2.5" } +cosmwasm-vm = { path = "../vm", version = "1.2.6" } +cosmwasm-std = { path = "../std", version = "1.2.6" } diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml index 7d79ed54ff..8b59fbd523 100644 --- a/packages/crypto/Cargo.toml +++ b/packages/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-crypto" -version = "1.2.5" +version = "1.2.6" authors = ["Mauro Lacy "] edition = "2021" description = "Crypto bindings for cosmwasm contracts" diff --git a/packages/derive/Cargo.toml b/packages/derive/Cargo.toml index b0909ec357..163b1b6f72 100644 --- a/packages/derive/Cargo.toml +++ b/packages/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-derive" -version = "1.2.5" +version = "1.2.6" authors = ["Simon Warta "] edition = "2021" description = "A package for auto-generated code used for CosmWasm contract development. This is shipped as part of cosmwasm-std. Do not use directly." diff --git a/packages/schema-derive/Cargo.toml b/packages/schema-derive/Cargo.toml index 7f3b53933e..0bfff7580e 100644 --- a/packages/schema-derive/Cargo.toml +++ b/packages/schema-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-schema-derive" -version = "1.2.5" +version = "1.2.6" authors = ["Tomasz Kurcz "] edition = "2021" description = "Derive macros for cosmwasm-schema" diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml index 91ced79a03..59d708ce58 100644 --- a/packages/schema/Cargo.toml +++ b/packages/schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-schema" -version = "1.2.5" +version = "1.2.6" authors = ["Simon Warta ", "Ethan Frey "] edition = "2021" description = "A dev-dependency for CosmWasm contracts to generate JSON Schema files." @@ -8,7 +8,7 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/schema" license = "Apache-2.0" [dependencies] -cosmwasm-schema-derive = { version = "=1.2.5", path = "../schema-derive" } +cosmwasm-schema-derive = { version = "=1.2.6", path = "../schema-derive" } schemars = "0.8.3" serde = "1.0" serde_json = "1.0.40" @@ -16,6 +16,6 @@ thiserror = "1.0.26" [dev-dependencies] anyhow = "1.0.57" -cosmwasm-std = { version = "1.2.5", path = "../std" } +cosmwasm-std = { version = "1.2.6", path = "../std" } semver = "1" tempfile = "3" diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index 2629690783..8aa895b4d8 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-std" -version = "1.2.5" +version = "1.2.6" authors = ["Ethan Frey "] edition = "2021" description = "Standard library for Wasm based smart contracts on Cosmos blockchains" @@ -42,7 +42,7 @@ cosmwasm_1_2 = ["cosmwasm_1_1"] [dependencies] base64 = "0.13.0" -cosmwasm-derive = { path = "../derive", version = "1.2.5" } +cosmwasm-derive = { path = "../derive", version = "1.2.6" } derivative = "2" forward_ref = "1" hex = "0.4" @@ -54,7 +54,7 @@ thiserror = "1.0.26" uint = "0.9.3" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -cosmwasm-crypto = { path = "../crypto", version = "1.2.5" } +cosmwasm-crypto = { path = "../crypto", version = "1.2.6" } [dev-dependencies] cosmwasm-schema = { path = "../schema" } diff --git a/packages/storage/Cargo.toml b/packages/storage/Cargo.toml index 78ba760f7b..4c09e83214 100644 --- a/packages/storage/Cargo.toml +++ b/packages/storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-storage" -version = "1.2.5" +version = "1.2.6" authors = ["Ethan Frey "] edition = "2021" description = "CosmWasm library with useful helpers for Storage patterns" @@ -16,5 +16,5 @@ iterator = ["cosmwasm-std/iterator"] [dependencies] # Uses the path when built locally; uses the given version from crates.io when published -cosmwasm-std = { path = "../std", version = "1.2.5", default-features = false } +cosmwasm-std = { path = "../std", version = "1.2.6", default-features = false } serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] } diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index fbedf06b69..73f1c30b0c 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-vm" -version = "1.2.5" +version = "1.2.6" authors = ["Ethan Frey "] edition = "2021" description = "VM bindings to run cosmwams contracts" @@ -41,8 +41,8 @@ required-features = ["iterator"] [dependencies] clru = "0.4.0" # Uses the path when built locally; uses the given version from crates.io when published -cosmwasm-std = { path = "../std", version = "1.2.5", default-features = false } -cosmwasm-crypto = { path = "../crypto", version = "1.2.5" } +cosmwasm-std = { path = "../std", version = "1.2.6", default-features = false } +cosmwasm-crypto = { path = "../crypto", version = "1.2.6" } hex = "0.4" parity-wasm = "0.42" schemars = "0.8.3" From 3016c2d9cba4b18ac24b27b0e1245e47dd26ff3a Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 5 Jun 2023 16:11:35 +0200 Subject: [PATCH 06/26] Update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddf9998211..c7d36929d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to ## [Unreleased] +## [1.2.6] - 2023-06-05 + +## Changed + - cosmwasm-vm: Bumped module serialization version from v4 to v5 to invalidate potentially corrupted caches caused by Rust update. See https://github.com/CosmWasm/wasmvm/issues/426 for more information. ([#1708]) @@ -1691,7 +1695,8 @@ Some main points: All future Changelog entries will reference this base -[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.5...HEAD +[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.6...HEAD +[1.2.6]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.5...v1.2.6 [1.2.5]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.4...v1.2.5 [1.2.4]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.3...v1.2.4 [1.2.3]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.2...v1.2.3 From ffd83bedfe288c56ebc74ea474910ca17ae56c1c Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Wed, 14 Jun 2023 14:05:56 +0200 Subject: [PATCH 07/26] Avoid Vec allocation --- packages/std/src/math/uint512.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/std/src/math/uint512.rs b/packages/std/src/math/uint512.rs index 73a0512f26..73f33d2fae 100644 --- a/packages/std/src/math/uint512.rs +++ b/packages/std/src/math/uint512.rs @@ -325,9 +325,10 @@ impl Uint512 { impl From for Uint512 { fn from(val: Uint256) -> Self { - let bytes = [[0u8; 32], val.to_be_bytes()].concat(); + let mut bytes = [0u8; 64]; + bytes[32..].copy_from_slice(&val.to_be_bytes()); - Self::from_be_bytes(bytes.try_into().unwrap()) + Self::from_be_bytes(bytes) } } From 189b45fe1f680b92fad974cd073c06afcc5e3286 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Wed, 14 Jun 2023 17:06:32 +0200 Subject: [PATCH 08/26] Implement left shift for all ints --- packages/std/src/math/uint128.rs | 51 +++++++++++++++++++++++++++++++- packages/std/src/math/uint256.rs | 24 ++++++++++----- packages/std/src/math/uint512.rs | 40 ++++++++++++++++++++++++- packages/std/src/math/uint64.rs | 35 +++++++++++++++++++++- 4 files changed, 139 insertions(+), 11 deletions(-) diff --git a/packages/std/src/math/uint128.rs b/packages/std/src/math/uint128.rs index 319ea92525..68061fd998 100644 --- a/packages/std/src/math/uint128.rs +++ b/packages/std/src/math/uint128.rs @@ -1,6 +1,7 @@ use std::fmt::{self}; use std::ops::{ - Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shr, ShrAssign, Sub, SubAssign, + Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, + Sub, SubAssign, }; use std::str::FromStr; @@ -197,6 +198,22 @@ impl Uint128 { .ok_or_else(|| DivideByZeroError::new(self)) } + pub fn checked_shr(self, other: u32) -> Result { + if other >= 512 { + return Err(OverflowError::new(OverflowOperation::Shr, self, other)); + } + + Ok(Self(self.0.shr(other))) + } + + pub fn checked_shl(self, other: u32) -> Result { + if other >= 512 { + return Err(OverflowError::new(OverflowOperation::Shl, self, other)); + } + + Ok(Self(self.0.shl(other))) + } + #[must_use = "this returns the result of the operation, without modifying the original"] #[inline] pub fn wrapping_add(self, other: Self) -> Self { @@ -441,6 +458,26 @@ impl<'a> Shr<&'a u32> for Uint128 { } } +impl Shl for Uint128 { + type Output = Self; + + fn shl(self, rhs: u32) -> Self::Output { + Self( + self.u128() + .checked_shl(rhs) + .expect("attempt to shift left with overflow"), + ) + } +} + +impl<'a> Shl<&'a u32> for Uint128 { + type Output = Self; + + fn shl(self, rhs: &'a u32) -> Self::Output { + self.shl(*rhs) + } +} + impl AddAssign for Uint128 { fn add_assign(&mut self, rhs: Uint128) { *self = *self + rhs; @@ -497,6 +534,18 @@ impl<'a> ShrAssign<&'a u32> for Uint128 { } } +impl ShlAssign for Uint128 { + fn shl_assign(&mut self, rhs: u32) { + *self = Shl::::shl(*self, rhs); + } +} + +impl<'a> ShlAssign<&'a u32> for Uint128 { + fn shl_assign(&mut self, rhs: &'a u32) { + *self = Shl::::shl(*self, *rhs); + } +} + impl Serialize for Uint128 { /// Serializes as an integer string using base 10 fn serialize(&self, serializer: S) -> Result diff --git a/packages/std/src/math/uint256.rs b/packages/std/src/math/uint256.rs index 201342e387..ef140bbc84 100644 --- a/packages/std/src/math/uint256.rs +++ b/packages/std/src/math/uint256.rs @@ -3,8 +3,8 @@ use schemars::JsonSchema; use serde::{de, ser, Deserialize, Deserializer, Serialize}; use std::fmt; use std::ops::{ - Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, Shr, ShrAssign, Sub, - SubAssign, + Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, + Sub, SubAssign, }; use std::str::FromStr; @@ -575,12 +575,8 @@ impl Shl for Uint256 { type Output = Self; fn shl(self, rhs: u32) -> Self::Output { - self.checked_shl(rhs).unwrap_or_else(|_| { - panic!( - "left shift error: {} is larger or equal than the number of bits in Uint256", - rhs, - ) - }) + self.checked_shl(rhs) + .expect("attempt to shift left with overflow") } } @@ -628,6 +624,18 @@ impl<'a> ShrAssign<&'a u32> for Uint256 { } } +impl ShlAssign for Uint256 { + fn shl_assign(&mut self, rhs: u32) { + *self = self.shl(rhs); + } +} + +impl<'a> ShlAssign<&'a u32> for Uint256 { + fn shl_assign(&mut self, rhs: &'a u32) { + *self = self.shl(*rhs); + } +} + impl Serialize for Uint256 { /// Serializes as an integer string using base 10 fn serialize(&self, serializer: S) -> Result diff --git a/packages/std/src/math/uint512.rs b/packages/std/src/math/uint512.rs index 73a0512f26..36523c9900 100644 --- a/packages/std/src/math/uint512.rs +++ b/packages/std/src/math/uint512.rs @@ -3,7 +3,8 @@ use schemars::JsonSchema; use serde::{de, ser, Deserialize, Deserializer, Serialize}; use std::fmt; use std::ops::{ - Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shr, ShrAssign, Sub, SubAssign, + Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, + Sub, SubAssign, }; use std::str::FromStr; @@ -262,6 +263,14 @@ impl Uint512 { Ok(Self(self.0.shr(other))) } + pub fn checked_shl(self, other: u32) -> Result { + if other >= 512 { + return Err(OverflowError::new(OverflowOperation::Shl, self, other)); + } + + Ok(Self(self.0.shl(other))) + } + #[must_use = "this returns the result of the operation, without modifying the original"] #[inline] pub fn wrapping_add(self, other: Self) -> Self { @@ -542,6 +551,23 @@ impl<'a> Shr<&'a u32> for Uint512 { } } +impl Shl for Uint512 { + type Output = Self; + + fn shl(self, rhs: u32) -> Self::Output { + self.checked_shl(rhs) + .expect("attempt to shift left with overflow") + } +} + +impl<'a> Shl<&'a u32> for Uint512 { + type Output = Self; + + fn shl(self, rhs: &'a u32) -> Self::Output { + self.shl(*rhs) + } +} + impl AddAssign for Uint512 { fn add_assign(&mut self, rhs: Uint512) { self.0 = self.0.checked_add(rhs.0).unwrap(); @@ -578,6 +604,18 @@ impl<'a> ShrAssign<&'a u32> for Uint512 { } } +impl ShlAssign for Uint512 { + fn shl_assign(&mut self, rhs: u32) { + *self = self.shl(rhs); + } +} + +impl<'a> ShlAssign<&'a u32> for Uint512 { + fn shl_assign(&mut self, rhs: &'a u32) { + *self = self.shl(*rhs); + } +} + impl Serialize for Uint512 { /// Serializes as an integer string using base 10 fn serialize(&self, serializer: S) -> Result diff --git a/packages/std/src/math/uint64.rs b/packages/std/src/math/uint64.rs index e7a50339c0..37b7dcb9c4 100644 --- a/packages/std/src/math/uint64.rs +++ b/packages/std/src/math/uint64.rs @@ -3,7 +3,8 @@ use schemars::JsonSchema; use serde::{de, ser, Deserialize, Deserializer, Serialize}; use std::fmt::{self}; use std::ops::{ - Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shr, ShrAssign, Sub, SubAssign, + Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, + Sub, SubAssign, }; use crate::errors::{ @@ -412,6 +413,26 @@ impl<'a> Shr<&'a u32> for Uint64 { } } +impl Shl for Uint64 { + type Output = Self; + + fn shl(self, rhs: u32) -> Self::Output { + Self( + self.u64() + .checked_shl(rhs) + .expect("attempt to shift left with overflow"), + ) + } +} + +impl<'a> Shl<&'a u32> for Uint64 { + type Output = Self; + + fn shl(self, rhs: &'a u32) -> Self::Output { + self.shl(*rhs) + } +} + impl AddAssign for Uint64 { fn add_assign(&mut self, rhs: Uint64) { self.0 = self.0.checked_add(rhs.u64()).unwrap(); @@ -448,6 +469,18 @@ impl<'a> ShrAssign<&'a u32> for Uint64 { } } +impl ShlAssign for Uint64 { + fn shl_assign(&mut self, rhs: u32) { + *self = self.shl(rhs); + } +} + +impl<'a> ShlAssign<&'a u32> for Uint64 { + fn shl_assign(&mut self, rhs: &'a u32) { + *self = self.shl(*rhs); + } +} + impl Serialize for Uint64 { /// Serializes as an integer string using base 10 fn serialize(&self, serializer: S) -> Result From b730f4b237a9ebdd076ca0537a2e3c24683f3984 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 15 Jun 2023 12:46:36 +0200 Subject: [PATCH 09/26] Add check trait for shift operations --- packages/std/src/math/mod.rs | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/std/src/math/mod.rs b/packages/std/src/math/mod.rs index 706d23005d..72e55d9f1d 100644 --- a/packages/std/src/math/mod.rs +++ b/packages/std/src/math/mod.rs @@ -21,7 +21,7 @@ mod tests { use super::*; use std::ops::*; - /// An trait that ensures other traits are implemented for our number types + /// A trait that ensures other traits are implemented for our number types trait AllImpl<'a>: Add + Add<&'a Self> @@ -50,10 +50,28 @@ mod tests { { } + /// A trait that ensures other traits are implemented for our integer types + trait IntImpl<'a>: + AllImpl<'a> + + Shl + + Shl<&'a u32> + + ShlAssign + + ShlAssign<&'a u32> + + Shr + + Shr<&'a u32> + + ShrAssign + + ShrAssign<&'a u32> + { + } + impl AllImpl<'_> for Uint64 {} impl AllImpl<'_> for Uint128 {} impl AllImpl<'_> for Uint256 {} impl AllImpl<'_> for Uint512 {} + impl IntImpl<'_> for Uint64 {} + impl IntImpl<'_> for Uint128 {} + impl IntImpl<'_> for Uint256 {} + impl IntImpl<'_> for Uint512 {} impl AllImpl<'_> for Decimal {} impl AllImpl<'_> for Decimal256 {} } From 5635657f8b7bb16fa6da283b9025dd7cc813e448 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 15 Jun 2023 13:26:41 +0200 Subject: [PATCH 10/26] Add test for left and right shifts --- packages/std/src/math/uint128.rs | 38 ++++++++++++++++++++++++++++++++ packages/std/src/math/uint256.rs | 21 ++++++++++++++++++ packages/std/src/math/uint512.rs | 25 +++++++++++++++++++++ packages/std/src/math/uint64.rs | 34 ++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) diff --git a/packages/std/src/math/uint128.rs b/packages/std/src/math/uint128.rs index 68061fd998..207f689173 100644 --- a/packages/std/src/math/uint128.rs +++ b/packages/std/src/math/uint128.rs @@ -938,6 +938,44 @@ mod tests { ); } + #[test] + fn uint128_shr_works() { + let original = Uint128::new(u128::from_be_bytes([ + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 2u8, 0u8, 4u8, 2u8, + ])); + + let shifted = Uint128::new(u128::from_be_bytes([ + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 128u8, 1u8, 0u8, + ])); + + assert_eq!(original >> 2u32, shifted); + } + + #[test] + #[should_panic] + fn uint128_shr_overflow_panics() { + let _ = Uint128::from(1u32) >> 128u32; + } + + #[test] + fn uint128_shl_works() { + let original = Uint128::new(u128::from_be_bytes([ + 64u8, 128u8, 1u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ])); + + let shifted = Uint128::new(u128::from_be_bytes([ + 2u8, 0u8, 4u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ])); + + assert_eq!(original << 2u32, shifted); + } + + #[test] + #[should_panic] + fn uint128_shl_overflow_panics() { + let _ = Uint128::from(1u32) << 128u32; + } + #[test] fn sum_works() { let nums = vec![Uint128(17), Uint128(123), Uint128(540), Uint128(82)]; diff --git a/packages/std/src/math/uint256.rs b/packages/std/src/math/uint256.rs index ef140bbc84..e074be4a45 100644 --- a/packages/std/src/math/uint256.rs +++ b/packages/std/src/math/uint256.rs @@ -1504,6 +1504,27 @@ mod tests { let _ = Uint256::from(1u32) >> 256u32; } + #[test] + fn uint256_shl_works() { + let original = Uint256::new([ + 64u8, 128u8, 1u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ]); + + let shifted = Uint256::new([ + 2u8, 0u8, 4u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ]); + + assert_eq!(original << 2u32, shifted); + } + + #[test] + #[should_panic] + fn uint256_shl_overflow_panics() { + let _ = Uint256::from(1u32) << 256u32; + } + #[test] fn sum_works() { let nums = vec![ diff --git a/packages/std/src/math/uint512.rs b/packages/std/src/math/uint512.rs index 36523c9900..16298531ac 100644 --- a/packages/std/src/math/uint512.rs +++ b/packages/std/src/math/uint512.rs @@ -1157,6 +1157,31 @@ mod tests { let _ = Uint512::from(1u32) >> 512u32; } + #[test] + fn uint512_shl_works() { + let original = Uint512::new([ + 64u8, 128u8, 1u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ]); + + let shifted = Uint512::new([ + 2u8, 0u8, 4u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ]); + + assert_eq!(original << 2u32, shifted); + } + + #[test] + #[should_panic] + fn uint512_shl_overflow_panics() { + let _ = Uint512::from(1u32) << 512u32; + } + #[test] fn sum_works() { let nums = vec![ diff --git a/packages/std/src/math/uint64.rs b/packages/std/src/math/uint64.rs index 37b7dcb9c4..a8bfba170d 100644 --- a/packages/std/src/math/uint64.rs +++ b/packages/std/src/math/uint64.rs @@ -833,6 +833,40 @@ mod tests { ); } + #[test] + fn uint64_shr_works() { + let original = Uint64::new(u64::from_be_bytes([0u8, 0u8, 0u8, 0u8, 2u8, 0u8, 4u8, 2u8])); + + let shifted = Uint64::new(u64::from_be_bytes([ + 0u8, 0u8, 0u8, 0u8, 0u8, 128u8, 1u8, 0u8, + ])); + + assert_eq!(original >> 2u32, shifted); + } + + #[test] + #[should_panic] + fn uint64_shr_overflow_panics() { + let _ = Uint64::from(1u32) >> 64u32; + } + + #[test] + fn uint64_shl_works() { + let original = Uint64::new(u64::from_be_bytes([ + 64u8, 128u8, 1u8, 0u8, 0u8, 0u8, 0u8, 0u8, + ])); + + let shifted = Uint64::new(u64::from_be_bytes([2u8, 0u8, 4u8, 0u8, 0u8, 0u8, 0u8, 0u8])); + + assert_eq!(original << 2u32, shifted); + } + + #[test] + #[should_panic] + fn uint64_shl_overflow_panics() { + let _ = Uint64::from(1u32) << 64u32; + } + #[test] fn sum_works() { let nums = vec![Uint64(17), Uint64(123), Uint64(540), Uint64(82)]; From a1c24f97c48aaff8fc1dd47b4c2e2f164ed8795c Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 15 Jun 2023 15:37:44 +0200 Subject: [PATCH 11/26] Fix checked_shr and checked_shl for Uint128 Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> --- packages/std/src/math/uint128.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/std/src/math/uint128.rs b/packages/std/src/math/uint128.rs index 207f689173..9c58c2cc3b 100644 --- a/packages/std/src/math/uint128.rs +++ b/packages/std/src/math/uint128.rs @@ -199,7 +199,7 @@ impl Uint128 { } pub fn checked_shr(self, other: u32) -> Result { - if other >= 512 { + if other >= 128 { return Err(OverflowError::new(OverflowOperation::Shr, self, other)); } @@ -207,7 +207,7 @@ impl Uint128 { } pub fn checked_shl(self, other: u32) -> Result { - if other >= 512 { + if other >= 128 { return Err(OverflowError::new(OverflowOperation::Shl, self, other)); } From e42306dd68f43d2f9120cbdf1ee39d53a144cdd0 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 15 Jun 2023 15:50:08 +0200 Subject: [PATCH 12/26] Add checked_shl and checked_shr to Uint64 --- packages/std/src/math/uint64.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/std/src/math/uint64.rs b/packages/std/src/math/uint64.rs index a8bfba170d..9afd119647 100644 --- a/packages/std/src/math/uint64.rs +++ b/packages/std/src/math/uint64.rs @@ -191,6 +191,22 @@ impl Uint64 { .ok_or_else(|| DivideByZeroError::new(self)) } + pub fn checked_shr(self, other: u32) -> Result { + if other >= 64 { + return Err(OverflowError::new(OverflowOperation::Shr, self, other)); + } + + Ok(Self(self.0.shr(other))) + } + + pub fn checked_shl(self, other: u32) -> Result { + if other >= 64 { + return Err(OverflowError::new(OverflowOperation::Shl, self, other)); + } + + Ok(Self(self.0.shl(other))) + } + #[must_use = "this returns the result of the operation, without modifying the original"] #[inline] pub fn wrapping_add(self, other: Self) -> Self { From d237c58e4bdad448407276c13d76758b2b1ad1db Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 15 Jun 2023 16:56:55 +0200 Subject: [PATCH 13/26] Add changelog entry --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7d36929d7..d461d0fbe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to ## [Unreleased] +## Added + +- cosmwasm-std: Add `<<` and `<<=` implementation for `Uint{64,128,256,512}` + types. ([#1723]) + +[#1723]: https://github.com/CosmWasm/cosmwasm/pull/1723 + ## [1.2.6] - 2023-06-05 ## Changed From 894a8fe71a75613599532e74a629436163b088a4 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 31 May 2023 17:13:40 +0200 Subject: [PATCH 14/26] Coin uses same output for Debug as Display --- packages/std/src/coin.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/std/src/coin.rs b/packages/std/src/coin.rs index 289911deef..dcbcd69c8d 100644 --- a/packages/std/src/coin.rs +++ b/packages/std/src/coin.rs @@ -4,7 +4,7 @@ use std::fmt; use crate::math::Uint128; -#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq, Eq, JsonSchema)] +#[derive(Serialize, Deserialize, Clone, Default, PartialEq, Eq, JsonSchema)] pub struct Coin { pub denom: String, pub amount: Uint128, @@ -19,6 +19,12 @@ impl Coin { } } +impl fmt::Debug for Coin { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{}{}", self.amount, self.denom) + } +} + impl fmt::Display for Coin { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { // We use the formatting without a space between amount and denom, @@ -166,4 +172,10 @@ mod tests { // less than same type assert!(has_coins(&wallet, &coin(777, "ETH"))); } + + #[test] + fn debug_coin() { + let coin = Coin::new(123, "ucosm"); + assert_eq!(format!("{:?}", coin), "123ucosm"); + } } From 65789e6f365a6c6d22ce749a384dae7e025a05f9 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 31 May 2023 17:17:55 +0200 Subject: [PATCH 15/26] Add CHANGELOG entry --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d461d0fbe8..d75a2454bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,16 @@ and this project adheres to [#1723]: https://github.com/CosmWasm/cosmwasm/pull/1723 +### Changed + +- cosmwasm-std: Coin uses `123ucosm` format for Debug as well as Display + ([#1704]) + +[#1704]: https://github.com/CosmWasm/cosmwasm/pull/1704 + ## [1.2.6] - 2023-06-05 -## Changed +### Changed - cosmwasm-vm: Bumped module serialization version from v4 to v5 to invalidate potentially corrupted caches caused by Rust update. See From d1aed08f14be092c0736086e40797b53681f6681 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Tue, 6 Jun 2023 19:32:56 +0200 Subject: [PATCH 16/26] Changed format as per PR review --- CHANGELOG.md | 2 +- packages/std/src/coin.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d75a2454bb..dea29e226a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ and this project adheres to ### Changed -- cosmwasm-std: Coin uses `123ucosm` format for Debug as well as Display +- cosmwasm-std: Coin uses `Coin { 123 "ucosm" }` format for Debug as well as Display ([#1704]) [#1704]: https://github.com/CosmWasm/cosmwasm/pull/1704 diff --git a/packages/std/src/coin.rs b/packages/std/src/coin.rs index dcbcd69c8d..af14644ae5 100644 --- a/packages/std/src/coin.rs +++ b/packages/std/src/coin.rs @@ -21,7 +21,7 @@ impl Coin { impl fmt::Debug for Coin { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{}{}", self.amount, self.denom) + write!(f, "Coin {{ {} \"{}\" }}", self.amount, self.denom) } } @@ -176,6 +176,6 @@ mod tests { #[test] fn debug_coin() { let coin = Coin::new(123, "ucosm"); - assert_eq!(format!("{:?}", coin), "123ucosm"); + assert_eq!(format!("{:?}", coin), r#"Coin { 123 "ucosm" }"#); } } From 5895db02eefd70745dd5c054972d123e3162649c Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Tue, 6 Jun 2023 19:35:45 +0200 Subject: [PATCH 17/26] Fix CHANGELOG formatting --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dea29e226a..c802eef194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ and this project adheres to ### Changed -- cosmwasm-std: Coin uses `Coin { 123 "ucosm" }` format for Debug as well as Display +- cosmwasm-std: Coin uses shorter `Coin { 123 "ucosm" }` format for Debug ([#1704]) [#1704]: https://github.com/CosmWasm/cosmwasm/pull/1704 From f475bfb1b521d1d43373c020dfc45ea296be0ef0 Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Wed, 7 Jun 2023 12:58:04 -0400 Subject: [PATCH 18/26] Add bps conversion to Decimal and Decimal256 --- packages/std/src/math/decimal.rs | 11 +++++++++++ packages/std/src/math/decimal256.rs | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/packages/std/src/math/decimal.rs b/packages/std/src/math/decimal.rs index 3c3842128c..113be3258a 100644 --- a/packages/std/src/math/decimal.rs +++ b/packages/std/src/math/decimal.rs @@ -76,6 +76,11 @@ impl Decimal { Self(((x as u128) * 1_000_000_000_000_000).into()) } + /// Convert bps (basis points) into Decimal + pub fn bps(x: u64) -> Self { + Self(((x as u128) * 100_000_000_000_000).into()) + } + /// Creates a decimal from a number of atomic units and the number /// of decimal places. The inputs will be converted internally to form /// a decimal with 18 decimal places. So the input 123 and 2 will create @@ -768,6 +773,12 @@ mod tests { assert_eq!(value.0, Decimal::DECIMAL_FRACTIONAL / Uint128::from(8u8)); } + #[test] + fn decimal_bps() { + let value = Decimal::bps(125); + assert_eq!(value.0, Decimal::DECIMAL_FRACTIONAL / Uint128::from(80u8)); + } + #[test] fn decimal_from_atomics_works() { let one = Decimal::one(); diff --git a/packages/std/src/math/decimal256.rs b/packages/std/src/math/decimal256.rs index bd6109718a..37371a6c00 100644 --- a/packages/std/src/math/decimal256.rs +++ b/packages/std/src/math/decimal256.rs @@ -85,6 +85,11 @@ impl Decimal256 { Self(Uint256::from(x) * Uint256::from(1_000_000_000_000_000u128)) } + /// Convert bps (basis points) into Decimal256 + pub fn bps(x: u64) -> Self { + Self(Uint256::from(x) * Uint256::from(100_000_000_000_000u128)) + } + /// Creates a decimal from a number of atomic units and the number /// of decimal places. The inputs will be converted internally to form /// a decimal with 18 decimal places. So the input 123 and 2 will create @@ -794,6 +799,12 @@ mod tests { assert_eq!(value.0, Decimal256::DECIMAL_FRACTIONAL / Uint256::from(8u8)); } + #[test] + fn decimal256_bps() { + let value = Decimal256::bps(125); + assert_eq!(value.0, Decimal256::DECIMAL_FRACTIONAL / Uint256::from(80u8)); + } + #[test] fn decimal256_from_atomics_works() { let one = Decimal256::one(); From b5a722eb6f757b0debc627389354ea773f681ddd Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Wed, 7 Jun 2023 13:08:10 -0400 Subject: [PATCH 19/26] Fix formatting --- packages/std/src/math/decimal256.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/std/src/math/decimal256.rs b/packages/std/src/math/decimal256.rs index 37371a6c00..89338ec2dd 100644 --- a/packages/std/src/math/decimal256.rs +++ b/packages/std/src/math/decimal256.rs @@ -802,7 +802,10 @@ mod tests { #[test] fn decimal256_bps() { let value = Decimal256::bps(125); - assert_eq!(value.0, Decimal256::DECIMAL_FRACTIONAL / Uint256::from(80u8)); + assert_eq!( + value.0, + Decimal256::DECIMAL_FRACTIONAL / Uint256::from(80u8) + ); } #[test] From 5705a0ace92b8910ea978239a3d678ddf3796117 Mon Sep 17 00:00:00 2001 From: "shane.stars" Date: Wed, 7 Jun 2023 16:53:41 -0400 Subject: [PATCH 20/26] Update packages/std/src/math/decimal.rs Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> --- packages/std/src/math/decimal.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/std/src/math/decimal.rs b/packages/std/src/math/decimal.rs index 113be3258a..9e4e3424aa 100644 --- a/packages/std/src/math/decimal.rs +++ b/packages/std/src/math/decimal.rs @@ -76,7 +76,7 @@ impl Decimal { Self(((x as u128) * 1_000_000_000_000_000).into()) } - /// Convert bps (basis points) into Decimal + /// Convert basis points (x/10000) into Decimal pub fn bps(x: u64) -> Self { Self(((x as u128) * 100_000_000_000_000).into()) } From 77557857e3c5f9f470647166cbd345ab8599ab09 Mon Sep 17 00:00:00 2001 From: "shane.stars" Date: Wed, 7 Jun 2023 16:53:48 -0400 Subject: [PATCH 21/26] Update packages/std/src/math/decimal256.rs Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> --- packages/std/src/math/decimal256.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/std/src/math/decimal256.rs b/packages/std/src/math/decimal256.rs index 89338ec2dd..157e7397b7 100644 --- a/packages/std/src/math/decimal256.rs +++ b/packages/std/src/math/decimal256.rs @@ -85,7 +85,7 @@ impl Decimal256 { Self(Uint256::from(x) * Uint256::from(1_000_000_000_000_000u128)) } - /// Convert bps (basis points) into Decimal256 + /// Convert basis points (x/10000) into Decimal256 pub fn bps(x: u64) -> Self { Self(Uint256::from(x) * Uint256::from(100_000_000_000_000u128)) } From 2774732be1a1ea9bb05cef46b08897c802831dd0 Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Wed, 7 Jun 2023 17:31:23 -0400 Subject: [PATCH 22/26] Update CHANGELOG --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c802eef194..81552226bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,15 @@ and this project adheres to ## [Unreleased] -## Added +### Added - cosmwasm-std: Add `<<` and `<<=` implementation for `Uint{64,128,256,512}` types. ([#1723]) +- cosmwasm-std: Add `Decimal::bps` and `Decimal256::bps` to create a decimal + from a basis point value ([#1715]). [#1723]: https://github.com/CosmWasm/cosmwasm/pull/1723 +[#1715]: https://github.com/CosmWasm/cosmwasm/pull/1715 ### Changed From 93c9d08902c4855e59435846d529db235ba1ae31 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 16 Jun 2023 14:28:23 +0200 Subject: [PATCH 23/26] Add Timestamp::{plus,minus}_{minutes, hours, days} --- packages/std/src/timestamp.rs | 86 +++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/packages/std/src/timestamp.rs b/packages/std/src/timestamp.rs index a8e4ea8585..61c363e5d7 100644 --- a/packages/std/src/timestamp.rs +++ b/packages/std/src/timestamp.rs @@ -38,6 +38,24 @@ impl Timestamp { Timestamp(Uint64::new(seconds_since_epoch * 1_000_000_000)) } + #[must_use = "this returns the result of the operation, without modifying the original"] + #[inline] + pub const fn plus_days(&self, addition: u64) -> Timestamp { + self.plus_hours(addition * 24) + } + + #[must_use = "this returns the result of the operation, without modifying the original"] + #[inline] + pub const fn plus_hours(&self, addition: u64) -> Timestamp { + self.plus_minutes(addition * 60) + } + + #[must_use = "this returns the result of the operation, without modifying the original"] + #[inline] + pub const fn plus_minutes(&self, addition: u64) -> Timestamp { + self.plus_seconds(addition * 60) + } + #[must_use = "this returns the result of the operation, without modifying the original"] pub const fn plus_seconds(&self, addition: u64) -> Timestamp { self.plus_nanos(addition * 1_000_000_000) @@ -49,6 +67,24 @@ impl Timestamp { Timestamp(nanos) } + #[must_use = "this returns the result of the operation, without modifying the original"] + #[inline] + pub const fn minus_days(&self, subtrahend: u64) -> Timestamp { + self.minus_hours(subtrahend * 24) + } + + #[must_use = "this returns the result of the operation, without modifying the original"] + #[inline] + pub const fn minus_hours(&self, subtrahend: u64) -> Timestamp { + self.minus_minutes(subtrahend * 60) + } + + #[must_use = "this returns the result of the operation, without modifying the original"] + #[inline] + pub const fn minus_minutes(&self, subtrahend: u64) -> Timestamp { + self.minus_seconds(subtrahend * 60) + } + #[must_use = "this returns the result of the operation, without modifying the original"] pub const fn minus_seconds(&self, subtrahend: u64) -> Timestamp { self.minus_nanos(subtrahend * 1_000_000_000) @@ -156,6 +192,56 @@ mod tests { let _earlier = Timestamp::from_nanos(100).minus_nanos(101); } + #[test] + fn timestamp_plus_days() { + let ts = Timestamp::from_seconds(123).plus_days(0); + assert_eq!(ts.0.u64(), 123_000_000_000); + let ts = Timestamp::from_seconds(123).plus_days(10); + assert_eq!(ts.0.u64(), 864_123_000_000_000); + } + + #[test] + fn timestamp_minus_days() { + let ts = Timestamp::from_seconds(123).minus_days(0); + assert_eq!(ts.0.u64(), 123_000_000_000); + let ts = Timestamp::from_seconds(2 * 86400 + 123).minus_days(1); + assert_eq!(ts.0.u64(), 86_523_000_000_000); + let ts = Timestamp::from_seconds(86400).minus_days(1); + assert_eq!(ts.0.u64(), 0); + } + + #[test] + fn timestamp_plus_hours() { + let ts = Timestamp::from_seconds(123).plus_hours(0); + assert_eq!(ts.0.u64(), 123_000_000_000); + let ts = Timestamp::from_seconds(123).plus_hours(2); + assert_eq!(ts.0.u64(), 123_000_000_000 + 60 * 60 * 2 * 1_000_000_000); + } + + #[test] + fn timestamp_minus_hours() { + let ts = Timestamp::from_seconds(2 * 60 * 60).minus_hours(0); + assert_eq!(ts.0.u64(), 2 * 60 * 60 * 1_000_000_000); + let ts = Timestamp::from_seconds(2 * 60 * 60 + 123).minus_hours(1); + assert_eq!(ts.0.u64(), 60 * 60 * 1_000_000_000 + 123_000_000_000); + } + + #[test] + fn timestamp_plus_minutes() { + let ts = Timestamp::from_seconds(123).plus_minutes(0); + assert_eq!(ts.0.u64(), 123_000_000_000); + let ts = Timestamp::from_seconds(123).plus_minutes(2); + assert_eq!(ts.0.u64(), 123_000_000_000 + 60 * 2 * 1_000_000_000); + } + + #[test] + fn timestamp_minus_minutes() { + let ts = Timestamp::from_seconds(5 * 60).minus_minutes(0); + assert_eq!(ts.0.u64(), 5 * 60 * 1_000_000_000); + let ts = Timestamp::from_seconds(5 * 60 + 123).minus_minutes(1); + assert_eq!(ts.0.u64(), 4 * 60 * 1_000_000_000 + 123_000_000_000); + } + #[test] fn timestamp_nanos() { let sum = Timestamp::from_nanos(123); From 075194533405e7787740c95f92f29d8a3c763bb8 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 16 Jun 2023 14:36:51 +0200 Subject: [PATCH 24/26] Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81552226bf..cc3ab23b83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,12 @@ and this project adheres to - cosmwasm-std: Add `<<` and `<<=` implementation for `Uint{64,128,256,512}` types. ([#1723]) +- cosmwasm-std: Add `Timestamp::{plus,minus}_{minutes, hours, days}`. ([#1729]) - cosmwasm-std: Add `Decimal::bps` and `Decimal256::bps` to create a decimal from a basis point value ([#1715]). [#1723]: https://github.com/CosmWasm/cosmwasm/pull/1723 +[#1729]: https://github.com/CosmWasm/cosmwasm/pull/1729 [#1715]: https://github.com/CosmWasm/cosmwasm/pull/1715 ### Changed From fec7ca97e5fbcf10d2091786359c331d9c7451ae Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 19 Jun 2023 08:45:30 +0200 Subject: [PATCH 25/26] Set version: 1.2.7 --- Cargo.lock | 16 ++++++++-------- contracts/burner/Cargo.lock | 12 ++++++------ contracts/crypto-verify/Cargo.lock | 14 +++++++------- contracts/cyberpunk/Cargo.lock | 14 +++++++------- contracts/floaty/Cargo.lock | 14 +++++++------- contracts/hackatom/Cargo.lock | 14 +++++++------- contracts/ibc-reflect-send/Cargo.lock | 14 +++++++------- contracts/ibc-reflect/Cargo.lock | 14 +++++++------- contracts/queue/Cargo.lock | 12 ++++++------ contracts/reflect/Cargo.lock | 14 +++++++------- contracts/staking/Cargo.lock | 14 +++++++------- contracts/virus/Cargo.lock | 12 ++++++------ packages/check/Cargo.toml | 6 +++--- packages/crypto/Cargo.toml | 2 +- packages/derive/Cargo.toml | 2 +- packages/schema-derive/Cargo.toml | 2 +- packages/schema/Cargo.toml | 6 +++--- packages/std/Cargo.toml | 6 +++--- packages/storage/Cargo.toml | 4 ++-- packages/vm/Cargo.toml | 6 +++--- 20 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82127650ac..c028d0028e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,7 +285,7 @@ dependencies = [ [[package]] name = "cosmwasm-check" -version = "1.2.6" +version = "1.2.7" dependencies = [ "anyhow", "clap 2.34.0", @@ -296,7 +296,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "criterion", @@ -315,7 +315,7 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "syn", @@ -323,7 +323,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "anyhow", "cosmwasm-schema-derive", @@ -338,7 +338,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -347,7 +347,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "chrono", @@ -369,7 +369,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock index f63e26daa0..9d00c76f9a 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -185,14 +185,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -203,7 +203,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -212,7 +212,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index b8c9d3d4ed..70de208acd 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -169,7 +169,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -180,14 +180,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -198,7 +198,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -207,7 +207,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -233,7 +233,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock index 8bb18ba5aa..530f7005ea 100644 --- a/contracts/cyberpunk/Cargo.lock +++ b/contracts/cyberpunk/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -203,14 +203,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -221,7 +221,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -248,7 +248,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -256,7 +256,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index 36eb594473..32c1428dc9 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index 226ce03e09..dd9f21a4da 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index bbce14b49d..c428c1e7a9 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index 4029d0861a..bf6645c38d 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock index 0a40946789..82597f4ea7 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index b1249758bd..d462e18fdd 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index 8480b75873..f63bd2552a 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-std", "serde", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock index 5100789584..ff161c069d 100644 --- a/contracts/virus/Cargo.lock +++ b/contracts/virus/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" dependencies = [ "digest 0.10.3", "ed25519-zebra", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" dependencies = [ "proc-macro2", "quote", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" dependencies = [ "base64", "cosmwasm-crypto", @@ -219,7 +219,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" dependencies = [ "bitflags", "bytecheck", diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml index bcdb3cfb43..9cd05860a7 100644 --- a/packages/check/Cargo.toml +++ b/packages/check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-check" -version = "1.2.6" +version = "1.2.7" authors = ["Mauro Lacy "] edition = "2021" description = "A CLI tool for verifying CosmWasm smart contracts" @@ -11,5 +11,5 @@ license = "Apache-2.0" anyhow = "1.0.57" clap = "2" colored = "2" -cosmwasm-vm = { path = "../vm", version = "1.2.6" } -cosmwasm-std = { path = "../std", version = "1.2.6" } +cosmwasm-vm = { path = "../vm", version = "1.2.7" } +cosmwasm-std = { path = "../std", version = "1.2.7" } diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml index 8b59fbd523..e5e16090a3 100644 --- a/packages/crypto/Cargo.toml +++ b/packages/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-crypto" -version = "1.2.6" +version = "1.2.7" authors = ["Mauro Lacy "] edition = "2021" description = "Crypto bindings for cosmwasm contracts" diff --git a/packages/derive/Cargo.toml b/packages/derive/Cargo.toml index 163b1b6f72..c6ab3d563e 100644 --- a/packages/derive/Cargo.toml +++ b/packages/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-derive" -version = "1.2.6" +version = "1.2.7" authors = ["Simon Warta "] edition = "2021" description = "A package for auto-generated code used for CosmWasm contract development. This is shipped as part of cosmwasm-std. Do not use directly." diff --git a/packages/schema-derive/Cargo.toml b/packages/schema-derive/Cargo.toml index 0bfff7580e..07b76b970d 100644 --- a/packages/schema-derive/Cargo.toml +++ b/packages/schema-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-schema-derive" -version = "1.2.6" +version = "1.2.7" authors = ["Tomasz Kurcz "] edition = "2021" description = "Derive macros for cosmwasm-schema" diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml index 59d708ce58..153beae691 100644 --- a/packages/schema/Cargo.toml +++ b/packages/schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-schema" -version = "1.2.6" +version = "1.2.7" authors = ["Simon Warta ", "Ethan Frey "] edition = "2021" description = "A dev-dependency for CosmWasm contracts to generate JSON Schema files." @@ -8,7 +8,7 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/schema" license = "Apache-2.0" [dependencies] -cosmwasm-schema-derive = { version = "=1.2.6", path = "../schema-derive" } +cosmwasm-schema-derive = { version = "=1.2.7", path = "../schema-derive" } schemars = "0.8.3" serde = "1.0" serde_json = "1.0.40" @@ -16,6 +16,6 @@ thiserror = "1.0.26" [dev-dependencies] anyhow = "1.0.57" -cosmwasm-std = { version = "1.2.6", path = "../std" } +cosmwasm-std = { version = "1.2.7", path = "../std" } semver = "1" tempfile = "3" diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index 8aa895b4d8..d5929f0ee6 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-std" -version = "1.2.6" +version = "1.2.7" authors = ["Ethan Frey "] edition = "2021" description = "Standard library for Wasm based smart contracts on Cosmos blockchains" @@ -42,7 +42,7 @@ cosmwasm_1_2 = ["cosmwasm_1_1"] [dependencies] base64 = "0.13.0" -cosmwasm-derive = { path = "../derive", version = "1.2.6" } +cosmwasm-derive = { path = "../derive", version = "1.2.7" } derivative = "2" forward_ref = "1" hex = "0.4" @@ -54,7 +54,7 @@ thiserror = "1.0.26" uint = "0.9.3" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -cosmwasm-crypto = { path = "../crypto", version = "1.2.6" } +cosmwasm-crypto = { path = "../crypto", version = "1.2.7" } [dev-dependencies] cosmwasm-schema = { path = "../schema" } diff --git a/packages/storage/Cargo.toml b/packages/storage/Cargo.toml index 4c09e83214..b5dbbab45a 100644 --- a/packages/storage/Cargo.toml +++ b/packages/storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-storage" -version = "1.2.6" +version = "1.2.7" authors = ["Ethan Frey "] edition = "2021" description = "CosmWasm library with useful helpers for Storage patterns" @@ -16,5 +16,5 @@ iterator = ["cosmwasm-std/iterator"] [dependencies] # Uses the path when built locally; uses the given version from crates.io when published -cosmwasm-std = { path = "../std", version = "1.2.6", default-features = false } +cosmwasm-std = { path = "../std", version = "1.2.7", default-features = false } serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] } diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index 73f1c30b0c..27bef52a5e 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-vm" -version = "1.2.6" +version = "1.2.7" authors = ["Ethan Frey "] edition = "2021" description = "VM bindings to run cosmwams contracts" @@ -41,8 +41,8 @@ required-features = ["iterator"] [dependencies] clru = "0.4.0" # Uses the path when built locally; uses the given version from crates.io when published -cosmwasm-std = { path = "../std", version = "1.2.6", default-features = false } -cosmwasm-crypto = { path = "../crypto", version = "1.2.6" } +cosmwasm-std = { path = "../std", version = "1.2.7", default-features = false } +cosmwasm-crypto = { path = "../crypto", version = "1.2.7" } hex = "0.4" parity-wasm = "0.42" schemars = "0.8.3" From c986b26ca7c2569e47e8ddbc3ecd0d0439ebbc08 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 19 Jun 2023 08:46:07 +0200 Subject: [PATCH 26/26] Update changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc3ab23b83..d409f023f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to ## [Unreleased] +## [1.2.7] - 2023-06-19 + ### Added - cosmwasm-std: Add `<<` and `<<=` implementation for `Uint{64,128,256,512}` @@ -1714,7 +1716,8 @@ Some main points: All future Changelog entries will reference this base -[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.6...HEAD +[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.7...HEAD +[1.2.7]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.6...v1.2.7 [1.2.6]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.5...v1.2.6 [1.2.5]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.4...v1.2.5 [1.2.4]: https://github.com/CosmWasm/cosmwasm/compare/v1.2.3...v1.2.4