Merge pull request #80 from CosmWasm/update-cw-plus-0-15-0

Update cw-plus packages to 0.15.0
public-awesome · Sep 15, 2022 · ad5b0ed · ad5b0ed
2 parents af36649 + ccb105d
commit ad5b0ed
Show file tree

Hide file tree

Showing 27 changed files with 113 additions and 74 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -225,20 +225,15 @@ jobs:
       - run:
           name: Install check_contract
           # Uses --debug for compilation speed
-          command: cargo install --debug --version 1.1.0 --features iterator --example check_contract --locked -- cosmwasm-vm
+          command: cargo install --debug --version 1.1.0 --locked -- cosmwasm-check
       - save_cache:
           paths:
             - /usr/local/cargo/registry
             - target
           key: cargocache-wasm-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Check wasm contracts
-          command: |
-            for W in ./target/wasm32-unknown-unknown/release/*.wasm
-            do
-              echo -n "Checking `basename $W`... "
-              check_contract $W
-            done
+          command: cosmwasm-check ./target/wasm32-unknown-unknown/release/*.wasm
 
   # This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
   build_and_upload_contracts:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/cw2981-royalties/Cargo.toml b/contracts/cw2981-royalties/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cw2981-royalties"
-version = "0.14.0"
+version = "0.15.0"
 authors = ["Alex Lynham <alex@lynh.am>"]
 edition = "2021"
 description = "Basic implementation of royalties for cw721 NFTs with token level royalties"
@@ -27,8 +27,10 @@ library = []
 [dependencies]
 cosmwasm-schema = "1.1.0"
 cosmwasm-std = "1.1.0"
-cw2 = "0.14.0"
-cw721 = { path = "../../packages/cw721" }
-cw721-base = { path = "../cw721-base", features = ["library"] }
+cw2 = "0.15.0"
+cw721 = { path = "../../packages/cw721", version = "0.15.0" }
+cw721-base = { path = "../cw721-base", version = "0.15.0", features = [
+  "library",
+] }
 schemars = "0.8.10"
 serde = { version = "1.0.140", default-features = false, features = ["derive"] }
diff --git a/contracts/cw721-base/Cargo.toml b/contracts/cw721-base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cw721-base"
-version = "0.14.0"
+version = "0.15.0"
 authors = [
   "Ethan Frey <ethanfrey@users.noreply.github.com>",
   "Orkun Külçe <orkun@deuslabs.fi>",
@@ -30,10 +30,10 @@ library = []
 [dependencies]
 cosmwasm-schema = "1.1.0"
 cosmwasm-std = "1.1.0"
-cw2 = "0.14.0"
-cw721 = { path = "../../packages/cw721" }
-cw-storage-plus = "0.14.0"
-cw-utils = "0.14.0"
+cw-utils = "0.15.0"
+cw2 = "0.15.0"
+cw721 = { path = "../../packages/cw721", version = "0.15.0" }
+cw-storage-plus = "0.15.0"
 schemars = "0.8.10"
 serde = { version = "1.0.140", default-features = false, features = ["derive"] }
 thiserror = "1.0.31"
diff --git a/contracts/cw721-base/schema/all_nft_info_response.json b/contracts/cw721-base/schema/all_nft_info_response.json
@@ -91,7 +91,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/cw721-base/schema/approval_response.json b/contracts/cw721-base/schema/approval_response.json
@@ -73,7 +73,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/cw721-base/schema/approvals_response.json b/contracts/cw721-base/schema/approvals_response.json
@@ -76,7 +76,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/cw721-base/schema/execute_msg.json b/contracts/cw721-base/schema/execute_msg.json
@@ -281,7 +281,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/cw721-base/schema/operators_response.json b/contracts/cw721-base/schema/operators_response.json
@@ -76,7 +76,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/cw721-base/schema/owner_of_response.json b/contracts/cw721-base/schema/owner_of_response.json
@@ -82,7 +82,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/cw721-base/src/state.rs b/contracts/cw721-base/src/state.rs
@@ -147,6 +147,6 @@ where
     }
 }
 
-pub fn token_owner_idx<T>(d: &TokenInfo<T>) -> Addr {
+pub fn token_owner_idx<T>(_pk: &[u8], d: &TokenInfo<T>) -> Addr {
     d.owner.clone()
 }
diff --git a/contracts/cw721-fixed-price/Cargo.toml b/contracts/cw721-fixed-price/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cw721-fixed-price"
-version = "0.14.0"
+version = "0.15.0"
 authors = ["Vernon Johnson <vtj2105@columbia.edu>"]
 edition = "2021"
 
@@ -42,14 +42,18 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 [dependencies]
 cosmwasm-schema = "1.1.0"
 cosmwasm-std = "1.1.0"
-cw2 = "0.14.0"
-cw721-base = { path = "../cw721-base", features = ["library"] }
-cw-storage-plus = "0.14.0"
-cw-utils = "0.14.0"
-cw20 = "0.14.0"
+cw-storage-plus = "0.15.0"
+cw2 = "0.15.0"
 schemars = "0.8.10"
+cw721-base = { path = "../cw721-base", version = "0.15.0", features = [
+  "library",
+] }
+cw20 = "0.15.0"
 serde = { version = "1.0.140", default-features = false, features = ["derive"] }
-thiserror = "1.0.31"
+thiserror = { version = "1.0.31" }
+cw-utils = "0.15.0"
+prost = "0.10.4"
+cw3 = "0.15.0"
 
 [dev-dependencies]
 prost = "0.10"
diff --git a/contracts/cw721-fixed-price/schema/execute_msg.json b/contracts/cw721-fixed-price/schema/execute_msg.json
@@ -38,7 +38,8 @@
         "sender": {
           "type": "string"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "Uint128": {
       "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 --git a/contracts/cw721-metadata-onchain/Cargo.toml b/contracts/cw721-metadata-onchain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cw721-metadata-onchain"
-version = "0.14.0"
+version = "0.15.0"
 authors = [
   "Ethan Frey <ethanfrey@users.noreply.github.com>",
   "Orkun Külçe <orkun@deuslabs.fi>",
@@ -30,8 +30,10 @@ library = []
 [dependencies]
 cosmwasm-schema = "1.1.0"
 cosmwasm-std = "1.1.0"
-cw2 = "0.14.0"
-cw721 = { path = "../../packages/cw721" }
-cw721-base = { path = "../cw721-base", features = ["library"] }
+cw2 = "0.15.0"
+cw721 = { path = "../../packages/cw721", version = "0.15.0" }
+cw721-base = { path = "../cw721-base", version = "0.15.0", features = [
+  "library",
+] }
 schemars = "0.8.10"
 serde = { version = "1.0.140", default-features = false, features = ["derive"] }