Merge pull request #93 from public-awesome/shanev/rebase-jh

Rebase of #92
public-awesome · Mar 1, 2022 · 61807b2 · 61807b2
2 parents 3239272 + 73154df
commit 61807b2
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 355 deletions.
diff --git a/contracts/minter/schema/config.json b/contracts/minter/schema/config.json
@@ -16,14 +16,6 @@
     "base_token_uri": {
       "type": "string"
     },
-    "batch_mint_limit": {
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint32",
-      "minimum": 0.0
-    },
     "num_tokens": {
       "type": "integer",
       "format": "uint64",

diff --git a/contracts/minter/schema/config_response.json b/contracts/minter/schema/config_response.json
@@ -17,14 +17,6 @@
     "base_token_uri": {
       "type": "string"
     },
-    "batch_mint_limit": {
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint32",
-      "minimum": 0.0
-    },
     "num_tokens": {
       "type": "integer",
       "format": "uint64",

diff --git a/contracts/minter/schema/execute_msg.json b/contracts/minter/schema/execute_msg.json
@@ -68,28 +68,6 @@
       },
       "additionalProperties": false
     },
-    {
-      "type": "object",
-      "required": [
-        "update_batch_mint_limit"
-      ],
-      "properties": {
-        "update_batch_mint_limit": {
-          "type": "object",
-          "required": [
-            "batch_mint_limit"
-          ],
-          "properties": {
-            "batch_mint_limit": {
-              "type": "integer",
-              "format": "uint32",
-              "minimum": 0.0
-            }
-          }
-        }
-      },
-      "additionalProperties": false
-    },
     {
       "type": "object",
       "required": [
@@ -135,28 +113,6 @@
         }
       },
       "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "batch_mint"
-      ],
-      "properties": {
-        "batch_mint": {
-          "type": "object",
-          "required": [
-            "num_mints"
-          ],
-          "properties": {
-            "num_mints": {
-              "type": "integer",
-              "format": "uint32",
-              "minimum": 0.0
-            }
-          }
-        }
-      },
-      "additionalProperties": false
     }
   ],
   "definitions": {

diff --git a/contracts/minter/schema/instantiate_msg.json b/contracts/minter/schema/instantiate_msg.json
@@ -13,14 +13,6 @@
     "base_token_uri": {
       "type": "string"
     },
-    "batch_mint_limit": {
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint32",
-      "minimum": 0.0
-    },
     "num_tokens": {
       "type": "integer",
       "format": "uint64",

diff --git a/contracts/minter/src/contract.rs b/contracts/minter/src/contract.rs
@@ -35,8 +35,6 @@ const INSTANTIATE_SG721_REPLY_ID: u64 = 1;
 // governance parameters
 const MAX_TOKEN_LIMIT: u32 = 10000;
 const MAX_PER_ADDRESS_LIMIT: u32 = 30;
-const MAX_BATCH_MINT_LIMIT: u32 = 30;
-const STARTING_BATCH_MINT_LIMIT: u32 = 5;
 const STARTING_PER_ADDRESS_LIMIT: u32 = 5;
 const MIN_MINT_PRICE: u128 = 50_000_000;
 const MINT_FEE_PERCENT: u32 = 10;
@@ -66,16 +64,6 @@ pub fn instantiate(
         }
     }
 
-    if let Some(batch_mint_limit) = msg.batch_mint_limit {
-        // Check batch mint limit is valid
-        if batch_mint_limit > MAX_BATCH_MINT_LIMIT {
-            return Err(ContractError::InvalidBatchMintLimit {
-                max: MAX_BATCH_MINT_LIMIT.to_string(),
-                got: batch_mint_limit.to_string(),
-            });
-        }
-    }
-
     // Check that base_token_uri is a valid IPFS uri
     let parsed_token_uri = Url::parse(&msg.base_token_uri)?;
     if parsed_token_uri.scheme() != "ipfs" {
@@ -95,9 +83,6 @@ pub fn instantiate(
         });
     }
 
-    // Initially set batch_mint_limit if no msg
-    let batch_mint_limit: Option<u32> = msg.batch_mint_limit.or(Some(STARTING_BATCH_MINT_LIMIT));
-
     // Initially set per_address_limit if no msg
     let per_address_limit: Option<u32> = msg.per_address_limit.or(Some(STARTING_PER_ADDRESS_LIMIT));
 
