From afb2b0f7b3f5981a45b6f2bf0a7bd0f807b17047 Mon Sep 17 00:00:00 2001
From: Ninjatosba <adenizcorlu@gmail.com>
Date: Sat, 17 Feb 2024 12:45:18 +0300
Subject: [PATCH] fix zero payments

---
 contracts/minters/minter/src/contract.rs      | 25 +++++++++++--------
 .../minters/multi-mint-oem/src/contract.rs    | 24 ++++++++++--------
 .../open-edition-minter/src/contract.rs       | 23 +++++++++--------
 3 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/contracts/minters/minter/src/contract.rs b/contracts/minters/minter/src/contract.rs
index 9c46644..ab316a4 100644
--- a/contracts/minters/minter/src/contract.rs
+++ b/contracts/minters/minter/src/contract.rs
@@ -8,7 +8,7 @@ use cosmwasm_std::{
     to_json_binary, Addr, Binary, Coin, CosmosMsg, Decimal, Deps, DepsMut, Env, MessageInfo, Order,
     Response, StdResult, Uint128, WasmMsg,
 };
-use cw_utils::{maybe_addr, must_pay, nonpayable};
+use cw_utils::{may_pay, maybe_addr, must_pay, nonpayable};
 use minter_types::{generate_mint_message, CollectionDetails};
 use omniflix_minter_factory::msg::QueryMsg::Params as QueryFactoryParams;
 use omniflix_minter_factory::msg::{CreateMinterMsg, ParamsResponse};
@@ -338,7 +338,7 @@ pub fn execute_mint(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Respon
     MINTED_TOKENS.save(deps.storage, info.sender.clone(), &user_details)?;
 
     // Check the payment
-    let amount = must_pay(&info, &mint_price.denom)?;
+    let amount = may_pay(&info, &mint_price.denom)?;
     // Exact amount must be paid
     if amount != mint_price.amount {
         return Err(ContractError::IncorrectPaymentAmount {
@@ -371,17 +371,20 @@ pub fn execute_mint(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Respon
     )
     .into();
 
-    // Create the Bank send message
-    let bank_msg: CosmosMsg = CosmosMsg::Bank(cosmwasm_std::BankMsg::Send {
-        to_address: payment_collector.into_string(),
-        amount: vec![Coin {
-            denom: mint_price.denom,
-            amount: mint_price.amount,
-        }],
-    });
+    if !mint_price.amount.is_zero() {
+        // Create the Bank send message
+        let bank_msg: CosmosMsg = CosmosMsg::Bank(cosmwasm_std::BankMsg::Send {
+            to_address: payment_collector.into_string(),
+            amount: vec![Coin {
+                denom: mint_price.denom,
+                amount: mint_price.amount,
+            }],
+        });
+
+        messages.push(bank_msg.clone());
+    }
 
     messages.push(mint_msg.clone());
-    messages.push(bank_msg.clone());
 
     let res = Response::new()
         .add_messages(messages)
diff --git a/contracts/minters/multi-mint-oem/src/contract.rs b/contracts/minters/multi-mint-oem/src/contract.rs
index 0722556..9ec13ae 100644
--- a/contracts/minters/multi-mint-oem/src/contract.rs
+++ b/contracts/minters/multi-mint-oem/src/contract.rs
@@ -7,7 +7,7 @@ use cosmwasm_std::{
     to_json_binary, Addr, Binary, Coin, CosmosMsg, Decimal, Deps, DepsMut, Env, MessageInfo,
     Response, StdResult, Timestamp, Uint128, WasmMsg,
 };
-use cw_utils::{maybe_addr, must_pay, nonpayable};
+use cw_utils::{may_pay, maybe_addr, must_pay, nonpayable};
 use minter_types::{generate_mint_message, CollectionDetails, Config, Token, UserDetails};
 use multi_mint_open_edition_minter_types::QueryMsg;
 use pauser::PauseState;
@@ -382,7 +382,8 @@ pub fn execute_mint(
     minted_tokens.save(deps.storage, drop_id, info.sender.clone(), &user_details);
 
     // Check the payment
-    let amount = must_pay(&info, &mint_price.denom)?;
+    // Can be set to zero so use may_pay
+    let amount = may_pay(&info, &mint_price.denom)?;
     // Exact amount must be paid
     if amount != mint_price.amount {
         return Err(ContractError::IncorrectPaymentAmount {
@@ -408,17 +409,18 @@ pub fn execute_mint(
     )
     .into();
 
-    // Create the Bank send message
-    let bank_msg: CosmosMsg = CosmosMsg::Bank(cosmwasm_std::BankMsg::Send {
-        to_address: payment_collector.into_string(),
-        amount: vec![Coin {
-            denom: mint_price.denom,
-            amount: mint_price.amount,
-        }],
-    });
+    if !mint_price.amount.is_zero() {
+        let bank_msg: CosmosMsg = CosmosMsg::Bank(cosmwasm_std::BankMsg::Send {
+            to_address: payment_collector.into_string(),
+            amount: vec![Coin {
+                denom: mint_price.denom,
+                amount: mint_price.amount,
+            }],
+        });
+        messages.push(bank_msg.clone());
+    }
 
     messages.push(mint_msg.clone());
-    messages.push(bank_msg.clone());
 
     let res = Response::new()
         .add_messages(messages)
diff --git a/contracts/minters/open-edition-minter/src/contract.rs b/contracts/minters/open-edition-minter/src/contract.rs
index 8352bfe..69d135b 100644
--- a/contracts/minters/open-edition-minter/src/contract.rs
+++ b/contracts/minters/open-edition-minter/src/contract.rs
@@ -8,7 +8,7 @@ use cosmwasm_std::{
     to_json_binary, Addr, Binary, Coin, CosmosMsg, Decimal, Deps, DepsMut, Env, MessageInfo,
     Response, StdResult, Uint128, WasmMsg,
 };
-use cw_utils::{maybe_addr, must_pay, nonpayable};
+use cw_utils::{may_pay, maybe_addr, must_pay, nonpayable};
 use minter_types::{generate_mint_message, CollectionDetails, Config, Token, UserDetails};
 use open_edition_minter_types::QueryMsg;
 use pauser::PauseState;
@@ -316,7 +316,7 @@ pub fn execute_mint(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Respon
     }
 
     // Check the payment
-    let amount = must_pay(&info, &mint_price.denom)?;
+    let amount = may_pay(&info, &mint_price.denom)?;
     // Exact amount must be paid
     if amount != mint_price.amount {
         return Err(ContractError::IncorrectPaymentAmount {
@@ -349,16 +349,17 @@ pub fn execute_mint(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Respon
     .into();
 
     // Create the Bank send message
-    let bank_msg: CosmosMsg = CosmosMsg::Bank(cosmwasm_std::BankMsg::Send {
-        to_address: payment_collector.into_string(),
-        amount: vec![Coin {
-            denom: mint_price.denom,
-            amount: mint_price.amount,
-        }],
-    });
-
+    if !mint_price.amount.is_zero() {
+        let bank_msg: CosmosMsg = CosmosMsg::Bank(cosmwasm_std::BankMsg::Send {
+            to_address: payment_collector.into_string(),
+            amount: vec![Coin {
+                denom: mint_price.denom,
+                amount: mint_price.amount,
+            }],
+        });
+        messages.push(bank_msg.clone());
+    }
     messages.push(mint_msg.clone());
-    messages.push(bank_msg.clone());
 
     let res = Response::new()
         .add_messages(messages)