Skip to content

Commit

Permalink
Merge pull request #95 from public-awesome/v0.16.0
Browse files Browse the repository at this point in the history
Update to v0.16
  • Loading branch information
JakeHartnell authored Oct 25, 2022
2 parents 90435af + ec14001 commit 2cad1d3
Show file tree
Hide file tree
Showing 17 changed files with 75 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ jobs:
- run:
name: Build development contracts
command: |
docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.7
docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.9
docker cp with_code:/code/artifacts ./artifacts
- run:
name: Show data
Expand Down
49 changes: 25 additions & 24 deletions Cargo.lock

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

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
members = ["packages/*", "contracts/*"]

[workspace.package]
version = "0.15.0"
version = "0.16.0"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/CosmWasm/cw-nfts"
homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"

[workspace.dependencies]
cosmwasm-schema = "1.1.0"
cosmwasm-std = "1.1.0"
cw2 = "0.15.0"
cw20 = "0.15.0"
cw721 = { version = "0.15.0", path = "./packages/cw721" }
cw721-base = { version = "0.15.0", path = "./contracts/cw721-base" }
cw-storage-plus = "0.15.0"
cw-utils = "0.15.0"
cosmwasm-schema = "1.1.5"
cosmwasm-std = "1.1.5"
cw2 = "0.16.0"
cw20 = "0.16.0"
cw721 = { version = "0.16.0", path = "./packages/cw721" }
cw721-base = { version = "0.16.0", path = "./contracts/cw721-base" }
cw-storage-plus = "0.16.0"
cw-utils = "0.16.0"
schemars = "0.8.10"
serde = { version = "1.0.140", default-features = false, features = ["derive"] }
thiserror = "1.0.31"
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.PHONY: build lint schema

build:
sh scripts/build.sh

lint:
cargo clippy --all-targets -- -D warnings

schema:
sh scripts/schema.sh
3 changes: 2 additions & 1 deletion contracts/cw2981-royalties/schema/all_nft_info_response.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
],
"properties": {
"never": {
"type": "object"
"type": "object",
"additionalProperties": false
}
},
"additionalProperties": false
Expand Down
5 changes: 3 additions & 2 deletions contracts/cw2981-royalties/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
],
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
},
"Empty": {
Expand Down Expand Up @@ -281,7 +281,8 @@
],
"properties": {
"never": {
"type": "object"
"type": "object",
"additionalProperties": false
}
},
"additionalProperties": false
Expand Down
3 changes: 2 additions & 1 deletion contracts/cw2981-royalties/schema/operators_response.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
],
"properties": {
"never": {
"type": "object"
"type": "object",
"additionalProperties": false
}
},
"additionalProperties": false
Expand Down
3 changes: 2 additions & 1 deletion contracts/cw2981-royalties/schema/owner_of_response.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
],
"properties": {
"never": {
"type": "object"
"type": "object",
"additionalProperties": false
}
},
"additionalProperties": false
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw721-base/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
],
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
},
"Empty": {
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw721-fixed-price/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
},
"Cw20ReceiveMsg": {
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw721-metadata-onchain/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
],
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
},
"Empty": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
],
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
},
"Expiration": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cw721/schema/cw721_execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
],
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
},
"Expiration": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cw721/schema/cw721_receive_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"additionalProperties": false,
"definitions": {
"Binary": {
"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>",
"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>.",
"type": "string"
}
}
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions scripts/schema.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
for d in packages/*; do
if [ -d "$d" ]; then
cd $d
cargo schema
cd ../..
fi
done

for d in contracts/*; do
if [ -d "$d" ]; then
cd $d
cargo schema
cd ../..
fi
done
54 changes: 0 additions & 54 deletions scripts/set_version.sh

This file was deleted.

0 comments on commit 2cad1d3

Please sign in to comment.