Merge pull request #318 from public-awesome/jhernandezb/marketplace-v2

bump rust version
public-awesome · May 10, 2024 · 8e65347 · 8e65347
2 parents dd02d4e + 94ccba9
commit 8e65347
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 40 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,7 +18,7 @@ workflows:
 jobs:
   contract_marketplace:
     docker:
-      - image: rust:1.68.2
+      - image: rust:1.74.0
     working_directory: ~/project/contracts/marketplace
     steps:
       - checkout:
@@ -28,7 +28,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-marketplace-rust:1.68.2-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-marketplace-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -50,19 +50,19 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-marketplace-rust:1.68.2-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-marketplace-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
 
   lint:
     docker:
-      - image: rust:1.68.2
+      - image: rust:1.74.0
     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.68.2-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-lint-rust:1.74.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -81,15 +81,15 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-lint-rust:1.68.2-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-lint-rust:1.74.0-{{ 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.68.2
+      - image: rust:1.74.0
     steps:
       - checkout:
           path: ~/project
@@ -98,7 +98,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-wasm-rust:1.68.2-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-wasm-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown
@@ -113,19 +113,19 @@ jobs:
       - run:
           name: Install check_contract
           # Uses --debug for compilation speed
-          command: cargo install --debug --version 1.0.0 --features iterator --example check_contract -- cosmwasm-vm
+          command: cargo install cosmwasm-check
       - save_cache:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-wasm-rust:1.68.2-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-wasm-rust:1.74.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 --supported-features iterator,staking,stargate,stargaze $W
+              cosmwasm-check --available-capabilities iterator,staking,stargate,stargaze,cosmwasm_1_4,cosmwasm_1_3,cosmwasm_1_2,cosmwasm_1_1 $W
             done
 
   # This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -8,7 +8,7 @@ jobs:
     name: coverage
     runs-on: ubuntu-latest
     container:
-      image: xd009642/tarpaulin:0.24.0
+      image: xd009642/tarpaulin:0.29.2
       options: --security-opt seccomp=unconfined
     steps:
       - name: Checkout repository

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members  = ["contracts/*", "packages/*"]
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.68.2"
+rust-version = "1.74.0"
 edition      = "2021"
 homepage     = "https://stargaze.zone"
 repository   = "https://github.com/public-awesome/marketplace"
@@ -16,5 +16,5 @@ overflow-checks  = true
 opt-level        = 3
 debug            = false
 debug-assertions = false
-codegen-units = 1
-incremental   = false
+codegen-units    = 1
+incremental      = false
diff --git a/contracts/marketplace/Cargo.toml b/contracts/marketplace/Cargo.toml
@@ -54,7 +54,7 @@ serde            = { version = "1.0.145", default-features = false, features = [
 sg721-base       = { version = "2.1.0", features = ["library"] }
 sg721            = { version = "2.1.0", features = ["library"] }
 thiserror        = "1.0.31"
-sg-std           = "2.1.0"
+sg-std           = { version = "2.1.0", features = ["library"] }
 cw-utils         = "0.16.0"
 sg1              = "2.1.0"
 sg2              = "2.1.0"

diff --git a/contracts/reserve-auction/Cargo.toml b/contracts/reserve-auction/Cargo.toml
@@ -1,15 +1,12 @@
 [package]
-name = "stargaze-reserve-auction"
-version = "1.0.1"
-authors = [
-  "Shane Vitarana <s+git@publicawesome.com>",
-  "Tasio Victoria <tasiovictoria@ujulabs.com>",
-]
+name        = "stargaze-reserve-auction"
+version     = "1.0.1"
+authors     = ["Shane Vitarana <s+git@publicawesome.com>", "Tasio Victoria <tasiovictoria@ujulabs.com>"]
 description = "Stargaze Reserve Auction Contract"
-edition = { workspace = true }
-homepage = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
+edition     = { workspace = true }
+homepage    = { workspace = true }
+repository  = { workspace = true }
+license     = { workspace = true }
 
 exclude = [
   # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
@@ -46,7 +43,7 @@ cw721                 = "0.16.0"
 cw721-base            = { version = "0.16.0", features = ["library"] }
 schemars              = "0.8.11"
 serde                 = { version = "1.0.145", default-features = false, features = ["derive"] }
-sg-std                = "2.1.0"
+sg-std                = { version = "2.1.0", features = ["library"] }
 sg1                   = "2.1.0"
 sg721-base            = { version = "2.1.0", features = ["library"] }
 thiserror             = "1.0.31"

diff --git a/packages/sg-marketplace-common/Cargo.toml b/packages/sg-marketplace-common/Cargo.toml
@@ -1,15 +1,12 @@
 [package]
-name = "sg-marketplace-common"
-version = "1.3.0"
-authors = [
-  "Shane Vitarana <s@noreply.publicawesome.com>",
-  "Tasio Victoria <tasiovictoria@ujulabs.com>",
-]
+name        = "sg-marketplace-common"
+version     = "1.3.0"
+authors     = ["Shane Vitarana <s@noreply.publicawesome.com>", "Tasio Victoria <tasiovictoria@ujulabs.com>"]
 description = "Common functionality used in Stargaze Marketplace contracts"
-edition = { workspace = true }
-homepage = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
+edition     = { workspace = true }
+homepage    = { workspace = true }
+repository  = { workspace = true }
+license     = { workspace = true }
 
 exclude = [
   # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
@@ -33,10 +30,10 @@ cosmwasm-schema = "1.5.3"
 cosmwasm-std    = "1.5.3"
 cw-storage-plus = "1.2.0"
 cw-utils        = "1.0.3"
-cw721         = "0.18.0"
-cw721-base     = { version = "0.18.0", features = ["library"] }
+cw721           = "0.18.0"
+cw721-base      = { version = "0.18.0", features = ["library"] }
 
-stargaze-royalty-registry     = { version = "0.3.0", features = ["library"] }
+stargaze-royalty-registry = { version = "0.3.0", features = ["library"] }
 
 serde     = "1.0.196"
 thiserror = "1.0.56"