[Liquidity Mining] Obligation packing & unpacking (5)

.gitignore

@@ -10,3 +10,4 @@ hfuzz_workspace
 **/*.so
 **/.DS_Store
 test-ledger
+cargo-test-*.profraw

token-lending/cli/src/main.rs

@@ -781,7 +781,6 @@ fn main() {
                         .required(true)
                         .help("Reserve address"),
                 )
-
         )
         .subcommand(
             SubCommand::with_name("update-reserve")

token-lending/program/src/processor.rs

@@ -983,7 +983,7 @@ fn process_init_obligation(program_id: &Pubkey, accounts: &[AccountInfo]) -> Pro
     let token_program_id = next_account_info(account_info_iter)?;
 
     assert_rent_exempt(rent, obligation_info)?;
-    let mut obligation = assert_uninitialized::<Obligation>(obligation_info)?;
+    let mut obligation = Obligation::unpack_uninitialized(&obligation_info.data.borrow())?;
     if obligation_info.owner != program_id {
         msg!("Obligation provided is not owned by the lending program");
         return Err(LendingError::InvalidAccountOwner.into());

token-lending/program/src/processor/liquidity_mining.rs

@@ -7,9 +7,9 @@
 //! implementation of the same feature.
 //!
 //! There are three admin-only ixs:
-//! - [add_pool_reward]
-//! - [cancel_pool_reward]
-//! - [close_pool_reward]
+//! - [add_pool_reward] (TODO: add bpf tests)
+//! - [cancel_pool_reward] (TODO: add bpf tests)
+//! - [close_pool_reward] (TODO: add bpf tests)
 //!
 //! [suilend-lm]: https://github.com/solendprotocol/suilend/blob/dc53150416f352053ac3acbb320ee143409c4a5d/contracts/suilend/sources/liquidity_mining.move#L2
 
@@ -33,6 +33,7 @@ use solana_program::{
     system_instruction,
     sysvar::Sysvar,
 };
+use solend_sdk::state::discriminator::AccountDiscriminator;
 use solend_sdk::{
     error::LendingError,
     state::{LendingMarket, PositionKind, Reserve},
@@ -282,9 +283,16 @@ pub(crate) fn upgrade_reserve(program_id: &Pubkey, accounts: &[AccountInfo]) ->
     // 3.
     //
 
-    // sanity checks pack and unpack reserves is ok
-    let reserve = Reserve::unpack(&accounts.reserve_info.data.borrow())?;
-    Reserve::pack(reserve, &mut accounts.reserve_info.data.borrow_mut())?;
+    // we upgrade discriminator as we've checked that the account is indeed
+    // a reserve account in [UpgradeReserveAccounts::from_unchecked_iter]
+    let mut data = accounts.reserve_info.data.borrow_mut();
+    data[0] = AccountDiscriminator::Reserve as u8;
+    // Now the reserve can unpack fine and doesn't have to worry about
+    // migrations.
+    // Instead it returns an error on an invalid discriminator.
+    // This way a reserve cannot be mistaken for an obligation.
+    let reserve = Reserve::unpack(&data)?;
+    Reserve::pack(reserve, &mut data)?;
 
     Ok(())
 }

token-lending/program/tests/attributed_borrows.rs

@@ -22,7 +22,7 @@ use solana_program::native_token::LAMPORTS_PER_SOL;
 
 use solend_sdk::math::Decimal;
 
-use solend_program::state::{Obligation, ReserveConfig};
+use solend_program::state::ReserveConfig;
 
 use solend_sdk::state::ReserveFees;
 mod helpers;
@@ -398,7 +398,7 @@ async fn test_calculations() {
         .await
         .unwrap();
 
-    let obligation_post = test.load_account::<Obligation>(obligations[0].pubkey).await;
+    let obligation_post = test.load_obligation(obligations[0].pubkey).await;
 
     // obligation 0 after borrowing 10 usd
     // usdc.borrow_attribution = 80 / 100 * 30 = 24
@@ -688,7 +688,7 @@ async fn test_withdraw() {
             Decimal::from_percent(250)
         );
 
-        let obligation_post = test.load_account::<Obligation>(obligations[0].pubkey).await;
+        let obligation_post = test.load_obligation(obligations[0].pubkey).await;
         assert_eq!(
             obligation_post.account.deposits[0].attributed_borrow_value,
             Decimal::from(7500u64)
@@ -733,7 +733,7 @@ async fn test_withdraw() {
             Decimal::zero()
         );
 
-        let obligation_post = test.load_account::<Obligation>(obligations[0].pubkey).await;
+        let obligation_post = test.load_obligation(obligations[0].pubkey).await;
         assert_eq!(
             obligation_post.account.deposits[0].attributed_borrow_value,
             Decimal::from(10u64)

token-lending/program/tests/borrow_obligation_liquidity.rs

@@ -77,7 +77,7 @@ async fn setup(
         .unwrap();
 
     // populate deposit value correctly.
-    let obligation = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation = test.load_obligation(obligation.pubkey).await;
     lending_market
         .refresh_obligation(&mut test, &obligation)
         .await
@@ -86,7 +86,7 @@ async fn setup(
     let lending_market = test.load_account(lending_market.pubkey).await;
     let usdc_reserve = test.load_account(usdc_reserve.pubkey).await;
     let wsol_reserve = test.load_account(wsol_reserve.pubkey).await;
-    let obligation = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation = test.load_obligation(obligation.pubkey).await;
 
     let host_fee_receiver = User::new_with_balances(&mut test, &[(&wsol_mint::id(), 0)]).await;
     (
@@ -244,7 +244,7 @@ async fn test_success() {
         wsol_reserve_post, expected_wsol_reserve_post
     );
 
-    let obligation_post = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation_post = test.load_obligation(obligation.pubkey).await;
     assert_eq!(
         obligation_post.account,
         Obligation {

token-lending/program/tests/borrow_weight.rs

@@ -37,7 +37,7 @@ async fn test_refresh_obligation() {
         .await
         .unwrap();
 
-    let obligation_post = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation_post = test.load_obligation(obligation.pubkey).await;
 
     // obligation has borrowed 10 sol and sol = $10 but since borrow weight == 2, the
     // borrowed_value is 200 instead of 100.
@@ -134,7 +134,7 @@ async fn test_borrow() {
             .await
             .unwrap();
 
-        let obligation_post = test.load_account::<Obligation>(obligation.pubkey).await;
+        let obligation_post = test.load_obligation(obligation.pubkey).await;
         // - usdc ltv is 0.5,
         // - sol borrow weight is 2
         // max you can borrow is 100 * 0.5 / 2 = 2.5 SOL
@@ -176,7 +176,7 @@ async fn test_borrow() {
 
     test.advance_clock_by_slots(1).await;
 
-    let obligation = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation = test.load_obligation(obligation.pubkey).await;
 
     // max withdraw
     {
@@ -302,7 +302,7 @@ async fn test_liquidation() {
             .await
             .unwrap();
 
-        let obligation_post = test.load_account::<Obligation>(obligation.pubkey).await;
+        let obligation_post = test.load_obligation(obligation.pubkey).await;
         // - usdc ltv is 0.5,
         // - sol borrow weight is 1
         // max you can borrow is 100 * 0.5 = 5 SOL

token-lending/program/tests/deposit_obligation_collateral.rs

@@ -80,7 +80,7 @@ async fn test_success() {
     let usdc_reserve_post = test.load_account(usdc_reserve.pubkey).await;
     assert_eq!(usdc_reserve, usdc_reserve_post);
 
-    let obligation_post = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation_post = test.load_obligation(obligation.pubkey).await;
     assert_eq!(
         obligation_post.account,
         Obligation {

token-lending/program/tests/deposit_reserve_liquidity_and_obligation_collateral.rs

@@ -119,7 +119,7 @@ async fn test_success() {
         }
     );
 
-    let obligation_post = test.load_account::<Obligation>(obligation.pubkey).await;
+    let obligation_post = test.load_obligation(obligation.pubkey).await;
     assert_eq!(
         obligation_post.account,
         Obligation {

token-lending/program/tests/forgive_debt.rs

@@ -165,7 +165,7 @@ async fn test_forgive_debt_success_easy() {
         .await
         .unwrap();
 
-    let obligation_post = test.load_account::<Obligation>(obligations[0].pubkey).await;
+    let obligation_post = test.load_obligation(obligations[0].pubkey).await;
     assert_eq!(
         obligation_post.account,
         Obligation {
@@ -182,6 +182,7 @@ async fn test_forgive_debt_success_easy() {
             allowed_borrow_value: Decimal::zero(),
             unhealthy_borrow_value: Decimal::zero(),
             super_unhealthy_borrow_value: Decimal::zero(),
+            user_reward_managers: obligation_post.account.user_reward_managers.clone(),
             ..obligations[0].account
         }
     );

token-lending/program/tests/helpers/mod.rs

@@ -117,25 +117,25 @@ pub mod bonk_mint {
 }
 
 pub trait AddPacked {
+    fn add_packed(&mut self, pubkey: Pubkey, amount: u64, data: &[u8], owner: &Pubkey);
+
     fn add_packable_account<T: Pack>(
         &mut self,
         pubkey: Pubkey,
         amount: u64,
-        data: &T,
+        unpacked: &T,
         owner: &Pubkey,
-    );
+    ) {
+        let mut data = vec![0; T::get_packed_len()];
+        unpacked.pack_into_slice(&mut data);
+        self.add_packed(pubkey, amount, &data, owner);
+    }
 }
 
 impl AddPacked for ProgramTest {
-    fn add_packable_account<T: Pack>(
-        &mut self,
-        pubkey: Pubkey,
-        amount: u64,
-        data: &T,
-        owner: &Pubkey,
-    ) {
-        let mut account = Account::new(amount, T::get_packed_len(), owner);
-        data.pack_into_slice(&mut account.data);
+    fn add_packed(&mut self, pubkey: Pubkey, amount: u64, data: &[u8], owner: &Pubkey) {
+        let mut account = Account::new(amount, data.len(), owner);
+        account.data.copy_from_slice(data);
         self.add_account(pubkey, account);
     }
 }