add in fees when compounding and make utilization_rate stable across …

…claims
solendprotocol · Jun 6, 2022 · f81a9ed · f81a9ed
1 parent 681cd6a
commit f81a9ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/token-lending/program/src/state/reserve.rs b/token-lending/program/src/state/reserve.rs
@@ -467,7 +467,10 @@ impl ReserveLiquidity {
         if total_supply == Decimal::zero() {
             return Ok(Rate::zero());
         }
-        self.borrowed_amount_wads.try_div(total_supply)?.try_into()
+        self.borrowed_amount_wads
+            .try_add(self.accumulated_protocol_fees_wads)?
+            .try_div(total_supply)?
+            .try_into()
     }
 
     /// Compound current borrow rate over elapsed slots
@@ -487,7 +490,9 @@ impl ReserveLiquidity {
 
         let net_new_debt = self
             .borrowed_amount_wads
+            .try_add(self.accumulated_protocol_fees_wads)?
             .try_mul(compounded_interest_rate)?
+            .try_sub(self.accumulated_protocol_fees_wads)?
             .try_sub(self.borrowed_amount_wads)?;
 
         let delta_accumulated_protocol_fees = net_new_debt.try_mul(take_rate)?;

diff --git a/token-lending/program/tests/redeem_fees.rs b/token-lending/program/tests/redeem_fees.rs
@@ -214,13 +214,13 @@ async fn test_success() {
     );
 
     // utilization increases because redeeming adds to borrows and takes from availible
-    assert!(
-        usdc_reserve_before.liquidity.utilization_rate().unwrap()
-            < usdc_reserve.liquidity.utilization_rate().unwrap(),
+    assert_eq!(
+        usdc_reserve_before.liquidity.utilization_rate().unwrap(),
+        usdc_reserve.liquidity.utilization_rate().unwrap()
     );
-    assert!(
-        sol_reserve_before.liquidity.utilization_rate().unwrap()
-            < sol_reserve.liquidity.utilization_rate().unwrap(),
+    assert_eq!(
+        sol_reserve_before.liquidity.utilization_rate().unwrap(),
+        sol_reserve.liquidity.utilization_rate().unwrap()
     );
     assert_eq!(
         sol_reserve.liquidity.cumulative_borrow_rate_wads,

diff --git a/token-lending/program/tests/refresh_obligation.rs b/token-lending/program/tests/refresh_obligation.rs
@@ -27,7 +27,7 @@ async fn test_success() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(44_000);
+    test.set_bpf_compute_max_units(45_000);
 
     const SOL_DEPOSIT_AMOUNT: u64 = 100;
     const USDC_BORROW_AMOUNT: u64 = 1_000;