Merge pull request #55 from public-awesome/shanev/fix-versions

Update version numbers and upgrade to CosmWasm 1.0.0-beta5

Author: the-frey

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cw2981-royalties"
-version = "0.10.0"
+version = "0.12.0"
 authors = ["Alex Lynham <alex@lynh.am>"]
 edition = "2018"
 description = "Basic implementation of royalties for cw721 NFTs with token level royalties"
@@ -25,12 +25,14 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cw721 = { path = "../../packages/cw721", version = "0.11" }
-cw721-base = { path = "../cw721-base", version = "0.11", features = ["library"] }
-cosmwasm-std = { version = "1.0.0-beta" }
+cw721 = { path = "../../packages/cw721", version = "0.12.0" }
+cw721-base = { path = "../cw721-base", version = "0.12.0", features = [
+  "library",
+] }
+cosmwasm-std = { version = "1.0.0-beta5" }
 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" }
+cosmwasm-schema = { version = "1.0.0-beta5" }

contracts/cw2981-royalties/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "cw721-base"
-version = "0.11.1"
-authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>", "Orkun Külçe <orkun@deuslabs.fi>"]
+version = "0.12.0"
+authors = [
+  "Ethan Frey <ethanfrey@users.noreply.github.com>",
+  "Orkun Külçe <orkun@deuslabs.fi>",
+]
 edition = "2018"
 description = "Basic implementation cw721 NFTs"
 license = "Apache-2.0"
@@ -25,14 +28,14 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cw-utils = { version = "0.11" }
-cw2 = { version = "0.11" }
-cw721 = { path = "../../packages/cw721", version = "0.11" }
-cw-storage-plus = { version = "0.11" }
-cosmwasm-std = { version = "1.0.0-beta" }
+cw-utils = "0.12.1"
+cw2 = "0.12.1"
+cw721 = { path = "../../packages/cw721", version = "0.12.0" }
+cw-storage-plus = "0.12.1"
+cosmwasm-std = { version = "1.0.0-beta5" }
 schemars = "0.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-schema = { version = "1.0.0-beta5" }

contracts/cw721-base/Cargo.toml

@@ -65,7 +65,7 @@ where
     ) -> StdResult<OperatorsResponse> {
         let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT) as usize;
         let start_addr = maybe_addr(deps.api, start_after)?;
-        let start = start_addr.map(|addr| Bound::exclusive(addr.as_ref()));
+        let start = start_addr.as_ref().map(Bound::exclusive);
 
         let owner_addr = deps.api.addr_validate(&owner)?;
         let res: StdResult<Vec<_>> = self
@@ -150,7 +150,7 @@ where
         limit: Option<u32>,
     ) -> StdResult<TokensResponse> {
         let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT) as usize;
-        let start = start_after.map(Bound::exclusive);
+        let start = start_after.map(|s| Bound::ExclusiveRaw(s.into()));
 
         let owner_addr = deps.api.addr_validate(&owner)?;
         let tokens: Vec<String> = self
@@ -173,7 +173,7 @@ where
         limit: Option<u32>,
     ) -> StdResult<TokensResponse> {
         let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT) as usize;
-        let start = start_after.map(Bound::exclusive);
+        let start = start_after.map(|s| Bound::ExclusiveRaw(s.into()));
 
         let tokens: StdResult<Vec<String>> = self
             .tokens

contracts/cw721-base/src/query.rs

@@ -1,6 +1,6 @@
 [package]
 name = "cw721-fixed-price"
-version = "0.1.0"
+version = "0.12.0"
 authors = ["Vernon Johnson <vtj2105@columbia.edu>"]
 edition = "2018"
 
@@ -40,17 +40,20 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std = { version = "1.0.0-beta" }
-cosmwasm-storage = { version = "1.0.0-beta" }
-cw-storage-plus = "0.11.1"
-cw2 = "0.11.1"
+cosmwasm-std = { version = "1.0.0-beta5" }
+cosmwasm-storage = { version = "1.0.0-beta5" }
+cw-storage-plus = "0.12.1"
+cw2 = "0.12.1"
 schemars = "0.8.3"
-cw721-base = { path = "../cw721-base", version = "0.11.1", features = [ "library"] }
-cw20 = "0.11.1"
+cw721-base = { path = "../cw721-base", version = "0.12.0", features = [
+  "library",
+] }
+cw20 = "0.12.1"
 serde = { version = "1.0.127", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.26" }
-cw-utils = { version= "0.11.1" }
+cw-utils = "0.12.1"
 prost = "0.9.0"
+cw3 = "0.12.1"
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-schema = { version = "1.0.0-beta5" }

contracts/cw721-fixed-price/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "cw721-metadata-onchain"
-version = "0.11.1"
-authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>", "Orkun Külçe <orkun@deuslabs.fi>"]
+version = "0.12.0"
+authors = [
+  "Ethan Frey <ethanfrey@users.noreply.github.com>",
+  "Orkun Külçe <orkun@deuslabs.fi>",
+]
 edition = "2018"
 description = "Example extending CW721 NFT to store metadata on chain"
 license = "Apache-2.0"
@@ -25,12 +28,14 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cw721 = { path = "../../packages/cw721", version = "0.11" }
-cw721-base = { path = "../cw721-base", version = "0.11", features = ["library"] }
-cosmwasm-std = { version = "1.0.0-beta" }
+cw721 = { path = "../../packages/cw721", version = "0.12.0" }
+cw721-base = { path = "../cw721-base", version = "0.12.0", features = [
+  "library",
+] }
+cosmwasm-std = { version = "1.0.0-beta5" }
 schemars = "0.8"
 serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.30" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-schema = { version = "1.0.0-beta5" }

contracts/cw721-metadata-onchain/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "cw721"
-version = "0.11.1"
-authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>", "Orkun Külçe <orkun@deuslabs.fi>"]
+version = "0.12.0"
+authors = [
+    "Ethan Frey <ethanfrey@users.noreply.github.com>",
+    "Orkun Külçe <orkun@deuslabs.fi>",
+]
 edition = "2018"
 description = "Definition and types for the CosmWasm-721 NFT interface"
 license = "Apache-2.0"
@@ -10,10 +13,10 @@ homepage = "https://cosmwasm.com"
 documentation = "https://docs.cosmwasm.com"
 
 [dependencies]
-cw-utils = { version = "0.11" }
-cosmwasm-std = { version = "1.0.0-beta" }
+cw-utils = "0.12.1"
+cosmwasm-std = { version = "1.0.0-beta5" }
 schemars = "0.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-schema = { version = "1.0.0-beta5" }