fix: check math in fee claim logic (#206)

mrgnlabs · May 3, 2024 · 5828906 · 5828906
1 parent abe574e
commit 5828906
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/clients/rust/marginfi-cli/src/processor/mod.rs b/clients/rust/marginfi-cli/src/processor/mod.rs
@@ -164,6 +164,9 @@ Emissions:
   Rate: {:?}
   Mint: {:?}
   Remaining: {:?}
+Unclaimed
+  Fees: {:?}
+  Insurance: {:?}
 Last Update: {:?}h ago ({})
 "#,
         bank.group,
@@ -198,6 +201,10 @@ Last Update: {:?}h ago ({})
         I80F48::from(bank.emissions_rate),
         bank.emissions_mint,
         I80F48::from(bank.emissions_remaining),
+        I80F48::from(bank.collected_group_fees_outstanding)
+            / EXP_10_I80F48[bank.mint_decimals as usize],
+        I80F48::from(bank.collected_insurance_fees_outstanding)
+            / EXP_10_I80F48[bank.mint_decimals as usize],
         SystemTime::now()
             .duration_since(UNIX_EPOCH + Duration::from_secs(bank.last_update as u64))
             .unwrap()

diff --git a/programs/marginfi/src/instructions/marginfi_group/collect_bank_fees.rs b/programs/marginfi/src/instructions/marginfi_group/collect_bank_fees.rs
@@ -29,23 +29,41 @@ pub fn lending_pool_collect_bank_fees(ctx: Context<LendingPoolCollectBankFees>)
     let mut available_liquidity = I80F48::from_num(liquidity_vault.amount);
 
     let (insurance_fee_transfer_amount, new_outstanding_insurance_fees) = {
-        let outstanding_fees = I80F48::from(bank.collected_insurance_fees_outstanding);
-        let transfer_amount = min(outstanding_fees, available_liquidity).int();
-
-        (transfer_amount.int(), outstanding_fees - transfer_amount)
+        let outstanding = I80F48::from(bank.collected_insurance_fees_outstanding);
+        let transfer_amount = min(outstanding, available_liquidity).int();
+
+        (
+            transfer_amount.int(),
+            outstanding
+                .checked_sub(transfer_amount)
+                .ok_or_else(math_error!())?,
+        )
     };
 
     bank.collected_insurance_fees_outstanding = new_outstanding_insurance_fees.into();
 
-    available_liquidity -= insurance_fee_transfer_amount;
+    available_liquidity = available_liquidity
+        .checked_sub(insurance_fee_transfer_amount)
+        .ok_or_else(math_error!())?;
 
     let (group_fee_transfer_amount, new_outstanding_group_fees) = {
-        let outstanding_fees = I80F48::from(bank.collected_group_fees_outstanding);
-        let transfer_amount = min(outstanding_fees, available_liquidity).int();
-
-        (transfer_amount.int(), outstanding_fees - transfer_amount)
+        let outstanding = I80F48::from(bank.collected_group_fees_outstanding);
+        let transfer_amount = min(outstanding, available_liquidity).int();
+
+        (
+            transfer_amount.int(),
+            outstanding
+                .checked_sub(transfer_amount)
+                .ok_or_else(math_error!())?,
+        )
     };
 
+    available_liquidity = available_liquidity
+        .checked_sub(group_fee_transfer_amount)
+        .ok_or_else(math_error!())?;
+
+    assert!(available_liquidity >= I80F48::ZERO);
+
     bank.collected_group_fees_outstanding = new_outstanding_group_fees.into();
 
     bank.withdraw_spl_transfer(