Upcoming (#68)

* fix ci solana version (#67)

* Update switchboard-program to v0.2.0 (#66)

* oracleless repay (#64)

* oracleless repay

* lint

* the easy way

* updated test to make sure interest accumulates before repay

Co-authored-by: 0xkiplet <[email protected]>

Author: nope-finance

Cargo.lock

@@ -14,7 +14,7 @@
 if [[ -n $SOLANA_VERSION ]]; then
   solana_version="$SOLANA_VERSION"
 else
-  solana_version=v1.7.12
+  solana_version=v1.8.12
 fi
 
 export solana_version="$solana_version"

ci/solana-version.sh

@@ -17,8 +17,8 @@ bytemuck = "1.5.1"
 num-derive = "0.3"
 num-traits = "0.2"
 solana-program = "1.7.12"
-spl-token = { path = "../../token/program", features = [ "no-entrypoint" ] }
-switchboard-program = "0.1.45"
+spl-token = { path = "../../token/program", features = ["no-entrypoint"] }
+switchboard-program = "0.2.0"
 thiserror = "1.0"
 uint = "0.9.0"
 

token-lending/program/Cargo.toml

@@ -1466,6 +1466,7 @@ fn process_repay_obligation_liquidity(
         return Err(LendingError::InvalidTokenProgram.into());
     }
 
+    _refresh_reserve_interest(program_id, repay_reserve_info, clock)?;
     let mut repay_reserve = Reserve::unpack(&repay_reserve_info.data.borrow())?;
     if repay_reserve_info.owner != program_id {
         msg!("Repay reserve provided is not owned by the lending program");
@@ -1497,18 +1498,17 @@ fn process_repay_obligation_liquidity(
         msg!("Obligation lending market does not match the lending market provided");
         return Err(LendingError::InvalidAccountInput.into());
     }
-    if obligation.last_update.is_stale(clock.slot)? {
-        msg!("Obligation is stale and must be refreshed in the current slot");
-        return Err(LendingError::ObligationStale.into());
-    }
 
     let (liquidity, liquidity_index) =
-        obligation.find_liquidity_in_borrows(*repay_reserve_info.key)?;
+        obligation.find_liquidity_in_borrows_mut(*repay_reserve_info.key)?;
     if liquidity.borrowed_amount_wads == Decimal::zero() {
         msg!("Liquidity borrowed amount is zero");
         return Err(LendingError::ObligationLiquidityEmpty.into());
     }
 
+    // refreshing specific borrow instead of checking obligation stale
+    liquidity.accrue_interest(repay_reserve.liquidity.cumulative_borrow_rate_wads)?;
+
     let CalculateRepayResult {
         settle_amount,
         repay_amount,

token-lending/program/src/processor.rs

@@ -176,6 +176,21 @@ impl Obligation {
         Ok((&self.borrows[liquidity_index], liquidity_index))
     }
 
+    /// Find liquidity by borrow reserve mut
+    pub fn find_liquidity_in_borrows_mut(
+        &mut self,
+        borrow_reserve: Pubkey,
+    ) -> Result<(&mut ObligationLiquidity, usize), ProgramError> {
+        if self.borrows.is_empty() {
+            msg!("Obligation has no borrows");
+            return Err(LendingError::ObligationBorrowsEmpty.into());
+        }
+        let liquidity_index = self
+            ._find_liquidity_index_in_borrows(borrow_reserve)
+            .ok_or(LendingError::InvalidObligationLiquidity)?;
+        Ok((&mut self.borrows[liquidity_index], liquidity_index))
+    }
+
     /// Find or add liquidity by borrow reserve
     pub fn find_or_add_liquidity_to_borrows(
         &mut self,

token-lending/program/src/state/obligation.rs

@@ -10,9 +10,10 @@ use solana_sdk::{
     transaction::Transaction,
 };
 use spl_token::instruction::approve;
-use spl_token_lending::instruction::refresh_obligation;
 use spl_token_lending::{
-    instruction::repay_obligation_liquidity, processor::process_instruction,
+    instruction::repay_obligation_liquidity,
+    math::{Decimal, Rate, TryAdd, TryMul, TrySub},
+    processor::process_instruction,
     state::INITIAL_COLLATERAL_RATIO,
 };
 
@@ -31,6 +32,7 @@ async fn test_success() {
     const USDC_BORROW_AMOUNT_FRACTIONAL: u64 = 1_000 * FRACTIONAL_TO_USDC;
     const SOL_RESERVE_COLLATERAL_LAMPORTS: u64 = 2 * SOL_DEPOSIT_AMOUNT_LAMPORTS;
     const USDC_RESERVE_LIQUIDITY_FRACTIONAL: u64 = 2 * USDC_BORROW_AMOUNT_FRACTIONAL;
+    const USDC_RESERVE_BORROW_RATE: u8 = 110;
 
     let user_accounts_owner = Keypair::new();
     let user_transfer_authority = Keypair::new();
@@ -68,6 +70,7 @@ async fn test_success() {
             liquidity_amount: USDC_RESERVE_LIQUIDITY_FRACTIONAL,
             liquidity_mint_pubkey: usdc_mint.pubkey,
             liquidity_mint_decimals: usdc_mint.decimals,
+            initial_borrow_rate: USDC_RESERVE_BORROW_RATE,
             config: reserve_config,
             mark_fresh: true,
             ..AddReserveArgs::default()
@@ -103,11 +106,6 @@ async fn test_success() {
                 USDC_BORROW_AMOUNT_FRACTIONAL,
             )
             .unwrap(),
-            refresh_obligation(
-                spl_token_lending::id(),
-                test_obligation.pubkey,
-                vec![sol_test_reserve.pubkey, usdc_test_reserve.pubkey],
-            ),
             repay_obligation_liquidity(
                 spl_token_lending::id(),
                 USDC_BORROW_AMOUNT_FRACTIONAL,
@@ -143,5 +141,19 @@ async fn test_success() {
     );
 
     let obligation = test_obligation.get_state(&mut banks_client).await;
-    assert_eq!(obligation.borrows.len(), 0);
+    assert_eq!(obligation.borrows.len(), 1);
+    let new_rate = Rate::one()
+        .try_add(Rate::from_percent(USDC_RESERVE_BORROW_RATE))
+        .unwrap();
+    let new_rate_decmial = Decimal::one().try_mul(new_rate).unwrap();
+    let balance_due = new_rate_decmial
+        .try_mul(USDC_BORROW_AMOUNT_FRACTIONAL)
+        .unwrap();
+    let expected_balance_after_repay = balance_due
+        .try_sub(Decimal::from(USDC_BORROW_AMOUNT_FRACTIONAL))
+        .unwrap();
+    assert_eq!(
+        obligation.borrows[0].borrowed_amount_wads,
+        expected_balance_after_repay
+    );
 }