Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase dependency requirements to make -Zminimal-versions pass #1465

Merged
merged 3 commits into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions contracts/burner/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/burner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions contracts/crypto-verify/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/crypto-verify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions contracts/cyberpunk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions contracts/floaty/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/floaty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 3 additions & 0 deletions contracts/hackatom/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/hackatom/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions contracts/ibc-reflect-send/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/ibc-reflect-send/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions contracts/ibc-reflect/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/ibc-reflect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions contracts/queue/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions contracts/reflect/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/reflect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 3 additions & 0 deletions contracts/staking/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions contracts/staking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
14 changes: 14 additions & 0 deletions devtools/build_min.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion packages/check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
6 changes: 3 additions & 3 deletions packages/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions packages/schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions packages/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ 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"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
12 changes: 9 additions & 3 deletions packages/vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,21 @@ 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"

# 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" }
Expand Down