@alphafi/alphafi-sdk 0.0.66 → 0.0.68

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

@@ -18,8 +18,12 @@ const client_js_1 = require("../sui-sdk/client.js");
 const maps_js_1 = require("../common/maps.js");
 const coins_js_1 = require("../common/coins.js");
 const getReceipts_js_1 = require("../sui-sdk/functions/getReceipts.js");
+const naviOracle_js_1 = require("./naviOracle.js");
+const V3_js_1 = require("navi-sdk/dist/libs/PTB/V3.js");
 async function loopingDeposit(poolName, amount, options) {
     let txb = new transactions_1.Transaction();
+    (0, naviOracle_js_1.updateSingleTokenPrice)(maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].pythPriceInfo, maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].feedId, txb);
+    (0, naviOracle_js_1.updateSingleTokenPrice)(maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].pythPriceInfo, maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].feedId, txb);
     if (poolName === "NAVI-LOOP-HASUI-SUI") {
         txb = await naviHasuiSuiLoopDepositTx(amount, options);
     }
@@ -39,6 +43,8 @@ async function loopingDeposit(poolName, amount, options) {
 }
 async function loopingWithdraw(poolName, xTokens, options) {
     let txb = new transactions_1.Transaction();
+    (0, naviOracle_js_1.updateSingleTokenPrice)(maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].pythPriceInfo, maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].feedId, txb);
+    (0, naviOracle_js_1.updateSingleTokenPrice)(maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].pythPriceInfo, maps_js_1.naviPriceFeedMap[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].feedId, txb);
     if (poolName === "NAVI-LOOP-HASUI-SUI") {
         txb = await naviHasuiSuiLoopWithdrawTx(xTokens, options);
     }
