Skip to content

Commit

Permalink
Merge pull request #378 from CosmWasm/377-cosmwasm-0.16
Browse files Browse the repository at this point in the history 
Upgrade to cosmwasm 0.16
  • Loading branch information
@ethanfrey
ethanfrey authored Aug 5, 2021
2 parents 4229d77 + 0d9d660 commit 01a8bc9
Show file tree
Hide file tree
Showing 29 changed files with 64 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ jobs:
- run:
name: Install check_contract
# Uses --debug for compilation speed
command: cargo install --debug --version 0.16.0-rc5 --features iterator --example check_contract -- cosmwasm-vm
command: cargo install --debug --version 0.16.0 --features iterator --example check_contract -- cosmwasm-vm
- save_cache:
paths:
- /usr/local/cargo/registry
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock
View file

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

4 changes: 2 additions & 2 deletions contracts/cw1-subkeys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw1 = { path = "../../packages/cw1", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw1-whitelist = { path = "../cw1-whitelist", version = "0.8.0-rc1", features = ["library"] }
cosmwasm-std = { version = "0.16.0-rc5", features = ["iterator", "staking"] }
cosmwasm-std = { version = "0.16.0", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
cw1-whitelist = { path = "../cw1-whitelist", version = "0.8.0-rc1", features = ["library", "test-utils"] }
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ test-utils = []
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw1 = { path = "../../packages/cw1", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5", features = ["iterator", "staking"] }
cosmwasm-std = { version = "0.16.0", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw1155-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw1155 = { path = "../../packages/cw1155", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw20-atomic-swap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand All @@ -27,4 +27,4 @@ hex = "0.3.1"
sha2 = "0.8.0"

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw20-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw20-bonding/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cw20-base = { path = "../../contracts/cw20-base", version = "0.8.0-rc1", features = ["library"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5", default-features = false, features = ["staking"] }
cosmwasm-std = { version = "0.16.0", default-features = false, features = ["staking"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }
Expand All @@ -34,4 +34,4 @@ integer-sqrt = { version = "0.1.5" }
integer-cbrt = { version = "0.1.2" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw20-escrow/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.8.0-rc1" }
cw20-base = { path = "../cw20-base", version = "0.8.0-rc1", features = ["library"] }
4 changes: 2 additions & 2 deletions contracts/cw20-ics20/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5", features = ["iterator", "stargate"] }
cosmwasm-std = { version = "0.16.0", features = ["stargate"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
6 changes: 3 additions & 3 deletions contracts/cw20-merkle-airdrop/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5", features = ["iterator"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1", features = ["iterator"] }
cosmwasm-std = { version = "0.16.0" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }
hex = "0.4"
sha2 = { version = "0.9.5", default-features = false }

[dev-dependencies]
cosmwasm-schema = "0.16.0-rc5"
cosmwasm-schema = "0.16.0"
serde_json = "1.0"
4 changes: 2 additions & 2 deletions contracts/cw20-staking/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cw-controllers = { path = "../../packages/controllers", version = "0.8.0-rc1" }
cw20-base = { path = "../../contracts/cw20-base", version = "0.8.0-rc1", features = ["library"] }
cosmwasm-std = { version = "0.16.0-rc5", features = ["staking"] }
cosmwasm-std = { version = "0.16.0", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw3-fixed-multisig/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw3 = { path = "../../packages/cw3", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cw20-base = { path = "../cw20-base", version = "0.8.0-rc1", features = ["library"] }
cw-multi-test = { path = "../../packages/multi-test", version = "0.8.0-rc1" }
4 changes: 2 additions & 2 deletions contracts/cw3-flex-multisig/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw3 = { path = "../../packages/cw3", version = "0.8.0-rc1" }
cw4 = { path = "../../packages/cw4", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
cw4-group = { path = "../cw4-group", version = "0.8.0-rc1" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.8.0-rc1" }
4 changes: 2 additions & 2 deletions contracts/cw4-group/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw4 = { path = "../../packages/cw4", version = "0.8.0-rc1" }
cw-controllers = { path = "../../packages/controllers", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw4-stake/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ cw4 = { path = "../../packages/cw4", version = "0.8.0-rc1" }
cw20 = { path = "../../packages/cw20", version = "0.8.0-rc1" }
cw-controllers = { path = "../../packages/controllers", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions contracts/cw721-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw2 = { path = "../../packages/cw2", version = "0.8.0-rc1" }
cw721 = { path = "../../packages/cw721", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
2 changes: 1 addition & 1 deletion packages/controllers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
cw0 = { path = "../cw0", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/cw0/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.21" }
Expand Down
4 changes: 2 additions & 2 deletions packages/cw1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"

[dependencies]
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions packages/cw1155/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
2 changes: 1 addition & 1 deletion packages/cw2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"

[dependencies]
cosmwasm-std = { version = "0.16.0-rc5", default-features = false }
cosmwasm-std = { version = "0.16.0", default-features = false }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
4 changes: 2 additions & 2 deletions packages/cw20/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions packages/cw3/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions packages/cw4/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"

[dependencies]
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
4 changes: 2 additions & 2 deletions packages/cw721/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cosmwasm-std = { version = "0.16.0-rc5" }
cosmwasm-std = { version = "0.16.0" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "0.16.0-rc5" }
cosmwasm-schema = { version = "0.16.0" }
6 changes: 3 additions & 3 deletions packages/multi-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ stargate = ["cosmwasm-std/stargate"]

[dependencies]
cw0 = { path = "../../packages/cw0", version = "0.8.0-rc1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1" , features = ["iterator"]}
cosmwasm-std = { version = "0.16.0-rc5", features = ["staking"] }
cosmwasm-storage = { version = "0.16.0-rc5" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.8.0-rc1"}
cosmwasm-std = { version = "0.16.0", features = ["staking"] }
cosmwasm-storage = { version = "0.16.0" }
itertools = "0.10.1"
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand Down
Loading

0 comments on commit 01a8bc9

Please sign in to comment.