Passage-Chain · tasiov · Jun 22, 2022 · Jun 22, 2022 · Jun 22, 2022
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/minter-metadata-onchain/Cargo.toml b/contracts/minter-metadata-onchain/Cargo.toml
@@ -31,7 +31,6 @@ schemars = "0.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 pg721-metadata-onchain = { path = "../pg721-metadata-onchain", features = ["library"] }
 thiserror = { version = "1.0" }
-url = "2.2.0"
 whitelist = { path = "../whitelist", features = ["library"] }
 cw721 = "0.13.1"
 cw721-base = { version = "0.13.1", features = ["library"] }

diff --git a/contracts/minter-metadata-onchain/schema/config.json b/contracts/minter-metadata-onchain/schema/config.json
@@ -4,7 +4,6 @@
   "type": "object",
   "required": [
     "admin",
-    "base_token_uri",
     "cw721_code_id",
     "max_num_tokens",
     "per_address_limit",
@@ -15,9 +14,6 @@
     "admin": {
       "$ref": "#/definitions/Addr"
     },
-    "base_token_uri": {
-      "type": "string"
-    },
     "cw721_code_id": {
       "type": "integer",
       "format": "uint64",

diff --git a/contracts/minter-metadata-onchain/schema/config_response.json b/contracts/minter-metadata-onchain/schema/config_response.json
@@ -4,7 +4,6 @@
   "type": "object",
   "required": [
     "admin",
-    "base_token_uri",
     "cw721_address",
     "cw721_code_id",
     "max_num_tokens",
@@ -16,9 +15,6 @@
     "admin": {
       "type": "string"
     },
-    "base_token_uri": {
-      "type": "string"
-    },
     "cw721_address": {
       "type": "string"
     },

diff --git a/contracts/minter-metadata-onchain/schema/instantiate_msg.json b/contracts/minter-metadata-onchain/schema/instantiate_msg.json
@@ -3,7 +3,6 @@
   "title": "InstantiateMsg",
   "type": "object",
   "required": [
-    "base_token_uri",
     "cw721_code_id",
     "cw721_instantiate_msg",
     "max_num_tokens",
@@ -12,9 +11,6 @@
     "unit_price"
   ],
   "properties": {
-    "base_token_uri": {
-      "type": "string"
-    },
     "cw721_code_id": {
       "type": "integer",
       "format": "uint64",

diff --git a/contracts/minter-metadata-onchain/src/contract.rs b/contracts/minter-metadata-onchain/src/contract.rs
@@ -12,7 +12,6 @@ use cw_utils::{may_pay, parse_reply_instantiate_data};
 use pg721_metadata_onchain::msg::{
     InstantiateMsg as Pg721InstantiateMsg, ExecuteMsg as Pg721ExecuteMsg, Metadata
 };
-use url::Url;
 
 use crate::error::ContractError;
 use crate::msg::{
@@ -61,10 +60,6 @@ pub fn instantiate(
         });
     }
 
-    // Check that base_token_uri is a valid IPFS uri
-    Url::parse(&msg.base_token_uri)
-    .or_else(|_err: url::ParseError| Err(ContractError::InvalidBaseTokenURI {}))?;
-
     // If current time is beyond the provided start time return error
     if env.block.time > msg.start_time {
         return Err(ContractError::InvalidStartTime(
@@ -80,7 +75,6 @@ pub fn instantiate(
 
     let config = Config {
         admin: info.sender.clone(),
-        base_token_uri: msg.base_token_uri,
         max_num_tokens: msg.max_num_tokens,
         cw721_code_id: msg.cw721_code_id,
         unit_price: msg.unit_price,
@@ -425,7 +419,7 @@ fn _execute_mint(
     let mint_msg = Pg721ExecuteMsg::Mint(MintMsg::<Option<Metadata>> {
         token_id: mintable_token_id.to_string(),
         owner: recipient_addr.to_string(),
-        token_uri: Some(format!("{}/{}", config.base_token_uri, mintable_token_id)),
+        token_uri: None,
         extension: Some(token_mint.metadata),
     });
     let msg = CosmosMsg::Wasm(WasmMsg::Execute {
@@ -569,7 +563,6 @@ fn query_config(deps: Deps) -> StdResult<ConfigResponse> {
 
     Ok(ConfigResponse {
         admin: config.admin.to_string(),
-        base_token_uri: config.base_token_uri,
         cw721_address: cw721_address.to_string(),
         cw721_code_id: config.cw721_code_id,
         max_num_tokens: config.max_num_tokens,

diff --git a/contracts/minter-metadata-onchain/src/contract_tests.rs b/contracts/minter-metadata-onchain/src/contract_tests.rs
@@ -115,7 +115,6 @@ fn setup_minter_contract(
         start_time: Timestamp::from_nanos(START_TIME),
         per_address_limit: 5,
         whitelist: None,
-        base_token_uri: "ipfs://QmYxw1rURvnbQbBRTfmVaZtxSrkrfsbodNzibgBrVrUrtN".to_string(),
         cw721_code_id,
         cw721_instantiate_msg: Pg721InstantiateMsg {
             name: String::from("TEST"),
@@ -259,7 +258,6 @@ fn initialization() {
         start_time: Timestamp::from_nanos(START_TIME),
         per_address_limit: 0,
         whitelist: None,
-        base_token_uri: "ipfs://QmYxw1rURvnbQbBRTfmVaZtxSrkrfsbodNzibgBrVrUrtN".to_string(),
         cw721_code_id: 1,
         cw721_instantiate_msg: Pg721InstantiateMsg {
             name: String::from("TEST"),
@@ -287,7 +285,6 @@ fn initialization() {
         start_time: Timestamp::from_nanos(START_TIME),
         per_address_limit: 5,
         whitelist: None,
-        base_token_uri: "ipfs://QmYxw1rURvnbQbBRTfmVaZtxSrkrfsbodNzibgBrVrUrtN".to_string(),
         cw721_code_id: 1,
         cw721_instantiate_msg: Pg721InstantiateMsg {
             name: String::from("TEST"),
@@ -1152,7 +1149,6 @@ fn test_start_time_before_genesis() {
         start_time: Timestamp::from_nanos(START_TIME),
         per_address_limit: 5,
         whitelist: None,
-        base_token_uri: "ipfs://QmYxw1rURvnbQbBRTfmVaZtxSrkrfsbodNzibgBrVrUrtN".to_string(),
         cw721_code_id,
         cw721_instantiate_msg: Pg721InstantiateMsg {
             name: String::from("TEST"),
@@ -1202,7 +1198,6 @@ fn test_update_start_time() {
         start_time: Timestamp::from_nanos(START_TIME),
         per_address_limit: 5,
         whitelist: None,
-        base_token_uri: "ipfs://QmYxw1rURvnbQbBRTfmVaZtxSrkrfsbodNzibgBrVrUrtN".to_string(),
         cw721_code_id,
         cw721_instantiate_msg: Pg721InstantiateMsg {
             name: String::from("TEST"),
@@ -1260,7 +1255,6 @@ fn test_invalid_start_time() {
         start_time: Timestamp::from_nanos(START_TIME - 100),
         per_address_limit: 5,
         whitelist: None,
-        base_token_uri: "ipfs://QmYxw1rURvnbQbBRTfmVaZtxSrkrfsbodNzibgBrVrUrtN".to_string(),
         cw721_code_id,
         cw721_instantiate_msg: Pg721InstantiateMsg {
             name: String::from("TEST"),

diff --git a/contracts/minter-metadata-onchain/src/error.rs b/contracts/minter-metadata-onchain/src/error.rs
@@ -1,7 +1,6 @@
 use cosmwasm_std::{Coin, StdError, Timestamp};
 use cw_utils::PaymentError;
 use thiserror::Error;
-use url::ParseError;
 
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
@@ -80,9 +79,3 @@ pub enum ContractError {
     #[error("{0}")]
     Payment(#[from] PaymentError),
 }
-
-impl From<ParseError> for ContractError {
-    fn from(_err: ParseError) -> ContractError {
-        ContractError::InvalidBaseTokenURI {}
-    }
-}
diff --git a/contracts/minter-metadata-onchain/src/msg.rs b/contracts/minter-metadata-onchain/src/msg.rs
@@ -7,7 +7,6 @@ use crate::state::{TokenMint};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct InstantiateMsg {
-    pub base_token_uri: String,
     pub max_num_tokens: u32,
     pub cw721_code_id: u64,
     pub cw721_instantiate_msg: Pg721InstantiateMsg,
@@ -50,7 +49,6 @@ pub enum QueryMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct ConfigResponse {
     pub admin: String,
-    pub base_token_uri: String,
     pub max_num_tokens: u32,
     pub per_address_limit: u32,
     pub cw721_address: String,