Merge pull request #107 from public-awesome/update-versions3

Update to version 0.11.0

Cargo.toml

@@ -3,15 +3,15 @@ members = ["packages/*", "contracts/*"]
 resolver = "2"
 
 [workspace.package]
-version    = "0.10.0"
+version    = "0.11.0"
 edition    = "2021"
 homepage   = "https://stargaze.zone"
 repository = "https://github.com/public-awesome/names"
 license    = "Apache-2.0"
 
 [workspace.dependencies]
-cosmwasm-schema   = "1.1.4"
-cosmwasm-std      = "1.1.4"
+cosmwasm-schema   = "1.1.5"
+cosmwasm-std      = "1.1.5"
 cw2               = "0.15.1"
 cw721             = "0.15.0"
 cw721-base        = "0.15.0"

Makefile

@@ -3,9 +3,11 @@
 lint:
 	cargo clippy --all-targets -- -D warnings
 
-types:
-	cd contracts/marketplace && cargo schema && cd ../..
-	cd contracts/name-minter && cargo schema && cd ../..
-	cd contracts/sg721-name && cargo schema && cd ../..
-	cd contracts/whitelist-updatable && cargo schema && cd ../..
-	cd ts && yarn codegen && cd ..
+optimize:
+	sh scripts/optimize.sh
+
+publish:
+	sh scripts/publish.sh
+
+schema:
+	sh scripts/schema.sh

contracts/marketplace/schema/name-marketplace.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "name-marketplace",
-  "contract_version": "0.10.0",
+  "contract_version": "0.11.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/name-minter/schema/name-minter.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "name-minter",
-  "contract_version": "0.10.0",
+  "contract_version": "0.11.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/name-minter/src/integration_tests.rs

@@ -1,4 +1,6 @@
+use crate::contract::{execute, instantiate, reply};
 use crate::msg::{ExecuteMsg, InstantiateMsg};
+use crate::query::query;
 use anyhow::Result as AnyResult;
 use cosmwasm_std::{coins, Addr, Uint128};
 use cw721::{NumTokensResponse, OwnerOfResponse};
@@ -14,12 +16,7 @@ use sg_name::{NameMarketplaceResponse, SgNameQueryMsg};
 use sg_std::{StargazeMsgWrapper, NATIVE_DENOM};
 
 pub fn contract_minter() -> Box<dyn Contract<StargazeMsgWrapper>> {
-    let contract = ContractWrapper::new(
-        crate::contract::execute,
-        crate::contract::instantiate,
-        crate::query::query,
-    )
-    .with_reply(crate::contract::reply);
+    let contract = ContractWrapper::new(execute, instantiate, query).with_reply(reply);
     Box::new(contract)
 }
 

contracts/sg721-name/schema/sg721-name.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "sg721-name",
-  "contract_version": "0.10.0",
+  "contract_version": "0.11.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

packages/sg-name-market/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "sg-name-market"
-version = "0.9.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
-edition = "2021"
 description = "Rust definition of Stargaze Name Marketplace"
-license = "Apache-2.0"
-repository = "https://github.com/public-awesome/names"
-homepage = "https://stargaze.zone"
+version     = { 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.
@@ -20,7 +20,7 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-cosmwasm-schema = "1.1.4"
-schemars = "0.8.11"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-cosmwasm-std = "1.1.4"
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }

packages/sg-name-minter/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "sg-name-minter"
-version = "0.9.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
-edition = "2021"
 description = "Rust definition of name service metadata, used by Stargaze Names"
-license = "Apache-2.0"
-repository = "https://github.com/public-awesome/names"
-homepage = "https://stargaze.zone"
+version     = { 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.
@@ -20,7 +20,7 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-cosmwasm-schema = "1.1.4"
-schemars = "0.8.11"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-cosmwasm-std = "1.1.4"
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }

packages/sg-name/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "sg-name"
-version = "0.9.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
-edition = "2021"
 description = "Rust definition of name service metadata, used by Stargaze Names"
-license = "Apache-2.0"
-repository = "https://github.com/public-awesome/names"
-homepage = "https://stargaze.zone"
+version     = { 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.
@@ -20,7 +20,7 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-cosmwasm-schema = "1.1.4"
-schemars = "0.8.11"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-cosmwasm-std = "1.1.4"
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }

packages/sg-whitelist-basic/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "sg-whitelist-basic"
-version = "0.9.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
-edition = "2021"
 description = "Rust definition of a basic Stargaze whitelist"
-license = "Apache-2.0"
-repository = "https://github.com/public-awesome/names"
-homepage = "https://stargaze.zone"
+version     = { 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.
@@ -20,7 +20,7 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-cosmwasm-schema = "1.1.4"
-schemars = "0.8.11"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-cosmwasm-std = "1.1.4"
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }

scripts/optimize.sh

@@ -0,0 +1,4 @@
+docker run --rm -v "$(pwd)":/code --platform linux/amd64 \
+	--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
+	--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+	cosmwasm/workspace-optimizer:0.12.9

scripts/publish.sh

@@ -0,0 +1,7 @@
+for d in packages/*; do
+  if [ -d "$d" ]; then
+    cd $d
+    cargo publish
+    cd ../..
+  fi
+done

scripts/schema.sh

@@ -0,0 +1,9 @@
+for d in contracts/*; do
+  if [ -d "$d" ]; then
+    cd $d
+    cargo schema
+    cd ../..
+  fi
+done
+
+cd ts && yarn codegen