From 0948715950151579aaba487944b630332d83e215 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 19 Oct 2022 00:07:40 +0200 Subject: [PATCH 1/3] Increase dependency requirements to make -Zminimal-versions pass --- Cargo.lock | 3 +++ contracts/burner/Cargo.lock | 3 +++ contracts/burner/Cargo.toml | 2 +- contracts/crypto-verify/Cargo.lock | 3 +++ contracts/crypto-verify/Cargo.toml | 2 +- contracts/cyberpunk/Cargo.lock | 3 +++ contracts/floaty/Cargo.lock | 3 +++ contracts/floaty/Cargo.toml | 2 +- contracts/hackatom/Cargo.lock | 3 +++ contracts/hackatom/Cargo.toml | 2 +- contracts/ibc-reflect-send/Cargo.lock | 3 +++ contracts/ibc-reflect-send/Cargo.toml | 2 +- contracts/ibc-reflect/Cargo.lock | 3 +++ contracts/ibc-reflect/Cargo.toml | 2 +- contracts/queue/Cargo.lock | 3 +++ contracts/queue/Cargo.toml | 2 +- contracts/reflect/Cargo.lock | 3 +++ contracts/reflect/Cargo.toml | 2 +- contracts/staking/Cargo.lock | 3 +++ contracts/staking/Cargo.toml | 4 ++-- devtools/build_min.sh | 14 ++++++++++++++ packages/check/Cargo.toml | 2 +- packages/crypto/Cargo.toml | 6 +++--- packages/schema/Cargo.toml | 8 ++++---- packages/std/Cargo.toml | 10 ++++++++-- packages/vm/Cargo.toml | 6 +++--- 26 files changed, 76 insertions(+), 23 deletions(-) create mode 100755 devtools/build_min.sh diff --git a/Cargo.lock b/Cargo.lock index cf08d838e7..ed834d2427 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,11 +325,14 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "chrono", "cosmwasm-crypto", "cosmwasm-derive", "cosmwasm-schema", "derivative", + "enumset", "forward_ref", "hex", "hex-literal", diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock index 74d30da63e..cb0e9c8028 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -215,9 +215,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/burner/Cargo.toml b/contracts/burner/Cargo.toml index 3aae397b0f..c225cf0f58 100644 --- a/contracts/burner/Cargo.toml +++ b/contracts/burner/Cargo.toml @@ -34,7 +34,7 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] [dependencies] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", features = ["iterator"] } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index 944005ffa1..bf5ae47edc 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -210,9 +210,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/crypto-verify/Cargo.toml b/contracts/crypto-verify/Cargo.toml index b8ce956c99..445c6b2db4 100644 --- a/contracts/crypto-verify/Cargo.toml +++ b/contracts/crypto-verify/Cargo.toml @@ -38,7 +38,7 @@ cosmwasm-std = { path = "../../packages/std", features = ["iterator"] } cosmwasm-storage = { path = "../../packages/storage", features = ["iterator"] } hex = "0.4" rlp = "0.5" -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } sha2 = "0.10" sha3 = "0.10" diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock index 534bfd594b..c43c066bce 100644 --- a/contracts/cyberpunk/Cargo.lock +++ b/contracts/cyberpunk/Cargo.lock @@ -233,9 +233,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index 45c1cb24d9..b89f82ca2f 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/floaty/Cargo.toml b/contracts/floaty/Cargo.toml index 67399bdde1..dfef47a172 100644 --- a/contracts/floaty/Cargo.toml +++ b/contracts/floaty/Cargo.toml @@ -33,7 +33,7 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] [dependencies] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std" } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = "1.0" diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index 7d5e049e31..d006bb18c6 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/hackatom/Cargo.toml b/contracts/hackatom/Cargo.toml index d600b90231..1a91f1100f 100644 --- a/contracts/hackatom/Cargo.toml +++ b/contracts/hackatom/Cargo.toml @@ -33,7 +33,7 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] [dependencies] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["abort"] } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } sha2 = "0.10" thiserror = "1.0" diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index 36f95673ff..8854e32eeb 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/ibc-reflect-send/Cargo.toml b/contracts/ibc-reflect-send/Cargo.toml index 1eebbe9bfd..ad4d2a17df 100644 --- a/contracts/ibc-reflect-send/Cargo.toml +++ b/contracts/ibc-reflect-send/Cargo.toml @@ -35,7 +35,7 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", features = ["iterator", "staking", "stargate"] } cosmwasm-storage = { path = "../../packages/storage", features = ["iterator"] } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index 4de6a3aae4..e8a6711296 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/ibc-reflect/Cargo.toml b/contracts/ibc-reflect/Cargo.toml index 99775b8f59..cb71659a8b 100644 --- a/contracts/ibc-reflect/Cargo.toml +++ b/contracts/ibc-reflect/Cargo.toml @@ -35,7 +35,7 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", features = ["iterator", "ibc3"] } cosmwasm-storage = { path = "../../packages/storage", features = ["iterator"] } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock index ab7820e126..59072bf4f4 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/queue/Cargo.toml b/contracts/queue/Cargo.toml index 84a5d4d79a..9482d51f72 100644 --- a/contracts/queue/Cargo.toml +++ b/contracts/queue/Cargo.toml @@ -36,7 +36,7 @@ library = [] [dependencies] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", features = ["iterator"] } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index 2af8965872..1277291e5c 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/reflect/Cargo.toml b/contracts/reflect/Cargo.toml index 6ec3c92e4a..56b5466b1f 100644 --- a/contracts/reflect/Cargo.toml +++ b/contracts/reflect/Cargo.toml @@ -36,7 +36,7 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["staking", "stargate", "cosmwasm_1_1"] } cosmwasm-storage = { path = "../../packages/storage", default-features = false } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "=1.0.103", default-features = false, features = ["derive"] } thiserror = "1.0" diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index 6d2fa4c75c..3fa7355884 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -204,9 +204,12 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", + "bitflags", + "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", + "enumset", "forward_ref", "hex", "schemars", diff --git a/contracts/staking/Cargo.toml b/contracts/staking/Cargo.toml index 93380313fe..839f8919a9 100644 --- a/contracts/staking/Cargo.toml +++ b/contracts/staking/Cargo.toml @@ -35,9 +35,9 @@ backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["staking"] } cosmwasm-storage = { path = "../../packages/storage", default-features = false } -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -snafu = "0.6" +snafu = "0.6.6" [dev-dependencies] cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = ["staking"] } diff --git a/devtools/build_min.sh b/devtools/build_min.sh new file mode 100755 index 0000000000..880cd91293 --- /dev/null +++ b/devtools/build_min.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -o errexit -o nounset -o pipefail +command -v shellcheck >/dev/null && shellcheck "$0" + +rm Cargo.lock +cargo +nightly build -Zminimal-versions + +for contract_dir in contracts/*/; do + ( + cd "$contract_dir" + rm Cargo.lock + cargo +nightly build -Zminimal-versions + ) +done diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml index c6b265fb6f..692a7881aa 100644 --- a/packages/check/Cargo.toml +++ b/packages/check/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/check" license = "Apache-2.0" [dependencies] -anyhow = "1" +anyhow = "1.0.57" clap = "2" colored = "2" cosmwasm-vm = { path = "../vm", version = "1.1.5" } diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml index 074fbd2235..106e9fc2d3 100644 --- a/packages/crypto/Cargo.toml +++ b/packages/crypto/Cargo.toml @@ -19,16 +19,16 @@ backtraces = [] bench = false [dependencies] -k256 = { version = "0.11", features = ["ecdsa"] } +k256 = { version = "0.11.1", features = ["ecdsa"] } ed25519-zebra = "3" digest = "0.10" rand_core = { version = "0.6", features = ["getrandom"] } -thiserror = "1.0" +thiserror = "1.0.13" [dev-dependencies] criterion = "0.3" serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] } -serde_json = "1.0" +serde_json = "1.0.40" sha2 = "0.10" base64 = "0.13.0" hex = "0.4" diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml index 1b839d6fd3..cc859addf5 100644 --- a/packages/schema/Cargo.toml +++ b/packages/schema/Cargo.toml @@ -9,12 +9,12 @@ license = "Apache-2.0" [dependencies] cosmwasm-schema-derive = { version = "=1.1.5", path = "../schema-derive" } -schemars = "0.8.1" +schemars = "0.8.3" serde = "1.0" -serde_json = "1.0" -thiserror = "1" +serde_json = "1.0.40" +thiserror = "1.0.13" [dev-dependencies] -anyhow = "1" +anyhow = "1.0.57" semver = "1" tempfile = "3" diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index 6aeb426fba..9df765a070 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -43,12 +43,18 @@ cosmwasm-derive = { path = "../derive", version = "1.1.5" } derivative = "2" forward_ref = "1" hex = "0.4" -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] } serde-json-wasm = { version = "0.4.1" } -thiserror = "1.0" +thiserror = "1.0.13" uint = "0.9.3" +# Dependencies that we do not use ourself. We add those entries +# to bump the min version of them. +bytecheck = "0.6.3" # With this version the simdutf8 dependency became optional +enumset = "1.0.2" # Fixes https://github.com/Lymia/enumset/issues/17 (https://github.com/Lymia/enumset/commit/a430550cd6a3c9b1ef636d37f75dede7616f5b62) +bitflags = "1.1.0" # https://github.com/CensoredUsername/dynasm-rs/pull/74 + [target.'cfg(not(target_arch = "wasm32"))'.dependencies] cosmwasm-crypto = { path = "../crypto", version = "1.1.5" } diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index d9453710b8..f098535b84 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -45,11 +45,11 @@ cosmwasm-std = { path = "../std", version = "1.1.5", default-features = false } cosmwasm-crypto = { path = "../crypto", version = "1.1.5" } hex = "0.4" parity-wasm = "0.42" -schemars = "0.8.1" +schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] } -serde_json = "1.0" +serde_json = "1.0.40" sha2 = "0.10.3" -thiserror = "1.0" +thiserror = "1.0.13" wasmer = { version = "=2.3.0", default-features = false, features = ["cranelift", "universal", "singlepass"] } wasmer-middlewares = "=2.3.0" loupe = "0.1.3" From 2ffe1dde6ed1c3558014971aada695d15380ee76 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 19 Oct 2022 08:15:14 +0200 Subject: [PATCH 2/3] Move dependency block from std to vm --- Cargo.lock | 6 +++--- contracts/burner/Cargo.lock | 6 +++--- contracts/crypto-verify/Cargo.lock | 6 +++--- contracts/cyberpunk/Cargo.lock | 6 +++--- contracts/floaty/Cargo.lock | 6 +++--- contracts/hackatom/Cargo.lock | 6 +++--- contracts/ibc-reflect-send/Cargo.lock | 6 +++--- contracts/ibc-reflect/Cargo.lock | 6 +++--- contracts/queue/Cargo.lock | 6 +++--- contracts/reflect/Cargo.lock | 6 +++--- contracts/staking/Cargo.lock | 6 +++--- packages/std/Cargo.toml | 6 ------ packages/vm/Cargo.toml | 6 ++++++ 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed834d2427..d9dd320284 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,14 +325,11 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "chrono", "cosmwasm-crypto", "cosmwasm-derive", "cosmwasm-schema", "derivative", - "enumset", "forward_ref", "hex", "hex-literal", @@ -355,11 +352,14 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clap", "clru", "cosmwasm-crypto", "cosmwasm-std", "criterion", + "enumset", "hex", "hex-literal", "leb128", diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock index cb0e9c8028..affe23f6a7 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -215,12 +215,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -234,9 +231,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index bf5ae47edc..a045b082b5 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -210,12 +210,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -237,9 +234,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock index c43c066bce..e8a751704b 100644 --- a/contracts/cyberpunk/Cargo.lock +++ b/contracts/cyberpunk/Cargo.lock @@ -233,12 +233,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -260,9 +257,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index b89f82ca2f..e13bdb2841 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -231,9 +228,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index d006bb18c6..68437cf41b 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -231,9 +228,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index 8854e32eeb..bdcb966e9a 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -231,9 +228,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index e8a6711296..ed95129730 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -231,9 +228,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock index 59072bf4f4..cf7fa0c425 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -223,9 +220,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index 1277291e5c..37ba82fbb9 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -231,9 +228,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index 3fa7355884..d8ec30573d 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -204,12 +204,9 @@ name = "cosmwasm-std" version = "1.1.5" dependencies = [ "base64", - "bitflags", - "bytecheck", "cosmwasm-crypto", "cosmwasm-derive", "derivative", - "enumset", "forward_ref", "hex", "schemars", @@ -231,9 +228,12 @@ dependencies = [ name = "cosmwasm-vm" version = "1.1.5" dependencies = [ + "bitflags", + "bytecheck", "clru", "cosmwasm-crypto", "cosmwasm-std", + "enumset", "hex", "loupe", "parity-wasm", diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index 9df765a070..acc8faa5ed 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -49,12 +49,6 @@ serde-json-wasm = { version = "0.4.1" } thiserror = "1.0.13" uint = "0.9.3" -# Dependencies that we do not use ourself. We add those entries -# to bump the min version of them. -bytecheck = "0.6.3" # With this version the simdutf8 dependency became optional -enumset = "1.0.2" # Fixes https://github.com/Lymia/enumset/issues/17 (https://github.com/Lymia/enumset/commit/a430550cd6a3c9b1ef636d37f75dede7616f5b62) -bitflags = "1.1.0" # https://github.com/CensoredUsername/dynasm-rs/pull/74 - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] cosmwasm-crypto = { path = "../crypto", version = "1.1.5" } diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index f098535b84..da7857ee77 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -54,6 +54,12 @@ wasmer = { version = "=2.3.0", default-features = false, features = ["cranelift" wasmer-middlewares = "=2.3.0" loupe = "0.1.3" +# Dependencies that we do not use ourself. We add those entries +# to bump the min version of them. +bytecheck = "0.6.3" # With this version the simdutf8 dependency became optional +enumset = "1.0.2" # Fixes https://github.com/Lymia/enumset/issues/17 (https://github.com/Lymia/enumset/commit/a430550cd6a3c9b1ef636d37f75dede7616f5b62) +bitflags = "1.1.0" # https://github.com/CensoredUsername/dynasm-rs/pull/74 + # Wasmer git/local (used for quick local debugging or patching) # wasmer = { git = "https://github.com/wasmerio/wasmer", rev = "877ce1f7c44fad853c", default-features = false, features = ["cranelift", "universal", "singlepass"] } # wasmer-middlewares = { git = "https://github.com/wasmerio/wasmer", rev = "877ce1f7c44fad853c" } From 9c7b0b17215b90be8fa1068edef46eea2008ca64 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 19 Oct 2022 08:17:23 +0200 Subject: [PATCH 3/3] Add CHANGELOG entry --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ad7e956b7..8d474e4660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,13 @@ and this project adheres to [#1463]: https://github.com/CosmWasm/cosmwasm/pull/1463 +### Changed + +- all: Bump a few dependency versions to make the codebase compile with + `-Zminimal-versions` ([#1465]). + +[#1465]: https://github.com/CosmWasm/cosmwasm/pull/1465 + ## [1.1.5] - 2022-10-17 ### Added