Merge pull request #74 from public-awesome/assoc-addy

Optionally associate name with address / token_uri
public-awesome · Oct 16, 2022 · 16cff5c · 16cff5c
2 parents 4676fa3 + 76e58b0
commit 16cff5c
Show file tree

Hide file tree

Showing 26 changed files with 521 additions and 277 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.8.0"
+version = "0.9.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.8.0",
+  "contract_version": "0.9.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.8.0"
+version = "0.9.0"
 authors = ["Shane Vitarana <s@noreply.publicawesome.com>"]
 edition = "2021"
 

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.8.0",
+  "contract_version": "0.9.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -100,7 +100,7 @@
         "additionalProperties": false
       },
       {
-        "description": "Mint a name for the sender or contract addresss If `contract` is given, name is minted for that contract address",
+        "description": "Mint a name and list on Stargaze Name Marketplace",
         "type": "object",
         "required": [
           "mint_and_list"
@@ -112,12 +112,6 @@
               "name"
             ],
             "properties": {
-              "contract": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              },
               "name": {
                 "type": "string"
               }

diff --git a/contracts/name-minter/src/contract.rs b/contracts/name-minter/src/contract.rs
@@ -1,8 +1,7 @@
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    coin, to_binary, Addr, Coin, ContractInfoResponse, Deps, DepsMut, Env, MessageInfo, Reply,
-    SubMsg, WasmMsg,
+    coin, to_binary, Addr, Coin, DepsMut, Env, MessageInfo, Reply, SubMsg, WasmMsg,
 };
 use cw2::set_contract_version;
 use cw721_base::MintMsg;
@@ -93,9 +92,7 @@ pub fn execute(
         ExecuteMsg::UpdateWhitelist { whitelist } => {
             execute_update_whitelsit(deps, info, whitelist)
         }
-        ExecuteMsg::MintAndList { name, contract } => {
-            execute_mint_and_list(deps, info, name.trim(), contract)
-        }
+        ExecuteMsg::MintAndList { name } => execute_mint_and_list(deps, info, name.trim()),
     }
 }
 
@@ -116,7 +113,6 @@ pub fn execute_mint_and_list(
     deps: DepsMut,
     info: MessageInfo,
     name: &str,
-    contract: Option<String>,
 ) -> Result<Response, ContractError> {
     let sender = &info.sender.to_string();
     let mut res = Response::new();
@@ -136,7 +132,6 @@ pub fn execute_mint_and_list(
     }
 
     validate_name(name, params.min_name_length, params.max_name_length)?;
-    validate_contract(deps.as_ref(), &info, &contract)?;
 
     let price = validate_payment(name.len(), &info, params.base_price)?;
     let community_pool_msg = create_fund_community_pool_msg(vec![price]);
@@ -147,7 +142,7 @@ pub fn execute_mint_and_list(
     let msg = Sg721ExecuteMsg::Mint(MintMsg::<Metadata> {
         token_id: name.to_string(),
         owner: sender.to_string(),
-        token_uri: Some(contract.unwrap_or_else(|| sender.to_string())),
+        token_uri: None,
         extension: Metadata {
             bio: None,
             profile_nft: None,
@@ -225,28 +220,6 @@ fn validate_payment(
     Ok(coin(amount, NATIVE_DENOM))
 }
 
-/// Validate if the contract creator or admin is the sender
-fn validate_contract(
-    deps: Deps,
-    info: &MessageInfo,
-    contract_addr: &Option<String>,
-) -> Result<(), ContractError> {
-    let sender = &info.sender;
-
-    if let Some(contract) = contract_addr {
-        let res: ContractInfoResponse = deps.querier.query_wasm_contract_info(contract)?;
-        let admin = res.admin;
-        let creator = res.creator;
-
-        // If the sender is not the admin or creator, return an error
-        if admin.map_or(true, |a| &a != sender) && &creator != sender {
-            return Err(ContractError::UnauthorizedCreatorOrAdmin {});
-        }
-    }
-
-    Ok(())
-}
-
 fn invalid_char(c: char) -> bool {
     let is_valid = c.is_digit(10) || c.is_ascii_lowercase() || (c == '-');
     !is_valid

diff --git a/contracts/name-minter/src/error.rs b/contracts/name-minter/src/error.rs
@@ -17,9 +17,6 @@ pub enum ContractError {
     #[error("Name Minter: Unauthorized")]
     Unauthorized {},
 
-    #[error("Unauthorized: Not contract creator or admin")]
-    UnauthorizedCreatorOrAdmin {},
-
     #[error("Invalid reply ID")]
     InvalidReplyID {},