feat: assert gas minimums on each fn

Author: carrion256

common/src/vault.rs

@@ -1,4 +1,4 @@
-use near_sdk::{json_types::U128, near, AccountId, Gas, Promise, PromiseOrValue};
+use near_sdk::{env, json_types::U128, near, require, AccountId, Gas, Promise, PromiseOrValue};
 
 use crate::asset::{BorrowAsset, FungibleAsset};
 
@@ -154,6 +154,14 @@ pub const ALLOCATE_GAS: Gas = buffer(21);
 pub const WITHDRAW_GAS: Gas = buffer(4);
 pub const EXECUTE_WITHDRAW_GAS: Gas = buffer(9);
 
+pub fn require_at_least(needed: Gas) {
+    let gas = env::prepaid_gas();
+    require!(
+        gas >= needed,
+        format!("Insufficient gas: {}, needed: {needed}", gas)
+    );
+}
+
 #[near_sdk::ext_contract(ext_self)]
 pub trait Callbacks {
     fn after_supply_1_check(&mut self, op_id: u64, market_index: u32, attempted: U128) -> bool;

contract/vault/examples/gas_report.rs

@@ -38,10 +38,7 @@ async fn main() {
 
         (supply_gas, allocation_gas)
     });
-    let results = futures::future::join_all(futures)
-        .await
-        .expect("All futures failed")
-        .into_iter();
+    let results = futures::future::join_all(futures).await.into_iter();
 
     let mut supply_gas_average = 0f64;
     let mut allocation_gas_average = 0f64;

contract/vault/src/impl_token_receiver.rs

@@ -1,7 +1,7 @@
 use crate::{aux::ReturnStyle, Contract, ContractExt, OpState};
 use near_contract_standards::fungible_token::receiver::FungibleTokenReceiver;
 use near_sdk::{env, json_types::U128, near, require, AccountId, PromiseOrValue};
-use templar_common::vault::{AllocationMode, DepositMsg, Event, SUPPLY_GAS};
+use templar_common::vault::{require_at_least, AllocationMode, DepositMsg, Event, SUPPLY_GAS};
 
 #[allow(clippy::wildcard_imports)]
 use near_sdk_contract_tools::mt::*;
@@ -26,11 +26,7 @@ impl FungibleTokenReceiver for Contract {
 
         match msg {
             DepositMsg::Supply => {
-                require!(
-                    env::prepaid_gas() > SUPPLY_GAS,
-                    format!("Not enough gas, required {SUPPLY_GAS}")
-                );
-
+                require_at_least(SUPPLY_GAS);
                 let refund = self.execute_supply(sender_id, asset_id, amount.into());
                 PromiseOrValue::Value(refund.into())
             }
@@ -71,11 +67,7 @@ impl Nep245Receiver for Contract {
 
         match msg {
             DepositMsg::Supply => {
-                require!(
-                    env::prepaid_gas() > SUPPLY_GAS,
-                    format!("Not enough gas, required {SUPPLY_GAS}")
-                );
-
+                require_at_least(SUPPLY_GAS);
                 let mt = env::predecessor_account_id();
 
                 if !self.underlying_asset.is_nep245(&mt, token_id) {

contract/vault/src/lib.rs

@@ -4,7 +4,7 @@ use near_contract_standards::fungible_token::core::ext_ft_core;
 use near_sdk::{
     env,
     json_types::U128,
-    near, serde_json,
+    near, require, serde_json,
     store::{IterableMap, LookupMap, Vector},
     AccountId, BorshStorageKey, IntoStorageKey, PanicOnDefault, Promise, PromiseOrValue,
 };
@@ -21,11 +21,11 @@ use near_sdk_contract_tools::{owner::OwnerExternal, rbac::Rbac};
 use templar_common::{
     asset::{BorrowAsset, BorrowAssetAmount, FungibleAsset},
     vault::{
-        ext_self, AllocationMode, AllocationPlan, AllocationWeights, Error, Event,
-        MarketConfiguration, OpState, PendingValue, PendingWithdrawal, TimestampNs,
+        ext_self, require_at_least, AllocationMode, AllocationPlan, AllocationWeights, Error,
+        Event, MarketConfiguration, OpState, PendingValue, PendingWithdrawal, TimestampNs,
         VaultConfiguration, AFTER_CREATE_WITHDRAW_REQ_GAS, AFTER_SEND_TO_USER_GAS,
-        AFTER_SUPPLY_ENSURE_GAS, CREATE_WITHDRAW_REQ_GAS, MAX_QUEUE_LEN, MAX_TIMELOCK_NS,
-        MIN_TIMELOCK_NS,
+        AFTER_SUPPLY_ENSURE_GAS, ALLOCATE_GAS, CREATE_WITHDRAW_REQ_GAS, EXECUTE_WITHDRAW_GAS,
+        MAX_QUEUE_LEN, MAX_TIMELOCK_NS, MIN_TIMELOCK_NS, WITHDRAW_GAS,
     },
 };
 pub use wad::*;
@@ -731,6 +731,7 @@ impl Contract {
     /// Internally calls `redeem` after computing the share amount.
     #[payable]
     pub fn withdraw(&mut self, amount: U128, receiver: AccountId) -> PromiseOrValue<()> {
+        require_at_least(WITHDRAW_GAS);
         let shares_needed = self.preview_withdraw(amount).0;
         self.redeem(U128(shares_needed), receiver)
     }
@@ -768,6 +769,7 @@ impl Contract {
     /// Executes the next pending withdrawal request, if any, using the existing withdraw pipeline.
     /// This defers creating market-side withdrawal requests until explicitly invoked.
     pub fn execute_next_withdrawal_request(&mut self) -> PromiseOrValue<()> {
+        require_at_least(EXECUTE_WITHDRAW_GAS);
         self.ensure_idle();
         Self::assert_allocator();
 
@@ -810,6 +812,7 @@ impl Contract {
         weights: AllocationWeights,
         amount: Option<U128>,
     ) -> PromiseOrValue<()> {
+        require_at_least(ALLOCATE_GAS);
         Self::assert_allocator();
         self.ensure_idle();