Merge pull request #61 from public-awesome/shanev/update-2

public-awesome · Apr 21, 2022 · 584e015 · 584e015
2 parents e715567 + e83afb5
commit 584e015
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 86 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,7 +21,7 @@ workflows:
 jobs:
   contract_cw721_base:
     docker:
-      - image: rust:1.55.0
+      - image: rust:1.58.1
     working_directory: ~/project/contracts/cw721-base
     steps:
       - checkout:
@@ -31,7 +31,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw721-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -53,12 +53,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
-
+          key: cargocache-cw721-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw721_metadata_onchain:
     docker:
-      - image: rust:1.55.0
+      - image: rust:1.58.1
     working_directory: ~/project/contracts/cw721-metadata-onchain
     steps:
       - checkout:
@@ -68,7 +67,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw721-metadata-onchain-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw721-metadata-onchain-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -90,12 +89,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw721-metadata-onchain-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
-
+          key: cargocache-cw721-metadata-onchain-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw721_fixed_price:
     docker:
-      - image: rust:1.55.0
+      - image: rust:1.58.1
     working_directory: ~/project/contracts/cw721-fixed-price
     steps:
       - checkout:
@@ -105,7 +103,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw721-fixed-price-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw721-fixed-price-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -127,12 +125,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw721-fixed-price-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
-
+          key: cargocache-cw721-fixed-price-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw721:
     docker:
-      - image: rust:1.55.0
+      - image: rust:1.58.1
     working_directory: ~/project/packages/cw721
     steps:
       - checkout:
@@ -142,7 +139,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw721:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw721:1.58.1-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -165,19 +162,19 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw721:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw721:1.58.1-{{ checksum "~/project/Cargo.lock" }}
 
   lint:
     docker:
-      - image: rust:1.55.0
+      - image: rust:1.58.1
     steps:
       - checkout
       - run:
           name: Version information
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -196,15 +193,15 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }}
 
   # This runs one time on the top level to ensure all contracts compile properly into wasm.
   # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time
   # for all the other tests.
   # We also sanity-check the resultant wasm files.
   wasm-build:
     docker:
-      - image: rust:1.55.0
+      - image: rust:1.58.1
     steps:
       - checkout:
           path: ~/project
@@ -213,7 +210,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown
@@ -228,12 +225,12 @@ jobs:
       - run:
           name: Install check_contract
           # Uses --debug for compilation speed
-          command: cargo install --debug --version 1.0.0-beta2 --features iterator --example check_contract --locked -- cosmwasm-vm
+          command: cargo install --debug --version 1.0.0-beta8 --features iterator --example check_contract --locked -- cosmwasm-vm
       - save_cache:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Check wasm contracts
           command: |

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.13.1"
+version = "0.13.2"
 authors = ["Alex Lynham <[email protected]>"]
 edition = "2018"
 description = "Basic implementation of royalties for cw721 NFTs with token level royalties"
@@ -25,14 +25,14 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cw721 = { path = "../../packages/cw721", version = "0.13.1" }
-cw721-base = { path = "../cw721-base", version = "0.13.1", features = [
+cw721 = { path = "../../packages/cw721", version = "0.13.2" }
+cw721-base = { path = "../cw721-base", version = "0.13.2", features = [
   "library",
 ] }
-cosmwasm-std = { version = "1.0.0-beta7" }
+cosmwasm-std = { version = "1.0.0-beta8" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0-beta7" }
+cosmwasm-schema = { version = "1.0.0-beta8" }
diff --git a/contracts/cw2981-royalties/src/lib.rs b/contracts/cw2981-royalties/src/lib.rs
@@ -186,12 +186,12 @@ mod tests {
         let token_id = "Enterprise";
         let mint_msg = MintMsg {
             token_id: token_id.to_string(),
-            owner: "JeanLuc".to_string(),
+            owner: "jeanluc".to_string(),
             token_uri: Some("https://starships.example.com/Starship/Enterprise.json".into()),
             extension: Some(Metadata {
                 description: Some("Spaceship with Warp Drive".into()),
                 name: Some("Starship USS Enterprise".to_string()),
-                royalty_payment_address: Some("JeanLuc".to_string()),
+                royalty_payment_address: Some("jeanluc".to_string()),
                 royalty_percentage: Some(10),
                 ..Metadata::default()
             }),
@@ -221,12 +221,12 @@ mod tests {
         let voyager_token_id = "Voyager";
         let second_mint_msg = MintMsg {
             token_id: voyager_token_id.to_string(),
-            owner: "Janeway".to_string(),
+            owner: "janeway".to_string(),
             token_uri: Some("https://starships.example.com/Starship/Voyager.json".into()),
             extension: Some(Metadata {
                 description: Some("Spaceship with Warp Drive".into()),
                 name: Some("Starship USS Voyager".to_string()),
-                royalty_payment_address: Some("Janeway".to_string()),
+                royalty_payment_address: Some("janeway".to_string()),
                 royalty_percentage: Some(4),
                 ..Metadata::default()
             }),