@alphafi/alphafi-sdk 0.0.66 → 0.0.68

package/dist/esm/transactions/navi-looping.js

@@ -1,11 +1,15 @@
 import { Transaction } from "@mysten/sui/transactions";
 import { getConf } from "../common/constants.js";
 import { getSuiClient } from "../sui-sdk/client.js";
-import { cetusPoolMap, poolInfo, singleAssetPoolCoinMap, } from "../common/maps.js";
+import { cetusPoolMap, loopingAccountAddresses, loopingPoolCoinMap, naviPriceFeedMap, poolInfo, singleAssetPoolCoinMap, } from "../common/maps.js";
 import { coinsList } from "../common/coins.js";
 import { getReceipts } from "../sui-sdk/functions/getReceipts.js";
+import { updateSingleTokenPrice } from "./naviOracle.js";
+import { getAvailableRewards } from "navi-sdk/dist/libs/PTB/V3.js";
 export async function loopingDeposit(poolName, amount, options) {
     let txb = new Transaction();
+    updateSingleTokenPrice(naviPriceFeedMap[loopingPoolCoinMap[poolName].supplyCoin].pythPriceInfo, naviPriceFeedMap[loopingPoolCoinMap[poolName].supplyCoin].feedId, txb);
+    updateSingleTokenPrice(naviPriceFeedMap[loopingPoolCoinMap[poolName].borrowCoin].pythPriceInfo, naviPriceFeedMap[loopingPoolCoinMap[poolName].borrowCoin].feedId, txb);
     if (poolName === "NAVI-LOOP-HASUI-SUI") {
         txb = await naviHasuiSuiLoopDepositTx(amount, options);
     }
@@ -25,6 +29,8 @@ export async function loopingDeposit(poolName, amount, options) {
 }
 export async function loopingWithdraw(poolName, xTokens, options) {
     let txb = new Transaction();
+    updateSingleTokenPrice(naviPriceFeedMap[loopingPoolCoinMap[poolName].supplyCoin].pythPriceInfo, naviPriceFeedMap[loopingPoolCoinMap[poolName].supplyCoin].feedId, txb);
+    updateSingleTokenPrice(naviPriceFeedMap[loopingPoolCoinMap[poolName].borrowCoin].pythPriceInfo, naviPriceFeedMap[loopingPoolCoinMap[poolName].borrowCoin].feedId, txb);
     if (poolName === "NAVI-LOOP-HASUI-SUI") {
         txb = await naviHasuiSuiLoopWithdrawTx(xTokens, options);
     }
@@ -47,7 +53,8 @@ export async function naviHasuiSuiLoopDepositTx(amount, options) {
     const suiClient = getSuiClient();
     const address = options.address;
     const txb = new Transaction();
-    const poolData = poolInfo["NAVI-LOOP-HASUI-SUI"];
+    const poolName = "NAVI-LOOP-HASUI-SUI";
+    const poolData = poolInfo[poolName];
     const receipt = await getReceipts("NAVI-LOOP-HASUI-SUI", address, true);
     let coins = [];
     let currentCursor = null;
@@ -87,9 +94,102 @@ export async function naviHasuiSuiLoopDepositTx(amount, options) {
                 arguments: [txb.object(receipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                ? claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         txb.moveCall({
-            target: `${poolData.packageId}::alphafi_navi_hasui_sui_pool::user_deposit`, // change package id for testing
-            typeArguments: [C.NAVX_COIN_TYPE],
+            target: `${poolData.packageId}::alphafi_navi_hasui_sui_pool::user_deposit_v2`, // change package id for testing
             arguments: [
                 txb.object(C.ALPHA_2_VERSION), // change version object id for testing
                 txb.object(C.VERSION),
@@ -102,13 +202,9 @@ export async function naviHasuiSuiLoopDepositTx(amount, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(C.NAVI_HASUI_POOL),
                 txb.object(C.NAVI_SUI_POOL),
-                txb.object(C.NAVI_INCENTIVE_V1),
+                txb.object(C.NAVI_INCENTIVE_V3),
                 txb.object(C.NAVI_INCENTIVE_V2),
-                txb.object(C.NAVI_NAVX_FUNDS_POOL),
-                txb.object(C.NAVI_VSUI_FUNDS_POOL),
                 txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-                txb.object(cetusPoolMap["NAVX-SUI"]),
-                txb.object(cetusPoolMap["VSUI-SUI"]),
                 txb.object(cetusPoolMap["HASUI-SUI"]),
                 txb.object(C.HAEDEL_STAKING),
                 txb.object(C.SUI_SYSTEM_STATE),
@@ -126,8 +222,9 @@ export async function naviSuiVsuiLoopDepositTx(amount, options) {
     const C = await getConf();
     const address = options.address;
     const txb = new Transaction();
-    const poolData = poolInfo["NAVI-LOOP-SUI-VSUI"];
-    const receipt = await getReceipts("NAVI-LOOP-SUI-VSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-VSUI";
+    const poolData = poolInfo[poolName];
+    const receipt = await getReceipts(poolName, address, true);
     let someReceipt;
     if (receipt.length == 0) {
         [someReceipt] = txb.moveCall({
@@ -144,9 +241,94 @@ export async function naviSuiVsuiLoopDepositTx(amount, options) {
         });
     }
     const [depositCoin] = txb.splitCoins(txb.gas, [amount]);
+    const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+    console.log(JSON.stringify(claimableRewards, null, 2));
+    const rewardCoinSet = new Set();
+    if (claimableRewards) {
+        for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            : []) {
+            if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    rewardCoinSet.add(reward.reward_coin_type);
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                        typeArguments: [coinsList["NAVX"].type],
+                        arguments: [
+                            txb.object(poolData.investorId),
+                            txb.object(C.ALPHA_2_VERSION),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                            txb.object(C.VOLO_NATIVE_POOL),
+                            txb.object(C.VOLO_METADATA),
+                            txb.object(C.SUI_SYSTEM_STATE),
+                            txb.object(cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(cetusPoolMap[`VSUI-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_no_swap`,
+                        arguments: [
+                            txb.object(poolData.investorId),
+                            txb.object(C.ALPHA_2_VERSION),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                        ],
+                    });
+                }
+                rewardCoinSet.add(reward.reward_coin_type);
+            }
+        }
+        for (const reward of claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+            ? claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+            : []) {
+            if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                        typeArguments: [coinsList["NAVX"].type],
+                        arguments: [
+                            txb.object(poolData.investorId),
+                            txb.object(C.ALPHA_2_VERSION),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                            txb.object(C.VOLO_NATIVE_POOL),
+                            txb.object(C.VOLO_METADATA),
+                            txb.object(C.SUI_SYSTEM_STATE),
+                            txb.object(cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(cetusPoolMap[`VSUI-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_no_swap`,
+                        arguments: [
+                            txb.object(poolData.investorId),
+                            txb.object(C.ALPHA_2_VERSION),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                        ],
+                    });
+                }
+                rewardCoinSet.add(reward.reward_coin_type);
+            }
+        }
+    }
     txb.moveCall({
-        target: `${poolData.packageId}::alphafi_navi_sui_vsui_pool::user_deposit`,
-        typeArguments: [coinsList["NAVX"].type],
+        target: `${poolData.packageId}::alphafi_navi_sui_vsui_pool::user_deposit_v2`,
         arguments: [
             txb.object(C.ALPHA_2_VERSION),
             txb.object(C.VERSION),
@@ -159,12 +341,9 @@ export async function naviSuiVsuiLoopDepositTx(amount, options) {
             txb.object(C.NAVI_STORAGE),
             txb.object(C.NAVI_VSUI_POOL),
             txb.object(C.NAVI_SUI_POOL),
-            txb.object(C.NAVI_INCENTIVE_V1),
+            txb.object(C.NAVI_INCENTIVE_V3),
             txb.object(C.NAVI_INCENTIVE_V2),
-            txb.object(C.NAVI_NAVX_FUNDS_POOL),
-            txb.object(C.NAVI_VSUI_FUNDS_POOL),
             txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-            txb.object(cetusPoolMap["NAVX-SUI"]),
             txb.object(cetusPoolMap["VSUI-SUI"]),
             txb.object(C.VOLO_NATIVE_POOL),
             txb.object(C.VOLO_METADATA),
@@ -180,8 +359,9 @@ export async function naviSuiStsuiLoopDepositTx(amount, options) {
     const C = getConf();
     const address = options.address;
     const txb = new Transaction();
-    const poolData = poolInfo["NAVI-LOOP-SUI-STSUI"];
-    const receipt = await getReceipts("NAVI-LOOP-SUI-STSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-STSUI";
+    const poolData = poolInfo[poolName];
+    const receipt = await getReceipts(poolName, address, true);
     let someReceipt;
     if (receipt.length == 0) {
         [someReceipt] = txb.moveCall({
@@ -198,9 +378,98 @@ export async function naviSuiStsuiLoopDepositTx(amount, options) {
         });
     }
     const [depositCoin] = txb.splitCoins(txb.gas, [amount]);
+    const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+    const rewardCoinSet = new Set();
+    if (claimableRewards) {
+        for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            : []) {
+            if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coinsList["NAVX"].type],
+                        arguments: [
+                            txb.object(C.ALPHA_5_VERSION),
+                            txb.object(poolData.investorId),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                            txb.object(C.LST_INFO),
+                            txb.object(C.SUI_SYSTEM_STATE),
+                            txb.object(cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coinsList["VSUI"].type],
+                        arguments: [
+                            txb.object(C.ALPHA_5_VERSION),
+                            txb.object(poolData.investorId),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                            txb.object(C.LST_INFO),
+                            txb.object(C.SUI_SYSTEM_STATE),
+                            txb.object(cetusPoolMap[`VSUI-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                        ],
+                    });
+                }
+                rewardCoinSet.add(reward.reward_coin_type);
+            }
+        }
+        for (const reward of claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+            ? claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+            : []) {
+            if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coinsList["NAVX"].type],
+                        arguments: [
+                            txb.object(C.ALPHA_5_VERSION),
+                            txb.object(poolData.investorId),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                            txb.object(C.LST_INFO),
+                            txb.object(C.SUI_SYSTEM_STATE),
+                            txb.object(cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coinsList["VSUI"].type],
+                        arguments: [
+                            txb.object(C.ALPHA_5_VERSION),
+                            txb.object(poolData.investorId),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                            txb.object(C.LST_INFO),
+                            txb.object(C.SUI_SYSTEM_STATE),
+                            txb.object(cetusPoolMap[`VSUI-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                        ],
+                    });
+                }
+                rewardCoinSet.add(reward.reward_coin_type);
+            }
+        }
+    }
     txb.moveCall({
-        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::user_deposit`,
-        typeArguments: [coinsList["NAVX"].type],
+        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::user_deposit_v2`,
         arguments: [
             txb.object(C.ALPHA_5_VERSION),
             txb.object(C.VERSION),
@@ -213,16 +482,10 @@ export async function naviSuiStsuiLoopDepositTx(amount, options) {
             txb.object(C.NAVI_STORAGE),
             txb.object(C.NAVI_STSUI_POOL),
             txb.object(C.NAVI_SUI_POOL),
-            txb.object(C.NAVI_INCENTIVE_V1),
+            txb.object(C.NAVI_INCENTIVE_V3),
             txb.object(C.NAVI_INCENTIVE_V2),
-            txb.object(C.NAVI_NAVX_FUNDS_POOL),
-            txb.object(C.NAVI_VSUI_FUNDS_POOL),
-            txb.object(C.NAVI_STSUI_FUNDS_POOL),
             txb.object(C.LST_INFO),
             txb.object(C.SUI_SYSTEM_STATE),
-            txb.object(cetusPoolMap["NAVX-SUI"]),
-            txb.object(cetusPoolMap["VSUI-SUI"]),
-            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
             txb.object(C.CLOCK_PACKAGE_ID),
         ],
     });
@@ -233,6 +496,7 @@ export async function naviUsdcUsdtLoopDepositTx(amount, options) {
     const suiClient = getSuiClient();
     const address = options.address;
     const txb = new Transaction();
+    const poolName = "NAVI-LOOP-USDC-USDT";
     const poolData = poolInfo["NAVI-LOOP-USDC-USDT"];
     const receipt = await getReceipts("NAVI-LOOP-USDC-USDT", address, true);
     let coins = [];
@@ -273,6 +537,92 @@ export async function naviUsdcUsdtLoopDepositTx(amount, options) {
                 arguments: [txb.object(receipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         txb.moveCall({
             target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::user_deposit_v2`,
             arguments: [
@@ -392,6 +742,7 @@ export async function naviHasuiSuiLoopWithdrawTx(xTokens, options) {
     const C = await getConf();
     const address = options.address;
     const txb = new Transaction();
+    const poolName = "NAVI-LOOP-HASUI-SUI";
     const poolData = poolInfo["NAVI-LOOP-HASUI-SUI"];
     const receipt = await getReceipts("NAVI-LOOP-HASUI-SUI", address, true);
     const alphaReceipt = await getReceipts("ALPHA", address, true);
@@ -411,9 +762,102 @@ export async function naviHasuiSuiLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                ? claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.HAEDEL_STAKING),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         const [hasuiCoin] = txb.moveCall({
-            target: `${poolData.packageId}::alphafi_navi_hasui_sui_pool::user_withdraw`, // change package id for testing
-            typeArguments: [C.NAVX_COIN_TYPE],
+            target: `${poolData.packageId}::alphafi_navi_hasui_sui_pool::user_withdraw_v2`, // change package id for testing
             arguments: [
                 txb.object(C.ALPHA_2_VERSION), // change  version object id for testing
                 txb.object(C.VERSION),
@@ -428,13 +872,9 @@ export async function naviHasuiSuiLoopWithdrawTx(xTokens, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(C.NAVI_HASUI_POOL),
                 txb.object(C.NAVI_SUI_POOL),
-                txb.object(C.NAVI_INCENTIVE_V1),
+                txb.object(C.NAVI_INCENTIVE_V3),
                 txb.object(C.NAVI_INCENTIVE_V2),
-                txb.object(C.NAVI_NAVX_FUNDS_POOL),
-                txb.object(C.NAVI_VSUI_FUNDS_POOL),
                 txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-                txb.object(cetusPoolMap["NAVX-SUI"]),
-                txb.object(cetusPoolMap["VSUI-SUI"]),
                 txb.object(cetusPoolMap["HASUI-SUI"]),
                 txb.object(C.HAEDEL_STAKING),
                 txb.object(C.SUI_SYSTEM_STATE),
@@ -456,8 +896,9 @@ export async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
     const C = await getConf();
     const address = options.address;
     const txb = new Transaction();
-    const poolData = poolInfo["NAVI-LOOP-SUI-VSUI"];
-    const receipt = await getReceipts("NAVI-LOOP-SUI-VSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-VSUI";
+    const poolData = poolInfo[poolName];
+    const receipt = await getReceipts(poolName, address, true);
     const alphaReceipt = await getReceipts("ALPHA", address, true);
     if (receipt.length > 0) {
         let alpha_receipt;
@@ -475,9 +916,92 @@ export async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.VOLO_NATIVE_POOL),
+                                txb.object(C.VOLO_METADATA),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_no_swap`,
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                ? claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.VOLO_NATIVE_POOL),
+                                txb.object(C.VOLO_METADATA),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_no_swap`,
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         const [vsui_coin] = txb.moveCall({
-            target: `${poolData.packageId}::alphafi_navi_sui_vsui_pool::user_withdraw`,
-            typeArguments: [coinsList["NAVX"].type],
+            target: `${poolData.packageId}::alphafi_navi_sui_vsui_pool::user_withdraw_v2`,
             arguments: [
                 txb.object(C.ALPHA_2_VERSION),
                 txb.object(C.VERSION),
@@ -492,12 +1016,9 @@ export async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(C.NAVI_VSUI_POOL),
                 txb.object(C.NAVI_SUI_POOL),
-                txb.object(C.NAVI_INCENTIVE_V1),
+                txb.object(C.NAVI_INCENTIVE_V3),
                 txb.object(C.NAVI_INCENTIVE_V2),
-                txb.object(C.NAVI_NAVX_FUNDS_POOL),
-                txb.object(C.NAVI_VSUI_FUNDS_POOL),
                 txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-                txb.object(cetusPoolMap["NAVX-SUI"]),
                 txb.object(cetusPoolMap["VSUI-SUI"]),
                 txb.object(C.VOLO_NATIVE_POOL),
                 txb.object(C.VOLO_METADATA),
@@ -522,8 +1043,9 @@ export async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
     const C = getConf();
     const address = options.address;
     const txb = new Transaction();
-    const poolData = poolInfo["NAVI-LOOP-SUI-STSUI"];
-    const receipt = await getReceipts("NAVI-LOOP-SUI-STSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-STSUI";
+    const poolData = poolInfo[poolName];
+    const receipt = await getReceipts(poolName, address, true);
     const alphaReceipt = await getReceipts("ALPHA", address, true);
     if (receipt.length > 0) {
         let alpha_receipt;
@@ -541,9 +1063,98 @@ export async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.LST_INFO),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.LST_INFO),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                ? claimableRewards["0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.LST_INFO),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.LST_INFO),
+                                txb.object(C.SUI_SYSTEM_STATE),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         const [stsui_coin] = txb.moveCall({
-            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::user_withdraw`,
-            typeArguments: [coinsList["NAVX"].type],
+            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::user_withdraw_v2`,
             arguments: [
                 txb.object(C.ALPHA_5_VERSION),
                 txb.object(C.VERSION),
@@ -558,16 +1169,10 @@ export async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(C.NAVI_STSUI_POOL),
                 txb.object(C.NAVI_SUI_POOL),
-                txb.object(C.NAVI_INCENTIVE_V1),
+                txb.object(C.NAVI_INCENTIVE_V3),
                 txb.object(C.NAVI_INCENTIVE_V2),
-                txb.object(C.NAVI_NAVX_FUNDS_POOL),
-                txb.object(C.NAVI_VSUI_FUNDS_POOL),
-                txb.object(C.NAVI_STSUI_FUNDS_POOL),
                 txb.object(C.LST_INFO),
                 txb.object(C.SUI_SYSTEM_STATE),
-                txb.object(cetusPoolMap["NAVX-SUI"]),
-                txb.object(cetusPoolMap["VSUI-SUI"]),
-                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
                 txb.object(C.CLOCK_PACKAGE_ID),
             ],
         });
@@ -578,7 +1183,7 @@ export async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
         });
     }
     else {
-        throw new Error(`No ${"NAVI-LOOP-SUI-STSUI"} Receipt`);
+        throw new Error(`No NAVI-LOOP-SUI-STSUI Receipt`);
     }
     return txb;
 }
@@ -586,8 +1191,9 @@ export async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
     const C = await getConf();
     const address = options.address;
     const txb = new Transaction();
-    const poolData = poolInfo["NAVI-LOOP-USDC-USDT"];
-    const receipt = await getReceipts("NAVI-LOOP-USDC-USDT", address, true);
+    const poolName = "NAVI-LOOP-USDC-USDT";
+    const poolData = poolInfo[poolName];
+    const receipt = await getReceipts(poolName, address, true);
     const alphaReceipt = await getReceipts("ALPHA", address, true);
     if (receipt.length > 0) {
         let alpha_receipt;
@@ -605,8 +1211,94 @@ export async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["NAVX"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coinsList["VSUI"].type],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_2_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         const [usdcCoin] = txb.moveCall({
-            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::user_withdraw_v2`,
+            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::user_withdraw_v3`,
             arguments: [
                 txb.object(C.ALPHA_2_VERSION),
                 txb.object(C.VERSION),
@@ -621,15 +1313,10 @@ export async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(C.NAVI_USDC_POOL),
                 txb.object(C.NAVI_USDT_POOL),
-                txb.object(C.NAVI_INCENTIVE_V1),
+                txb.object(C.NAVI_INCENTIVE_V3),
                 txb.object(C.NAVI_INCENTIVE_V2),
-                txb.object(C.NAVI_VSUI_FUNDS_POOL),
-                txb.object(C.NAVI_NAVX_FUNDS_POOL),
-                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-                txb.object(cetusPoolMap["VSUI-SUI"]),
-                txb.object(cetusPoolMap["NAVX-SUI"]),
-                txb.object(cetusPoolMap["USDC-SUI"]),
                 txb.object(cetusPoolMap["USDC-USDT"]),
+                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
                 txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                 txb.object(C.BLUEFIN_USDT_USDC_POOL),
                 txb.pure.bool(true),
@@ -648,9 +1335,10 @@ export async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
     return txb;
 }
 export async function naviUsdtUsdcLoopWithdrawTx(xTokens, options) {
-    const C = await getConf();
+    const C = getConf();
     const address = options.address;
     const txb = new Transaction();
+    const poolName = "NAVI-LOOP-USDT-USDC";
     const poolData = poolInfo["NAVI-LOOP-USDT-USDC"];
     const receipt = await getReceipts("NAVI-LOOP-USDT-USDC", address, true);
     const alphaReceipt = await getReceipts("ALPHA", address, true);
@@ -670,9 +1358,118 @@ export async function naviUsdtUsdcLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coinsList["USDT"].type,
+                                coinsList["USDC"].type,
+                                coinsList["SUI"].type,
+                                "0x" + reward.reward_coin_type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coinsList["USDT"].type,
+                                coinsList["USDC"].type,
+                                coinsList["SUI"].type,
+                                "0x" + reward.reward_coin_type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards[coinsList[loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                ? claimableRewards[coinsList[loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coinsList["USDT"].type,
+                                coinsList["USDC"].type,
+                                coinsList["SUI"].type,
+                                "0x" + reward.reward_coin_type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coinsList["USDT"].type,
+                                coinsList["USDC"].type,
+                                coinsList["SUI"].type,
+                                "0x" + reward.reward_coin_type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.ALPHA_5_VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-SUI`]),
+                                txb.object(cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+        }
         const [usdtCoin] = txb.moveCall({
-            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_pool::user_withdraw`,
-            typeArguments: [coinsList["NAVX"].type],
+            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_pool::user_withdraw_v2`,
             arguments: [
                 txb.object(C.ALPHA_5_VERSION),
                 txb.object(C.VERSION),
@@ -687,15 +1484,10 @@ export async function naviUsdtUsdcLoopWithdrawTx(xTokens, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(C.NAVI_USDT_POOL),
                 txb.object(C.NAVI_USDC_POOL),
-                txb.object(C.NAVI_INCENTIVE_V1),
+                txb.object(C.NAVI_INCENTIVE_V3),
                 txb.object(C.NAVI_INCENTIVE_V2),
-                txb.object(C.NAVI_VSUI_FUNDS_POOL),
-                txb.object(C.NAVI_NAVX_FUNDS_POOL),
                 txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-                txb.object(cetusPoolMap["VSUI-SUI"]),
                 txb.object(cetusPoolMap["USDC-USDT"]),
-                txb.object(cetusPoolMap["USDC-SUI"]),
-                txb.object(cetusPoolMap["NAVX-SUI"]),
                 txb.object(C.CLOCK_PACKAGE_ID),
             ],
         });