Skip to content

Commit ad5b0ed

Browse files
ethanfreyethanfrey
authored
Merge pull request #80 from CosmWasm/update-cw-plus-0-15-0
Update cw-plus packages to 0.15.0
2 parents af36649 + ccb105d commit ad5b0ed

27 files changed

+113
-74
lines changed

Diff for: ‎.circleci/config.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -225,20 +225,15 @@ jobs:
225225
- run:
226226
name: Install check_contract
227227
# Uses --debug for compilation speed
228-
command: cargo install --debug --version 1.1.0 --features iterator --example check_contract --locked -- cosmwasm-vm
228+
command: cargo install --debug --version 1.1.0 --locked -- cosmwasm-check
229229
- save_cache:
230230
paths:
231231
- /usr/local/cargo/registry
232232
- target
233233
key: cargocache-wasm-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }}
234234
- run:
235235
name: Check wasm contracts
236-
command: |
237-
for W in ./target/wasm32-unknown-unknown/release/*.wasm
238-
do
239-
echo -n "Checking `basename $W`... "
240-
check_contract $W
241-
done
236+
command: cosmwasm-check ./target/wasm32-unknown-unknown/release/*.wasm
242237

243238
# This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
244239
build_and_upload_contracts:

Diff for: ‎Cargo.lock

+42-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎contracts/cw2981-royalties/Cargo.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cw2981-royalties"
3-
version = "0.14.0"
3+
version = "0.15.0"
44
authors = ["Alex Lynham <[email protected]>"]
55
edition = "2021"
66
description = "Basic implementation of royalties for cw721 NFTs with token level royalties"
@@ -27,8 +27,10 @@ library = []
2727
[dependencies]
2828
cosmwasm-schema = "1.1.0"
2929
cosmwasm-std = "1.1.0"
30-
cw2 = "0.14.0"
31-
cw721 = { path = "../../packages/cw721" }
32-
cw721-base = { path = "../cw721-base", features = ["library"] }
30+
cw2 = "0.15.0"
31+
cw721 = { path = "../../packages/cw721", version = "0.15.0" }
32+
cw721-base = { path = "../cw721-base", version = "0.15.0", features = [
33+
"library",
34+
] }
3335
schemars = "0.8.10"
3436
serde = { version = "1.0.140", default-features = false, features = ["derive"] }

Diff for: ‎contracts/cw721-base/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cw721-base"
3-
version = "0.14.0"
3+
version = "0.15.0"
44
authors = [
55
"Ethan Frey <[email protected]>",
66
"Orkun Külçe <[email protected]>",
@@ -30,10 +30,10 @@ library = []
3030
[dependencies]
3131
cosmwasm-schema = "1.1.0"
3232
cosmwasm-std = "1.1.0"
33-
cw2 = "0.14.0"
34-
cw721 = { path = "../../packages/cw721" }
35-
cw-storage-plus = "0.14.0"
36-
cw-utils = "0.14.0"
33+
cw-utils = "0.15.0"
34+
cw2 = "0.15.0"
35+
cw721 = { path = "../../packages/cw721", version = "0.15.0" }
36+
cw-storage-plus = "0.15.0"
3737
schemars = "0.8.10"
3838
serde = { version = "1.0.140", default-features = false, features = ["derive"] }
3939
thiserror = "1.0.31"

Diff for: ‎contracts/cw721-base/schema/all_nft_info_response.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
],
9292
"properties": {
9393
"never": {
94-
"type": "object"
94+
"type": "object",
95+
"additionalProperties": false
9596
}
9697
},
9798
"additionalProperties": false

Diff for: ‎contracts/cw721-base/schema/approval_response.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
],
7474
"properties": {
7575
"never": {
76-
"type": "object"
76+
"type": "object",
77+
"additionalProperties": false
7778
}
7879
},
7980
"additionalProperties": false

Diff for: ‎contracts/cw721-base/schema/approvals_response.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
],
7777
"properties": {
7878
"never": {
79-
"type": "object"
79+
"type": "object",
80+
"additionalProperties": false
8081
}
8182
},
8283
"additionalProperties": false

Diff for: ‎contracts/cw721-base/schema/execute_msg.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@
281281
],
282282
"properties": {
283283
"never": {
284-
"type": "object"
284+
"type": "object",
285+
"additionalProperties": false
285286
}
286287
},
287288
"additionalProperties": false

Diff for: ‎contracts/cw721-base/schema/operators_response.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
],
7777
"properties": {
7878
"never": {
79-
"type": "object"
79+
"type": "object",
80+
"additionalProperties": false
8081
}
8182
},
8283
"additionalProperties": false

Diff for: ‎contracts/cw721-base/schema/owner_of_response.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
],
8383
"properties": {
8484
"never": {
85-
"type": "object"
85+
"type": "object",
86+
"additionalProperties": false
8687
}
8788
},
8889
"additionalProperties": false

Diff for: ‎contracts/cw721-base/src/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,6 @@ where
147147
}
148148
}
149149

150-
pub fn token_owner_idx<T>(d: &TokenInfo<T>) -> Addr {
150+
pub fn token_owner_idx<T>(_pk: &[u8], d: &TokenInfo<T>) -> Addr {
151151
d.owner.clone()
152152
}

Diff for: ‎contracts/cw721-fixed-price/Cargo.toml

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cw721-fixed-price"
3-
version = "0.14.0"
3+
version = "0.15.0"
44
authors = ["Vernon Johnson <[email protected]>"]
55
edition = "2021"
66

@@ -42,14 +42,18 @@ optimize = """docker run --rm -v "$(pwd)":/code \
4242
[dependencies]
4343
cosmwasm-schema = "1.1.0"
4444
cosmwasm-std = "1.1.0"
45-
cw2 = "0.14.0"
46-
cw721-base = { path = "../cw721-base", features = ["library"] }
47-
cw-storage-plus = "0.14.0"
48-
cw-utils = "0.14.0"
49-
cw20 = "0.14.0"
45+
cw-storage-plus = "0.15.0"
46+
cw2 = "0.15.0"
5047
schemars = "0.8.10"
48+
cw721-base = { path = "../cw721-base", version = "0.15.0", features = [
49+
"library",
50+
] }
51+
cw20 = "0.15.0"
5152
serde = { version = "1.0.140", default-features = false, features = ["derive"] }
52-
thiserror = "1.0.31"
53+
thiserror = { version = "1.0.31" }
54+
cw-utils = "0.15.0"
55+
prost = "0.10.4"
56+
cw3 = "0.15.0"
5357

5458
[dev-dependencies]
5559
prost = "0.10"

Diff for: ‎contracts/cw721-fixed-price/schema/execute_msg.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"sender": {
3939
"type": "string"
4040
}
41-
}
41+
},
42+
"additionalProperties": false
4243
},
4344
"Uint128": {
4445
"description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",

Diff for: ‎contracts/cw721-metadata-onchain/Cargo.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cw721-metadata-onchain"
3-
version = "0.14.0"
3+
version = "0.15.0"
44
authors = [
55
"Ethan Frey <[email protected]>",
66
"Orkun Külçe <[email protected]>",
@@ -30,8 +30,10 @@ library = []
3030
[dependencies]
3131
cosmwasm-schema = "1.1.0"
3232
cosmwasm-std = "1.1.0"
33-
cw2 = "0.14.0"
34-
cw721 = { path = "../../packages/cw721" }
35-
cw721-base = { path = "../cw721-base", features = ["library"] }
33+
cw2 = "0.15.0"
34+
cw721 = { path = "../../packages/cw721", version = "0.15.0" }
35+
cw721-base = { path = "../cw721-base", version = "0.15.0", features = [
36+
"library",
37+
] }
3638
schemars = "0.8.10"
3739
serde = { version = "1.0.140", default-features = false, features = ["derive"] }

0 commit comments

Comments
 (0)