From c5e4061cef4f4ec0546f9fee457e49ce315d62d5 Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Fri, 10 May 2024 08:13:14 -0600 Subject: [PATCH 1/4] bump rust version --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83dfc5a9..94fdfdb4 100644 --- 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,11 +50,11 @@ 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: @@ -62,7 +62,7 @@ jobs: 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,7 +81,7 @@ 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 @@ -89,7 +89,7 @@ jobs: # 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 @@ -110,22 +110,22 @@ jobs: echo "Compiling `basename $C`..." (cd $C && cargo build --release --lib --target wasm32-unknown-unknown --locked) done - - run: + - 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/ From bf5894cc7de6936cdac4b660f9c597a538ad3bbf Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Fri, 10 May 2024 08:29:19 -0600 Subject: [PATCH 2/4] fix circle-ci yaml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94fdfdb4..842711ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,7 +110,7 @@ jobs: echo "Compiling `basename $C`..." (cd $C && cargo build --release --lib --target wasm32-unknown-unknown --locked) done - - run: + - run: name: Install check_contract # Uses --debug for compilation speed command: cargo install cosmwasm-check From 5ac19d3b94bf5752fe42a09c809600b367b80bbe Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Fri, 10 May 2024 08:34:18 -0600 Subject: [PATCH 3/4] bump tarpaulin --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c45f434b..c0169c21 100644 --- 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 From 94ccba9745e9f32f64d52df394cbd60dce0d2e81 Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Fri, 10 May 2024 09:00:21 -0600 Subject: [PATCH 4/4] update config --- Cargo.toml | 6 +++--- contracts/marketplace/Cargo.toml | 2 +- contracts/reserve-auction/Cargo.toml | 19 ++++++++----------- packages/sg-marketplace-common/Cargo.toml | 23 ++++++++++------------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d49b1dfc..6b3e044e 100644 --- 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 \ No newline at end of file +codegen-units = 1 +incremental = false diff --git a/contracts/marketplace/Cargo.toml b/contracts/marketplace/Cargo.toml index ba857de9..b7d91c78 100644 --- 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 index 0e61d007..8707cd9b 100644 --- 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 ", - "Tasio Victoria ", -] +name = "stargaze-reserve-auction" +version = "1.0.1" +authors = ["Shane Vitarana ", "Tasio Victoria "] 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 index ba86c541..b93b0b95 100644 --- 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 ", - "Tasio Victoria ", -] +name = "sg-marketplace-common" +version = "1.3.0" +authors = ["Shane Vitarana ", "Tasio Victoria "] 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"