Skip to content

Commit 2cad1d3

Browse files
JakeHartnellJakeHartnell
authored
Merge pull request #95 from public-awesome/v0.16.0
Update to v0.16
2 parents 90435af + ec14001 commit 2cad1d3

File tree

17 files changed

+75
-99
lines changed

17 files changed

+75
-99
lines changed

Diff for: ‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ jobs:
261261
- run:
262262
name: Build development contracts
263263
command: |
264-
docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.7
264+
docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.9
265265
docker cp with_code:/code/artifacts ./artifacts
266266
- run:
267267
name: Show data

Diff for: ‎Cargo.lock

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

Diff for: ‎Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
members = ["packages/*", "contracts/*"]
33

44
[workspace.package]
5-
version = "0.15.0"
5+
version = "0.16.0"
66
edition = "2021"
77
license = "Apache-2.0"
88
repository = "https://github.com/CosmWasm/cw-nfts"
99
homepage = "https://cosmwasm.com"
1010
documentation = "https://docs.cosmwasm.com"
1111

1212
[workspace.dependencies]
13-
cosmwasm-schema = "1.1.0"
14-
cosmwasm-std = "1.1.0"
15-
cw2 = "0.15.0"
16-
cw20 = "0.15.0"
17-
cw721 = { version = "0.15.0", path = "./packages/cw721" }
18-
cw721-base = { version = "0.15.0", path = "./contracts/cw721-base" }
19-
cw-storage-plus = "0.15.0"
20-
cw-utils = "0.15.0"
13+
cosmwasm-schema = "1.1.5"
14+
cosmwasm-std = "1.1.5"
15+
cw2 = "0.16.0"
16+
cw20 = "0.16.0"
17+
cw721 = { version = "0.16.0", path = "./packages/cw721" }
18+
cw721-base = { version = "0.16.0", path = "./contracts/cw721-base" }
19+
cw-storage-plus = "0.16.0"
20+
cw-utils = "0.16.0"
2121
schemars = "0.8.10"
2222
serde = { version = "1.0.140", default-features = false, features = ["derive"] }
2323
thiserror = "1.0.31"

Diff for: ‎Makefile

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.PHONY: build lint schema
2+
3+
build:
4+
sh scripts/build.sh
5+
6+
lint:
7+
cargo clippy --all-targets -- -D warnings
8+
9+
schema:
10+
sh scripts/schema.sh

Diff for: ‎contracts/cw2981-royalties/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/cw2981-royalties/schema/execute_msg.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
],
236236
"definitions": {
237237
"Binary": {
238-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
238+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
239239
"type": "string"
240240
},
241241
"Empty": {
@@ -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/cw2981-royalties/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/cw2981-royalties/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/schema/execute_msg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
],
236236
"definitions": {
237237
"Binary": {
238-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
238+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
239239
"type": "string"
240240
},
241241
"Empty": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"definitions": {
1919
"Binary": {
20-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
20+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
2121
"type": "string"
2222
},
2323
"Cw20ReceiveMsg": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
],
236236
"definitions": {
237237
"Binary": {
238-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
238+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
239239
"type": "string"
240240
},
241241
"Empty": {

Diff for: ‎contracts/cw721-non-transferable/schema/cw721_execute_msg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
],
200200
"definitions": {
201201
"Binary": {
202-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
202+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
203203
"type": "string"
204204
},
205205
"Expiration": {

Diff for: ‎packages/cw721/schema/cw721_execute_msg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
],
200200
"definitions": {
201201
"Binary": {
202-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
202+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
203203
"type": "string"
204204
},
205205
"Expiration": {

Diff for: ‎packages/cw721/schema/cw721_receive_msg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"additionalProperties": false,
2323
"definitions": {
2424
"Binary": {
25-
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
25+
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
2626
"type": "string"
2727
}
2828
}

Diff for: ‎build.sh renamed to ‎scripts/build.sh

File renamed without changes.

Diff for: ‎scripts/schema.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
for d in packages/*; do
2+
if [ -d "$d" ]; then
3+
cd $d
4+
cargo schema
5+
cd ../..
6+
fi
7+
done
8+
9+
for d in contracts/*; do
10+
if [ -d "$d" ]; then
11+
cd $d
12+
cargo schema
13+
cd ../..
14+
fi
15+
done

Diff for: ‎scripts/set_version.sh

-54
This file was deleted.

0 commit comments

Comments
 (0)