Merge pull request #27 from solendprotocol/max_fixes

fixes for max stuff
solendprotocol · Aug 1, 2021 · a6b1ce1 · a6b1ce1
2 parents 34a0c7c + f391a84
commit a6b1ce1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/token-lending/program/src/processor.rs b/token-lending/program/src/processor.rs
@@ -1344,10 +1344,11 @@ fn process_borrow_obligation_liquidity(
         msg!("Borrow reserve is stale and must be refreshed in the current slot");
         return Err(LendingError::ReserveStale.into());
     }
-    if Decimal::from(liquidity_amount)
-        .try_add(borrow_reserve.liquidity.borrowed_amount_wads)?
-        .try_floor_u64()?
-        > borrow_reserve.config.borrow_limit
+    if liquidity_amount != u64::MAX
+        && Decimal::from(liquidity_amount)
+            .try_add(borrow_reserve.liquidity.borrowed_amount_wads)?
+            .try_floor_u64()?
+            > borrow_reserve.config.borrow_limit
     {
         msg!("Cannot borrow above the borrow limit");
         return Err(LendingError::InvalidAmount.into());
@@ -1474,7 +1475,6 @@ fn process_repay_obligation_liquidity(
         msg!("Liquidity amount provided cannot be zero");
         return Err(LendingError::InvalidAmount.into());
     }
-
     let account_info_iter = &mut accounts.iter();
     let source_liquidity_info = next_account_info(account_info_iter)?;
     let destination_liquidity_info = next_account_info(account_info_iter)?;

diff --git a/token-lending/program/src/state/reserve.rs b/token-lending/program/src/state/reserve.rs
@@ -433,7 +433,8 @@ impl ReserveLiquidity {
             .available_amount
             .checked_add(repay_amount)
             .ok_or(LendingError::MathOverflow)?;
-        self.borrowed_amount_wads = self.borrowed_amount_wads.try_sub(settle_amount)?;
+        let safe_settle_amount = settle_amount.min(self.borrowed_amount_wads);
+        self.borrowed_amount_wads = self.borrowed_amount_wads.try_sub(safe_settle_amount)?;
 
         Ok(())
     }