Include mint price denom check in stage validation

public-awesome · Nov 10, 2024 · c6e16fc · c6e16fc
1 parent 87753c9
commit c6e16fc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 42 deletions.
diff --git a/contracts/whitelists/tiered-whitelist-flex/src/helpers.rs b/contracts/whitelists/tiered-whitelist-flex/src/helpers.rs
@@ -35,20 +35,14 @@ pub fn validate_stages(env: &Env, stages: &[Stage]) -> Result<(), ContractError>
         StdError::generic_err("Cannot have more than 3 stages")
     );
 
-    // // Check mint price is valid
-    // if stages
-    //     .iter()
-    //     .any(|stage| stage.mint_price.amount.u128() < MIN_MINT_PRICE)
-    // {
-    //     return Err(ContractError::InvalidUnitPrice(
-    //         MIN_MINT_PRICE,
-    //         stages
-    //             .iter()
-    //             .map(|s| s.mint_price.amount.u128())
-    //             .min()
-    //             .unwrap(),
-    //     ));
-    // }
+    // Check stages have matching mint price denoms
+    let mint_denom = stages[0].mint_price.denom.clone();
+    ensure!(
+        stages
+            .iter()
+            .all(|stage| stage.mint_price.denom == mint_denom),
+        StdError::generic_err("All stages must have the same mint price denom")
+    );
 
     ensure!(
         stages[0].start_time > env.block.time,

diff --git a/contracts/whitelists/tiered-whitelist-merkletree/src/helpers/utils.rs b/contracts/whitelists/tiered-whitelist-merkletree/src/helpers/utils.rs
@@ -59,20 +59,14 @@ pub fn validate_stages(env: &Env, stages: &[Stage]) -> Result<(), ContractError>
         });
     }
 
-    // // Check mint price is valid
-    // if stages
-    //     .iter()
-    //     .any(|stage| stage.mint_price.amount.u128() < MIN_MINT_PRICE)
-    // {
-    //     return Err(ContractError::InvalidUnitPrice(
-    //         MIN_MINT_PRICE,
-    //         stages
-    //             .iter()
-    //             .map(|s| s.mint_price.amount.u128())
-    //             .min()
-    //             .unwrap(),
-    //     ));
-    // }
+    // Check stages have matching mint price denoms
+    let mint_denom = stages[0].mint_price.denom.clone();
+    ensure!(
+        stages
+            .iter()
+            .all(|stage| stage.mint_price.denom == mint_denom),
+        StdError::generic_err("All stages must have the same mint price denom")
+    );
 
     ensure!(
         stages[0].start_time > env.block.time,

diff --git a/contracts/whitelists/tiered-whitelist/src/helpers.rs b/contracts/whitelists/tiered-whitelist/src/helpers.rs
@@ -51,20 +51,14 @@ pub fn validate_stages(env: &Env, stages: &[Stage]) -> Result<(), ContractError>
         });
     }
 
-    // // Check mint price is valid
-    // if stages
-    //     .iter()
-    //     .any(|stage| stage.mint_price.amount.u128() < MIN_MINT_PRICE)
-    // {
-    //     return Err(ContractError::InvalidUnitPrice(
-    //         MIN_MINT_PRICE,
-    //         stages
-    //             .iter()
-    //             .map(|s| s.mint_price.amount.u128())
-    //             .min()
-    //             .unwrap(),
-    //     ));
-    // }
+    // Check stages have matching mint price denoms
+    let mint_denom = stages[0].mint_price.denom.clone();
+    ensure!(
+        stages
+            .iter()
+            .all(|stage| stage.mint_price.denom == mint_denom),
+        StdError::generic_err("All stages must have the same mint price denom")
+    );
 
     ensure!(
         stages[0].start_time > env.block.time,