@@ -126,7 +111,6 @@ pub fn instantiate(
         sg721_code_id: msg.sg721_code_id,
         unit_price: msg.unit_price,
         per_address_limit,
-        batch_mint_limit,
         whitelist: whitelist_addr,
         start_time: Some(start_time),
     };
@@ -179,15 +163,11 @@ pub fn execute(
         ExecuteMsg::UpdatePerAddressLimit { per_address_limit } => {
             execute_update_per_address_limit(deps, env, info, per_address_limit)
         }
-        ExecuteMsg::UpdateBatchMintLimit { batch_mint_limit } => {
-            execute_update_batch_mint_limit(deps, env, info, batch_mint_limit)
-        }
         ExecuteMsg::MintTo { recipient } => execute_mint_to(deps, env, info, recipient),
         ExecuteMsg::MintFor {
             token_id,
             recipient,
         } => execute_mint_for(deps, env, info, token_id, recipient),
-        ExecuteMsg::BatchMint { num_mints } => execute_batch_mint(deps, env, info, num_mints),
         ExecuteMsg::SetWhitelist { whitelist } => {
             execute_set_whitelist(deps, env, info, &whitelist)
         }
@@ -337,40 +317,6 @@ pub fn execute_mint_for(
     )
 }
 
-pub fn execute_batch_mint(
-    deps: DepsMut,
-    env: Env,
-    _info: MessageInfo,
-    num_mints: u32,
-) -> Result<Response, ContractError> {
-    let config = CONFIG.load(deps.storage)?;
-    let mint_limit = config
-        .batch_mint_limit
-        .ok_or(ContractError::MaxBatchMintLimitExceeded {})?;
-
-    if num_mints > mint_limit {
-        return Err(ContractError::MaxBatchMintLimitExceeded {});
-    }
-
-    // NOTE: fees are handled in the `_execute_mint` function
-
-    let mut msgs: Vec<CosmosMsg<StargazeMsgWrapper>> = vec![];
-    let mint_msg = ExecuteMsg::Mint {};
-    let msg: CosmosMsg<StargazeMsgWrapper> = CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: env.contract.address.to_string(),
-        msg: to_binary(&mint_msg)?,
-        funds: vec![mint_price(deps.as_ref(), false)?],
-    });
-    for _ in 0..num_mints {
-        msgs.append(&mut vec![msg.clone()]);
-    }
-
-    Ok(Response::default()
-        .add_attribute("action", "batch_mint")
-        .add_attribute("num_mints", num_mints.to_string())
-        .add_messages(msgs))
-}
-
 fn _execute_mint(
     deps: DepsMut,
     env: Env,
@@ -545,31 +491,6 @@ pub fn execute_update_per_address_limit(
         .add_attribute("limit", per_address_limit.to_string()))
 }
 
-pub fn execute_update_batch_mint_limit(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-    batch_mint_limit: u32,
-) -> Result<Response, ContractError> {
-    let mut config = CONFIG.load(deps.storage)?;
-    if info.sender != config.admin {
-        return Err(ContractError::Unauthorized(
-            "Sender is not an admin".to_owned(),
-        ));
-    }
-    if batch_mint_limit > MAX_BATCH_MINT_LIMIT {
-        return Err(ContractError::InvalidBatchMintLimit {
-            max: MAX_BATCH_MINT_LIMIT.to_string(),
-            got: batch_mint_limit.to_string(),
-        });
-    }
-    config.batch_mint_limit = Some(batch_mint_limit);
-    CONFIG.save(deps.storage, &config)?;
-    Ok(Response::new()
-        .add_attribute("action", "update_batch_mint_limit")
-        .add_attribute("limit", batch_mint_limit.to_string()))
-}
-
 pub fn mint_price(deps: Deps, admin_no_fee: bool) -> Result<Coin, StdError> {
     // if admin_no_fee => no fee,
     // else if in whitelist => whitelist price
@@ -618,7 +539,6 @@ fn query_config(deps: Deps) -> StdResult<ConfigResponse> {
         start_time: config.start_time,
         unit_price: config.unit_price,
         per_address_limit: config.per_address_limit,
-        batch_mint_limit: config.batch_mint_limit,
         whitelist: config.whitelist,
     })
 }