fix: _execute_redeem

Author: nakul1010

crates/redeem/src/lib.rs

@@ -753,28 +753,19 @@ impl<T: Config> Pallet<T> {
         )?;
 
         // if redeem has issue_id its a replace request
-        if let Some(issue_id) = redeem.issue_id {
+        let (fee, redeem_amount) = if let Some(issue_id) = redeem.issue_id {
             let replace_fee = redeem.fee();
 
             //redeem tokens for old vault
             let redeem_tokens = redeem.amount_btc().checked_sub(&replace_fee)?;
 
-            //Decreases to_be_redeem and issued tokens for old vault
-            ext::vault_registry::redeem_tokens::<T>(
-                &redeem.vault,
-                &redeem_tokens,
-                &redeem.premium()?,
-                &redeem.redeemer,
-            )?;
-
             // complete_vault_issue increases issued_tokens & decreases to_be_issued for new vault
             ext::issue::complete_vault_issue::<T>(issue_id)?;
 
             // mint wrapped fees
             replace_fee.mint_to(&ext::fee::fee_pool_account_id::<T>())?;
 
-            // distribute rewards
-            ext::fee::distribute_rewards::<T>(&replace_fee)?;
+            (replace_fee, redeem_tokens)
         } else {
             // burn amount (without parachain fee, but including transfer fee)
             let burn_amount = redeem.amount_btc().checked_add(&redeem.transfer_fee_btc())?;
@@ -784,11 +775,13 @@ impl<T: Config> Pallet<T> {
             let fee = redeem.fee();
             fee.unlock_on(&redeem.redeemer)?;
             fee.transfer(&redeem.redeemer, &ext::fee::fee_pool_account_id::<T>())?;
-            ext::fee::distribute_rewards::<T>(&fee)?;
+            (fee, burn_amount)
+        };
 
-            //redeem tokens for vault
-            ext::vault_registry::redeem_tokens::<T>(&redeem.vault, &burn_amount, &redeem.premium()?, &redeem.redeemer)?;
-        }
+        ext::fee::distribute_rewards::<T>(&fee)?;
+
+        //redeem tokens for vault
+        ext::vault_registry::redeem_tokens::<T>(&redeem.vault, &redeem_amount, &redeem.premium()?, &redeem.redeemer)?;
 
         Self::set_redeem_status(redeem_id, RedeemRequestStatus::Completed);
         Self::deposit_event(Event::<T>::ExecuteRedeem {

parachain/runtime/runtime-tests/src/parachain/redeem.rs

@@ -597,7 +597,7 @@ mod spec_based_tests {
                 set_redeem_period(2000);
                 let redeem_id = request_redeem(&vault_id);
                 SecurityPallet::set_active_block_number(1100);
-                mine_blocks(12);
+                mine_blocks(100);
                 set_redeem_period(1000);
 
                 // request still uses period = 200, so cancel fails and execute succeeds