@@ -61,7 +67,8 @@ async function naviHasuiSuiLoopDepositTx(amount, options) {
     const suiClient = (0, client_js_1.getSuiClient)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
-    const poolData = maps_js_1.poolInfo["NAVI-LOOP-HASUI-SUI"];
+    const poolName = "NAVI-LOOP-HASUI-SUI";
+    const poolData = maps_js_1.poolInfo[poolName];
     const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-HASUI-SUI", address, true);
     let coins = [];
     let currentCursor = null;
@@ -101,9 +108,102 @@ async function naviHasuiSuiLoopDepositTx(amount, options) {
                 arguments: [txb.object(receipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.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 === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.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),
@@ -116,13 +216,9 @@ 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(maps_js_1.cetusPoolMap["NAVX-SUI"]),
-                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
                 txb.object(maps_js_1.cetusPoolMap["HASUI-SUI"]),
                 txb.object(C.HAEDEL_STAKING),
                 txb.object(C.SUI_SYSTEM_STATE),
@@ -140,8 +236,9 @@ async function naviSuiVsuiLoopDepositTx(amount, options) {
     const C = await (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
-    const poolData = maps_js_1.poolInfo["NAVI-LOOP-SUI-VSUI"];
-    const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-SUI-VSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-VSUI";
+    const poolData = maps_js_1.poolInfo[poolName];
+    const receipt = await (0, getReceipts_js_1.getReceipts)(poolName, address, true);
     let someReceipt;
     if (receipt.length == 0) {
         [someReceipt] = txb.moveCall({
@@ -158,9 +255,94 @@ async function naviSuiVsuiLoopDepositTx(amount, options) {
         });
     }
     const [depositCoin] = txb.splitCoins(txb.gas, [amount]);
+    const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+    console.log(JSON.stringify(claimableRewards, null, 2));
+    const rewardCoinSet = new Set();
+    if (claimableRewards) {
+        for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            : []) {
+            if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                if (reward.reward_coin_type === coins_js_1.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: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coins_js_1.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 === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                        typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coins_js_1.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: [coins_js_1.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),
@@ -173,12 +355,9 @@ 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(maps_js_1.cetusPoolMap["NAVX-SUI"]),
             txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
             txb.object(C.VOLO_NATIVE_POOL),
             txb.object(C.VOLO_METADATA),
@@ -194,8 +373,9 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
     const C = (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
-    const poolData = maps_js_1.poolInfo["NAVI-LOOP-SUI-STSUI"];
-    const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-SUI-STSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-STSUI";
+    const poolData = maps_js_1.poolInfo[poolName];
+    const receipt = await (0, getReceipts_js_1.getReceipts)(poolName, address, true);
     let someReceipt;
     if (receipt.length == 0) {
         [someReceipt] = txb.moveCall({
@@ -212,9 +392,98 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
         });
     }
     const [depositCoin] = txb.splitCoins(txb.gas, [amount]);
+    const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+    const rewardCoinSet = new Set();
+    if (claimableRewards) {
+        for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+            : []) {
+            if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coins_js_1.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(maps_js_1.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 === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        typeArguments: [coins_js_1.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(maps_js_1.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: [coins_js_1.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),
@@ -227,16 +496,10 @@ 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(maps_js_1.cetusPoolMap["NAVX-SUI"]),
-            txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
             txb.object(C.CLOCK_PACKAGE_ID),
         ],
     });
@@ -247,6 +510,7 @@ async function naviUsdcUsdtLoopDepositTx(amount, options) {
     const suiClient = (0, client_js_1.getSuiClient)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
+    const poolName = "NAVI-LOOP-USDC-USDT";
     const poolData = maps_js_1.poolInfo["NAVI-LOOP-USDC-USDT"];
     const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-USDC-USDT", address, true);
     let coins = [];
@@ -287,6 +551,92 @@ async function naviUsdcUsdtLoopDepositTx(amount, options) {
                 arguments: [txb.object(receipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_pool::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.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: [
@@ -406,6 +756,7 @@ async function naviHasuiSuiLoopWithdrawTx(xTokens, options) {
     const C = await (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
+    const poolName = "NAVI-LOOP-HASUI-SUI";
     const poolData = maps_js_1.poolInfo["NAVI-LOOP-HASUI-SUI"];
     const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-HASUI-SUI", address, true);
     const alphaReceipt = await (0, getReceipts_js_1.getReceipts)("ALPHA", address, true);
@@ -425,9 +776,102 @@ async function naviHasuiSuiLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.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 === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`HASUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_hasui_sui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.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),
@@ -442,13 +886,9 @@ 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(maps_js_1.cetusPoolMap["NAVX-SUI"]),
-                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
                 txb.object(maps_js_1.cetusPoolMap["HASUI-SUI"]),
                 txb.object(C.HAEDEL_STAKING),
                 txb.object(C.SUI_SYSTEM_STATE),
@@ -470,8 +910,9 @@ async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
     const C = await (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
-    const poolData = maps_js_1.poolInfo["NAVI-LOOP-SUI-VSUI"];
-    const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-SUI-VSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-VSUI";
+    const poolData = maps_js_1.poolInfo[poolName];
+    const receipt = await (0, getReceipts_js_1.getReceipts)(poolName, address, true);
     const alphaReceipt = await (0, getReceipts_js_1.getReceipts)("ALPHA", address, true);
     if (receipt.length > 0) {
         let alpha_receipt;
@@ -489,9 +930,92 @@ async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.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 === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.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: [coins_js_1.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),
@@ -506,12 +1030,9 @@ 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(maps_js_1.cetusPoolMap["NAVX-SUI"]),
                 txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
                 txb.object(C.VOLO_NATIVE_POOL),
                 txb.object(C.VOLO_METADATA),
@@ -536,8 +1057,9 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
     const C = (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
-    const poolData = maps_js_1.poolInfo["NAVI-LOOP-SUI-STSUI"];
-    const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-SUI-STSUI", address, true);
+    const poolName = "NAVI-LOOP-SUI-STSUI";
+    const poolData = maps_js_1.poolInfo[poolName];
+    const receipt = await (0, getReceipts_js_1.getReceipts)(poolName, address, true);
     const alphaReceipt = await (0, getReceipts_js_1.getReceipts)("ALPHA", address, true);
     if (receipt.length > 0) {
         let alpha_receipt;
@@ -555,9 +1077,98 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.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 === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.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: [coins_js_1.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),
@@ -572,16 +1183,10 @@ 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(maps_js_1.cetusPoolMap["NAVX-SUI"]),
-                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
                 txb.object(C.CLOCK_PACKAGE_ID),
             ],
         });
@@ -592,7 +1197,7 @@ 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;
 }
@@ -600,8 +1205,9 @@ async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
     const C = await (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
-    const poolData = maps_js_1.poolInfo["NAVI-LOOP-USDC-USDT"];
-    const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-USDC-USDT", address, true);
+    const poolName = "NAVI-LOOP-USDC-USDT";
+    const poolData = maps_js_1.poolInfo[poolName];
+    const receipt = await (0, getReceipts_js_1.getReceipts)(poolName, address, true);
     const alphaReceipt = await (0, getReceipts_js_1.getReceipts)("ALPHA", address, true);
     if (receipt.length > 0) {
         let alpha_receipt;
@@ -619,8 +1225,94 @@ async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_native_usdc_usdt_investor::collect_reward_with_two_swaps`,
+                            typeArguments: [coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.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),
@@ -635,15 +1327,10 @@ 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(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
-                txb.object(maps_js_1.cetusPoolMap["USDC-SUI"]),
                 txb.object(maps_js_1.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),
@@ -662,9 +1349,10 @@ async function naviUsdcUsdtLoopWithdrawTx(xTokens, options) {
     return txb;
 }
 async function naviUsdtUsdcLoopWithdrawTx(xTokens, options) {
-    const C = await (0, constants_js_1.getConf)();
+    const C = (0, constants_js_1.getConf)();
     const address = options.address;
     const txb = new transactions_1.Transaction();
+    const poolName = "NAVI-LOOP-USDT-USDC";
     const poolData = maps_js_1.poolInfo["NAVI-LOOP-USDT-USDC"];
     const receipt = await (0, getReceipts_js_1.getReceipts)("NAVI-LOOP-USDT-USDC", address, true);
     const alphaReceipt = await (0, getReceipts_js_1.getReceipts)("ALPHA", address, true);
@@ -684,9 +1372,118 @@ async function naviUsdtUsdcLoopWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+        const rewardCoinSet = new Set();
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].supplyCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList["USDT"].type,
+                                coins_js_1.coinsList["USDC"].type,
+                                coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList["USDT"].type,
+                                coins_js_1.coinsList["USDC"].type,
+                                coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    rewardCoinSet.add(reward.reward_coin_type);
+                }
+            }
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.loopingPoolCoinMap[poolName].borrowCoin].type.substring(2)]
+                : []) {
+                if (rewardCoinSet.has(reward.reward_coin_type) === false) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList["USDT"].type,
+                                coins_js_1.coinsList["USDC"].type,
+                                coins_js_1.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(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-USDT`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${poolData.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList["USDT"].type,
+                                coins_js_1.coinsList["USDC"].type,
+                                coins_js_1.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(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-SUI`]),
+                                txb.object(maps_js_1.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: [coins_js_1.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),
@@ -701,15 +1498,10 @@ 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(maps_js_1.cetusPoolMap["VSUI-SUI"]),
                 txb.object(maps_js_1.cetusPoolMap["USDC-USDT"]),
-                txb.object(maps_js_1.cetusPoolMap["USDC-SUI"]),
-                txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
                 txb.object(C.CLOCK_PACKAGE_ID),
             ],
         });