Merge branch 'main' into tasiov/sg-1051-names-renewal

.circleci/config.yml

@@ -253,4 +253,4 @@ jobs:
               -c "$CIRCLE_SHA1" \
               -n "$TITLE" -b "$BODY" \
               -delete \
-              "$TAG" ./artifacts/
+              "$TAG" ./artifacts/

Cargo.toml

@@ -12,7 +12,7 @@ license    = "Apache-2.0"
 [workspace.dependencies]
 cosmwasm-schema  = "1.2.1"
 cosmwasm-std     = "1.2.1"
-cw2              = "0.16.0"
+cw2              = "1.1.2"
 cw721            = "0.16.0"
 cw721-base       = "0.16.0"
 cw-controllers   = "0.16.0"
@@ -31,11 +31,11 @@ sg-metadata      = "0.22.9"
 sg-multi-test    = "0.22.9"
 sg-std           = "0.22.9"
 thiserror        = "1.0.31"
-sg-name-common   = { path = "./packages/sg-name-common" }
-sg-name          = { path = "./packages/sg-name" }
-sg-name-market   = { path = "./packages/sg-name-market" }
-sg-name-minter   = { path = "./packages/sg-name-minter" }
-name-marketplace = { path = "./contracts/marketplace", features = ["library"] }
+sg-name-common   = { version = "1.2.5", path = "./packages/sg-name-common" }
+sg-name          = { version = "1.2.5", path = "./packages/sg-name" }
+sg-name-market   = { version = "1.2.5", path = "./packages/sg-name-market" }
+sg-name-minter   = { version = "1.2.5", path = "./packages/sg-name-minter" }
+name-marketplace = { version = "1.2.5", path = "./contracts/marketplace", features = ["library"] }
 name-minter      = { path = "./contracts/name-minter", features = ["library"] }
 sg721-name       = { path = "./contracts/sg721-name", features = ["library"] }
 

contracts/sg721-name/src/contract.rs

@@ -12,6 +12,7 @@ use cw721_base::{state::TokenInfo, MintMsg};
 use cw_utils::{nonpayable, Expiration};
 
 use sg721::ExecuteMsg as Sg721ExecuteMsg;
+use sg721_base::msg::CollectionInfoResponse;
 use sg721_base::ContractError::{Claimed, Unauthorized};
 use sg_name::{Metadata, TextRecord, MAX_TEXT_LENGTH, NFT};
 use sg_name_market::SgNameMarketplaceExecuteMsg;
@@ -607,6 +608,18 @@ fn validate_address(deps: Deps, sender: &Addr, addr: Addr) -> Result<Addr, Contr
         return Ok(addr);
     }
 
+    let contract_details = cw2::query_contract_info(&deps.querier, addr.to_string())?;
+    if contract_details.contract.contains("sg721-base")
+        || contract_details.contract.contains("sg721-updatable")
+    {
+        let collection_info: CollectionInfoResponse = deps
+            .querier
+            .query_wasm_smart(&addr, &sg721_base::msg::QueryMsg::CollectionInfo {})?;
+        if collection_info.creator == sender.to_string() {
+            return Ok(addr);
+        }
+    }
+
     let ContractInfoResponse { admin, creator, .. } =
         deps.querier.query_wasm_contract_info(&addr)?;