error on no funds sent when required

hard-nett · Jul 7, 2024 · a61104d · a61104d
1 parent ec62084
commit a61104d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/contracts/gauges/gauge-adapter/src/contract.rs b/contracts/gauges/gauge-adapter/src/contract.rs
@@ -89,10 +89,10 @@ fn receive_cw20_message(
                 address,
                 name,
                 url,
-                sent_assets: AssetInfo::Cw20(Cw20Coin {
+                sent_assets: Some(AssetInfo::Cw20(Cw20Coin {
                     address: cw20,
                     amount: msg.amount,
-                }),
+                })),
             },
         ),
     }
@@ -134,19 +134,27 @@ pub mod execute {
     ) -> Result<Response, ContractError> {
         let address = deps.api.addr_validate(&details.address)?;
         let sender = info.sender.clone();
+        let required_deposit = CONFIG.load(deps.storage)?.required_deposit;
 
         match &details.sent_assets {
-            AssetInfo::Cw20(_) => return Err(ContractError::Unauthorized {}),
-            AssetInfo::Native(coin) => {
-                if coin.amount != Uint128::zero()
-                    && (info.funds.len() != 1
-                        || info.funds[0].denom != coin.denom
-                        || info.funds[0].amount != coin.amount)
-                {
-                    return Err(ContractError::AssetMismatch {});
+            None => {
+                if required_deposit.is_some() {
+                    return Err(ContractError::DepositRequired {});
                 }
             }
-        };
+            Some(sent_assets) => match sent_assets {
+                AssetInfo::Cw20(_) => return Err(ContractError::Unauthorized {}),
+                AssetInfo::Native(coin) => {
+                    if coin.amount != Uint128::zero()
+                        && (info.funds.len() != 1
+                            || info.funds[0].denom != coin.denom
+                            || info.funds[0].amount != coin.amount)
+                    {
+                        return Err(ContractError::AssetMismatch {});
+                    }
+                }
+            },
+        }
         // allow to overwrite submission by the same author
         if let Some(old_submission) = SUBMISSIONS.may_load(deps.storage, address.clone())? {
             if old_submission.sender != info.sender {

diff --git a/contracts/gauges/gauge-adapter/src/msg.rs b/contracts/gauges/gauge-adapter/src/msg.rs
@@ -27,7 +27,7 @@ pub enum ExecuteMsg {
         name: String,
         url: String,
         address: String,
-        assets: AssetInfo,
+        assets: Option<AssetInfo>,
     },
     /// Sends back all deposit to senders.
     ReturnDeposits {},

diff --git a/contracts/gauges/gauge-adapter/src/state.rs b/contracts/gauges/gauge-adapter/src/state.rs
@@ -45,7 +45,7 @@ pub struct SubmissionDetails {
     pub address: String,
     pub name: String,
     pub url: String,
-    pub sent_assets: AssetInfo,
+    pub sent_assets: Option<AssetInfo>,
 }
 
 // All submissions indexed by submition's fund destination address.