Merge pull request #66 from public-awesome/moar-types

Refactor name types
public-awesome · Oct 15, 2022 · 1d42104 · 1d42104
2 parents 2b6df6a + 1dc96d1
commit 1d42104
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 214 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/marketplace/Cargo.toml b/contracts/marketplace/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "name-marketplace"
-version = "0.5.0"
+version = "0.7.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
 edition = "2021"
 repository = "https://github.com/public-awesome/names"

diff --git a/contracts/marketplace/schema/name-marketplace.json b/contracts/marketplace/schema/name-marketplace.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "name-marketplace",
-  "contract_version": "0.5.0",
+  "contract_version": "0.7.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/name-minter/Cargo.toml b/contracts/name-minter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "name-minter"
-version = "0.5.0"
+version = "0.7.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
 edition = "2021"
 
@@ -33,7 +33,7 @@ serde = { version = "1.0.145", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.31" }
 cw721 = "0.15.0"
 cw721-base = { version = "0.15.0", features = ["library"] }
-sg-name = "0.5.0"
+sg-name = "0.6.0"
 sg721 = "0.19.0"
 sg721-name = { path = "../sg721-name" }
 name-marketplace = { path = "../marketplace", features = ["library"] }

diff --git a/contracts/name-minter/schema/name-minter.json b/contracts/name-minter/schema/name-minter.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "name-minter",
-  "contract_version": "0.5.0",
+  "contract_version": "0.7.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/name-minter/src/contract.rs b/contracts/name-minter/src/contract.rs
@@ -4,7 +4,7 @@ use cosmwasm_std::{
     coin, to_binary, Addr, Coin, DepsMut, Env, MessageInfo, Reply, SubMsg, WasmMsg,
 };
 use cw2::set_contract_version;
-use cw721_base::{Extension, MintMsg};
+use cw721_base::MintMsg;
 use cw_utils::{maybe_addr, must_pay, parse_reply_instantiate_data};
 use name_marketplace::msg::ExecuteMsg as MarketplaceExecuteMsg;
 use sg721::CollectionInfo;
@@ -137,15 +137,14 @@ pub fn execute_mint_and_list(
     let collection = NAME_COLLECTION.load(deps.storage)?;
     let marketplace = NAME_MARKETPLACE.load(deps.storage)?;
 
-    let msg = Sg721ExecuteMsg::Mint(MintMsg::<Metadata<Extension>> {
+    let msg = Sg721ExecuteMsg::Mint(MintMsg::<Metadata> {
         token_id: name.trim().to_string(),
         owner: info.sender.to_string(),
         token_uri: Some(info.sender.to_string()),
         extension: Metadata {
             bio: None,
-            profile: None,
+            profile_nft: None,
             records: vec![],
-            extension: None,
         },
     });
     let mint_msg_exec = WasmMsg::Execute {

diff --git a/contracts/sg721-name/Cargo.toml b/contracts/sg721-name/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sg721-name"
-version = "0.5.0"
+version = "0.7.0"
 authors = [
   "Shane Vitarana <s@noreply.publicawesome.com>",
   "John Y <j@noreply.publicawesome.com>",
@@ -31,7 +31,7 @@ cw-utils = "0.15.1"
 cw2 = "0.15.1"
 schemars = "0.8.11"
 serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-sg-name = "0.5.0"
+sg-name = "0.6.0"
 sg-std = "0.19.0"
 sg721 = "0.19.0"
 sg721-base = { version = "0.19.0", features = ["library"] }