fix: correctly initialize user pending basket (#116)

Author: SushantChandla

programs/folio/src/instructions/user/redeem_folio/burn_folio_token.rs

@@ -120,6 +120,14 @@ pub fn handler<'info>(
     raw_shares: u64,
     minimum_out_for_token_amounts: Vec<MinimumOutForTokenAmount>,
 ) -> Result<()> {
+    let is_user_pending_basket_intialized = UserPendingBasket::process_init_if_needed(
+        &mut ctx.accounts.user_pending_basket,
+        ctx.bumps.user_pending_basket,
+        &ctx.accounts.user.key(),
+        &ctx.accounts.folio.key(),
+        &vec![],
+        false,
+    )?;
     let current_time = Clock::get()?.unix_timestamp;
 
     {
@@ -135,7 +143,11 @@ pub fn handler<'info>(
         .get_fee_details(&ctx.accounts.folio_fee_config)?;
 
     {
-        let token_amounts_user = &mut ctx.accounts.user_pending_basket.load_mut()?;
+        let token_amounts_user = if is_user_pending_basket_intialized {
+            &mut ctx.accounts.user_pending_basket.load_init()?
+        } else {
+            &mut ctx.accounts.user_pending_basket.load_mut()?
+        };
         let folio = &mut ctx.accounts.folio.load_mut()?;
         let folio_basket = &mut ctx.accounts.folio_basket.load_mut()?;
 

programs/folio/src/utils/accounts/user_pending_basket.rs

@@ -24,6 +24,9 @@ impl UserPendingBasket {
     /// * `folio` - The folio the UserPendingBasket account belongs to.
     /// * `added_token_amounts` - The token amounts to add to the UserPendingBasket account.
     /// * `can_add_new_mints` - Whether we can add new mints to the UserPendingBasket account.
+    ///
+    /// # Returns
+    /// * True if discriminator is initialized.
     #[cfg(not(tarpaulin_include))]
     pub fn process_init_if_needed(
         account_loader_user_pending_basket: &mut AccountLoader<UserPendingBasket>,
@@ -32,7 +35,7 @@ impl UserPendingBasket {
         folio: &Pubkey,
         added_token_amounts: &Vec<TokenAmount>,
         can_add_new_mints: bool,
-    ) -> Result<()> {
+    ) -> Result<bool> {
         let account_info_user_pending_basket = account_loader_user_pending_basket.to_account_info();
 
         let data = account_info_user_pending_basket.try_borrow_mut_data()?;
@@ -58,6 +61,7 @@ impl UserPendingBasket {
                 can_add_new_mints,
                 PendingBasketType::MintProcess,
             )?;
+            Ok(true)
         } else {
             let user_pending_basket = &mut account_loader_user_pending_basket.load_mut()?;
 
@@ -68,9 +72,8 @@ impl UserPendingBasket {
                 can_add_new_mints,
                 PendingBasketType::MintProcess,
             )?;
+            Ok(false)
         }
-
-        Ok(())
     }
 
     /// Add token amounts to the pending basket of the user. If can add new mints it mean it won't error out if the mint is not in the basket yet.

tests-ts/bankrun/tests/tests-folio-redeeming.ts

@@ -265,7 +265,7 @@ describe("Bankrun - Folio redeeming", () => {
     },
 
     {
-      desc: "(users burns max amount of shares, even when his alreadyIncludedTokens is empty)",
+      desc: "(users burns max amount of shares, even when his alreadyIncludedTokens is empty, and user pending basket is not initialized)",
       expectedError: null,
       folioBasketTokens: [
         new FolioTokenAmount(MINTS[0].publicKey, new BN(1_000).mul(D9)),
@@ -608,6 +608,12 @@ describe("Bankrun - Folio redeeming", () => {
                 userKeypair.publicKey,
                 alreadyIncludedTokens
               );
+            } else {
+              const userPendingBasket = getUserPendingBasketPDA(
+                folioPDA,
+                userKeypair.publicKey
+              );
+              await closeAccount(context, userPendingBasket);
             }
 
             await travelFutureSlot(context);
@@ -626,11 +632,19 @@ describe("Bankrun - Folio redeeming", () => {
               )
             ).basket.tokenAmounts;
 
-            userPendingBasketBefore = (
-              await programFolio.account.userPendingBasket.fetch(
-                getUserPendingBasketPDA(folioPDA, userKeypair.publicKey)
-              )
-            ).basket.tokenAmounts;
+            if (!user_pending_basket_not_initalized) {
+              userPendingBasketBefore = (
+                await programFolio.account.userPendingBasket.fetch(
+                  getUserPendingBasketPDA(folioPDA, userKeypair.publicKey)
+                )
+              ).basket.tokenAmounts;
+            } else {
+              userPendingBasketBefore = Array(110).fill({
+                mint: PublicKey.default,
+                amountForMinting: new BN(0),
+                amountForRedeeming: new BN(0),
+              });
+            }
 
             try {
               txnResult = await burnFolioToken<true>(