@alphafi/alphafi-sdk 0.0.67 → 0.0.69

package/dist/cjs/transactions/navi.js

@@ -9,6 +9,8 @@ const getReceipts_js_1 = require("../sui-sdk/functions/getReceipts.js");
 const constants_js_1 = require("../common/constants.js");
 const client_js_1 = require("../sui-sdk/client.js");
 const naviOracle_js_1 = require("./naviOracle.js");
+const V3_js_1 = require("navi-sdk/dist/libs/PTB/V3.js");
+// import { getAvailableRewards } from "navi-sdk";
 async function naviDepositTx(amount, poolName, options) {
     const C = (0, constants_js_1.getConf)();
     const suiClient = (0, client_js_1.getSuiClient)();
@@ -35,12 +37,56 @@ async function naviDepositTx(amount, poolName, options) {
             });
         }
         const [depositCoin] = txb.splitCoins(txb.gas, [amount]);
+        const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_SUI_ACCOUNT_ADDRESS);
+        if (claimableRewards) {
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                : []) {
+                if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
+                        typeArguments: [
+                            coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            coins_js_1.coinsList["NAVX"].type,
+                        ],
+                        arguments: [
+                            txb.object(poolData.investorId),
+                            txb.object(C.VERSION),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
+                        ],
+                    });
+                }
+                else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    txb.moveCall({
+                        target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
+                        typeArguments: [
+                            coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            coins_js_1.coinsList["VSUI"].type,
+                        ],
+                        arguments: [
+                            txb.object(poolData.investorId),
+                            txb.object(C.VERSION),
+                            txb.object(C.CLOCK_PACKAGE_ID),
+                            txb.object(C.NAVI_STORAGE),
+                            txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                            txb.object(C.NAVI_INCENTIVE_V3),
+                            txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                            txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                        ],
+                    });
+                }
+            }
+        }
         txb.moveCall({
-            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit_with_one_swap`,
-            typeArguments: [
-                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                coins_js_1.coinsList["VSUI"].type,
-            ],
+            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit`,
+            typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
             arguments: [
                 txb.object(C.VERSION),
                 someReceipt,
@@ -52,11 +98,8 @@ async function naviDepositTx(amount, poolName, options) {
                 txb.object(C.NAVI_STORAGE),
                 txb.object(poolData.parentPoolId),
                 txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                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.CETUS_GLOBAL_CONFIG_ID),
-                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
                 txb.object(C.CLOCK_PACKAGE_ID),
             ],
         });
@@ -101,12 +144,56 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "VSUI") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_VSUI_ACCOUNT_ADDRESS);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        : []) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-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: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_no_swap`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit_with_two_swaps`,
+                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                        coins_js_1.coinsList["SUI"].type,
-                        coins_js_1.coinsList["NAVX"].type,
                     ],
                     arguments: [
                         txb.object(C.VERSION),
@@ -119,26 +206,73 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.NAVI_STORAGE),
                         txb.object(poolData.parentPoolId),
                         txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                        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[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "WETH" ||
                 maps_js_1.singleAssetPoolCoinMap[poolName].coin == "USDT") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        : []) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["WUSDC"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["WUSDC-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["WUSDC"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["WUSDC-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit_with_three_swaps`,
+                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                        coins_js_1.coinsList["WUSDC"].type,
-                        coins_js_1.coinsList["SUI"].type,
-                        coins_js_1.coinsList["VSUI"].type,
                     ],
                     arguments: [
                         txb.object(C.VERSION),
@@ -151,25 +285,72 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.NAVI_STORAGE),
                         txb.object(poolData.parentPoolId),
                         txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                        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.CETUS_GLOBAL_CONFIG_ID),
-                        txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "WUSDC") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        : []) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["CETUS"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["CETUS-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-CETUS`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["CETUS"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["CETUS-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-CETUS`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit_with_three_swaps`,
+                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                        coins_js_1.coinsList["CETUS"].type,
-                        coins_js_1.coinsList["SUI"].type,
-                        coins_js_1.coinsList["VSUI"].type,
                     ],
                     arguments: [
                         txb.object(C.VERSION),
@@ -182,25 +363,72 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.NAVI_STORAGE),
                         txb.object(poolData.parentPoolId),
                         txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                        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.CETUS_GLOBAL_CONFIG_ID),
-                        txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap["CETUS-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-CETUS`]),
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "USDC") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        : []) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["BUCK"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["BUCK-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-BUCK`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["BUCK"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["BUCK-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-BUCK`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit_with_three_swaps`,
+                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                        coins_js_1.coinsList["BUCK"].type,
-                        coins_js_1.coinsList["SUI"].type,
-                        coins_js_1.coinsList["VSUI"].type,
                     ],
                     arguments: [
                         txb.object(C.VERSION),
@@ -213,25 +441,72 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.NAVI_STORAGE),
                         txb.object(poolData.parentPoolId),
                         txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                        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.CETUS_GLOBAL_CONFIG_ID),
-                        txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap["BUCK-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-BUCK`]),
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "USDY") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                        : []) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["WUSDC"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::collect_v3_rewards_with_three_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["WUSDC"].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.VERSION),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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["WUSDC-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit_with_three_swaps`,
+                    target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_deposit`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                        coins_js_1.coinsList["WUSDC"].type,
-                        coins_js_1.coinsList["SUI"].type,
-                        coins_js_1.coinsList["VSUI"].type,
                     ],
                     arguments: [
                         txb.object(C.VERSION),
@@ -246,19 +521,58 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
                         txb.object(C.NAVI_INCENTIVE_V1),
                         txb.object(C.NAVI_INCENTIVE_V2),
-                        txb.object(C.NAVI_VSUI_FUNDS_POOL),
-                        txb.object(C.CETUS_GLOBAL_CONFIG_ID),
-                        txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
-                        txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "AUSD" ||
                 maps_js_1.singleAssetPoolCoinMap[poolName].coin == "ETH") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit_with_three_swaps`,
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_three_swaps`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                         coins_js_1.coinsList["USDC"].type,
@@ -267,10 +581,7 @@ async function naviDepositTx(amount, poolName, options) {
                     ],
                     arguments: [
                         txb.object(C.ALPHA_3_VERSION),
-                        txb.object(C.VERSION),
-                        someReceipt,
                         txb.object(poolData.poolId),
-                        depositCoin,
                         txb.object(poolData.investorId),
                         txb.object(C.ALPHA_DISTRIBUTOR),
                         txb.object(C.PRICE_ORACLE),
@@ -287,10 +598,118 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
+                txb.moveCall({
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit`,
+                    typeArguments: [
+                        coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                    ],
+                    arguments: [
+                        txb.object(C.ALPHA_3_VERSION),
+                        txb.object(C.VERSION),
+                        someReceipt,
+                        txb.object(poolData.poolId),
+                        depositCoin,
+                        txb.object(poolData.investorId),
+                        txb.object(C.ALPHA_DISTRIBUTOR),
+                        txb.object(C.PRICE_ORACLE),
+                        txb.object(C.NAVI_STORAGE),
+                        txb.object(poolData.parentPoolId),
+                        txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                        txb.object(C.NAVI_INCENTIVE_V3),
+                        txb.object(C.NAVI_INCENTIVE_V2),
+                        txb.object(C.CLOCK_PACKAGE_ID),
+                    ],
+                });
             }
             else if (poolName === "NAVI-NS") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_NS_ACCOUNT_ADDRESS);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["DEEP"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_DEEP_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["DEEP-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["NS"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NS_REWARDS_POOL),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit_with_two_swaps_v2`,
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_two_swaps_v2`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                         coins_js_1.coinsList["SUI"].type,
@@ -298,10 +717,7 @@ async function naviDepositTx(amount, poolName, options) {
                     ],
                     arguments: [
                         txb.object(C.ALPHA_3_VERSION),
-                        txb.object(C.VERSION),
-                        someReceipt,
                         txb.object(poolData.poolId),
-                        depositCoin,
                         txb.object(poolData.investorId),
                         txb.object(C.ALPHA_DISTRIBUTOR),
                         txb.object(C.PRICE_ORACLE),
@@ -318,10 +734,76 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
+                txb.moveCall({
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit`,
+                    typeArguments: [
+                        coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                    ],
+                    arguments: [
+                        txb.object(C.ALPHA_3_VERSION),
+                        txb.object(C.VERSION),
+                        someReceipt,
+                        txb.object(poolData.poolId),
+                        depositCoin,
+                        txb.object(poolData.investorId),
+                        txb.object(C.ALPHA_DISTRIBUTOR),
+                        txb.object(C.PRICE_ORACLE),
+                        txb.object(C.NAVI_STORAGE),
+                        txb.object(poolData.parentPoolId),
+                        txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                        txb.object(C.NAVI_INCENTIVE_V3),
+                        txb.object(C.NAVI_INCENTIVE_V2),
+                        txb.object(C.CLOCK_PACKAGE_ID),
+                    ],
+                });
             }
             else if (poolName === "NAVI-NAVX") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_NAVX_ACCOUNT_ADDRESS);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit_with_two_swaps_v2`,
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_two_swaps_v2`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                         coins_js_1.coinsList["SUI"].type,
@@ -329,10 +811,7 @@ async function naviDepositTx(amount, poolName, options) {
                     ],
                     arguments: [
                         txb.object(C.ALPHA_3_VERSION),
-                        txb.object(C.VERSION),
-                        someReceipt,
                         txb.object(poolData.poolId),
-                        depositCoin,
                         txb.object(poolData.investorId),
                         txb.object(C.ALPHA_DISTRIBUTOR),
                         txb.object(C.PRICE_ORACLE),
@@ -349,10 +828,76 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
+                txb.moveCall({
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit`,
+                    typeArguments: [
+                        coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                    ],
+                    arguments: [
+                        txb.object(C.ALPHA_3_VERSION),
+                        txb.object(C.VERSION),
+                        someReceipt,
+                        txb.object(poolData.poolId),
+                        depositCoin,
+                        txb.object(poolData.investorId),
+                        txb.object(C.ALPHA_DISTRIBUTOR),
+                        txb.object(C.PRICE_ORACLE),
+                        txb.object(C.NAVI_STORAGE),
+                        txb.object(poolData.parentPoolId),
+                        txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                        txb.object(C.NAVI_INCENTIVE_V3),
+                        txb.object(C.NAVI_INCENTIVE_V2),
+                        txb.object(C.CLOCK_PACKAGE_ID),
+                    ],
+                });
             }
             else if (poolName === "NAVI-STSUI") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_STSUI_ACCOUNT_ADDRESS);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit_with_two_swaps_v2`,
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_two_swaps_v2`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                         coins_js_1.coinsList["SUI"].type,
@@ -360,10 +905,7 @@ async function naviDepositTx(amount, poolName, options) {
                     ],
                     arguments: [
                         txb.object(C.ALPHA_3_VERSION),
-                        txb.object(C.VERSION),
-                        someReceipt,
                         txb.object(poolData.poolId),
-                        depositCoin,
                         txb.object(poolData.investorId),
                         txb.object(C.ALPHA_DISTRIBUTOR),
                         txb.object(C.PRICE_ORACLE),
@@ -380,10 +922,81 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
+                txb.moveCall({
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit`,
+                    typeArguments: [
+                        coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                    ],
+                    arguments: [
+                        txb.object(C.ALPHA_3_VERSION),
+                        txb.object(C.VERSION),
+                        someReceipt,
+                        txb.object(poolData.poolId),
+                        depositCoin,
+                        txb.object(poolData.investorId),
+                        txb.object(C.ALPHA_DISTRIBUTOR),
+                        txb.object(C.PRICE_ORACLE),
+                        txb.object(C.NAVI_STORAGE),
+                        txb.object(poolData.parentPoolId),
+                        txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                        txb.object(C.NAVI_INCENTIVE_V3),
+                        txb.object(C.NAVI_INCENTIVE_V2),
+                        txb.object(C.CLOCK_PACKAGE_ID),
+                    ],
+                });
             }
             else if (poolName === "NAVI-SUIBTC") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_SUIBTC_ACCOUNT_ADDRESS);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_v3_rewards_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["NAVX"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_NAVI_V2_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    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.bluefinPoolMap[`SUI-${maps_js_1.singleAssetPoolCoinMap[poolName].coin}`]),
+                                    txb.object(C.BLUEFIN_GLOBAL_CONFIG),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_v3_rewards_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["DEEP"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_NAVI_V2_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_DEEP_REWARDS_POOL),
+                                    txb.object(maps_js_1.cetusPoolMap["DEEP-SUI"]),
+                                    txb.object(maps_js_1.bluefinPoolMap[`SUI-${maps_js_1.singleAssetPoolCoinMap[poolName].coin}`]),
+                                    txb.object(C.BLUEFIN_GLOBAL_CONFIG),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit`,
+                    target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                         coins_js_1.coinsList["VSUI"].type,
@@ -392,10 +1005,7 @@ async function naviDepositTx(amount, poolName, options) {
                     ],
                     arguments: [
                         txb.object(C.ALPHA_NAVI_V2_VERSION),
-                        txb.object(C.VERSION),
-                        someReceipt,
                         txb.object(poolData.poolId),
-                        depositCoin,
                         txb.object(poolData.investorId),
                         txb.object(C.ALPHA_DISTRIBUTOR),
                         txb.object(C.CLOCK_PACKAGE_ID),
@@ -416,10 +1026,76 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.CETUS_GLOBAL_CONFIG_ID),
                     ],
                 });
+                txb.moveCall({
+                    target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit_v2`,
+                    typeArguments: [
+                        coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                    ],
+                    arguments: [
+                        txb.object(C.ALPHA_NAVI_V2_VERSION),
+                        txb.object(C.VERSION),
+                        someReceipt,
+                        txb.object(poolData.poolId),
+                        depositCoin,
+                        txb.object(poolData.investorId),
+                        txb.object(C.ALPHA_DISTRIBUTOR),
+                        txb.object(C.PRICE_ORACLE),
+                        txb.object(C.NAVI_STORAGE),
+                        txb.object(poolData.parentPoolId),
+                        txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                        txb.object(C.NAVI_INCENTIVE_V3),
+                        txb.object(C.NAVI_INCENTIVE_V2),
+                        txb.object(C.CLOCK_PACKAGE_ID),
+                    ],
+                });
             }
             else if (poolName === "NAVI-SUIUSDT") {
+                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_SUIUSDT_ACCOUNT_ADDRESS);
+                if (claimableRewards) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                            txb.moveCall({
+                                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                                typeArguments: [
+                                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                    coins_js_1.coinsList["SUI"].type,
+                                    coins_js_1.coinsList["VSUI"].type,
+                                ],
+                                arguments: [
+                                    txb.object(C.ALPHA_3_VERSION),
+                                    txb.object(poolData.investorId),
+                                    txb.object(C.NAVI_STORAGE),
+                                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                    txb.object(C.NAVI_INCENTIVE_V3),
+                                    txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                    txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                    txb.object(C.CLOCK_PACKAGE_ID),
+                                ],
+                            });
+                        }
+                    }
+                }
                 txb.moveCall({
-                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit_with_three_swaps`,
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_three_swaps`,
                     typeArguments: [
                         coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                         coins_js_1.coinsList["USDC"].type,
@@ -428,10 +1104,7 @@ async function naviDepositTx(amount, poolName, options) {
                     ],
                     arguments: [
                         txb.object(C.ALPHA_3_VERSION),
-                        txb.object(C.VERSION),
-                        someReceipt,
                         txb.object(poolData.poolId),
-                        depositCoin,
                         txb.object(poolData.investorId),
                         txb.object(C.ALPHA_DISTRIBUTOR),
                         txb.object(C.PRICE_ORACLE),
@@ -448,6 +1121,28 @@ async function naviDepositTx(amount, poolName, options) {
                         txb.object(C.CLOCK_PACKAGE_ID),
                     ],
                 });
+                txb.moveCall({
+                    target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_deposit`,
+                    typeArguments: [
+                        coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                    ],
+                    arguments: [
+                        txb.object(C.ALPHA_3_VERSION),
+                        txb.object(C.VERSION),
+                        someReceipt,
+                        txb.object(poolData.poolId),
+                        depositCoin,
+                        txb.object(poolData.investorId),
+                        txb.object(C.ALPHA_DISTRIBUTOR),
+                        txb.object(C.PRICE_ORACLE),
+                        txb.object(C.NAVI_STORAGE),
+                        txb.object(poolData.parentPoolId),
+                        txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                        txb.object(C.NAVI_INCENTIVE_V3),
+                        txb.object(C.NAVI_INCENTIVE_V2),
+                        txb.object(C.CLOCK_PACKAGE_ID),
+                    ],
+                });
             }
             else {
                 txb.moveCall({
@@ -513,12 +1208,56 @@ async function naviWithdrawTx(xTokens, poolName, options) {
         }
         (0, naviOracle_js_1.updateSingleTokenPrice)(maps_js_1.naviPriceFeedMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin].pythPriceInfo, maps_js_1.naviPriceFeedMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin].feedId, txb);
         if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "SUI") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_SUI_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    : []) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(maps_js_1.cetusPoolMap["NAVX-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: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw_with_one_swap`,
-                typeArguments: [
-                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                    coins_js_1.coinsList["VSUI"].type,
-                ],
+                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
                 arguments: [
                     txb.object(C.VERSION),
                     txb.object(receipt[0].objectId),
@@ -532,23 +1271,62 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.NAVI_STORAGE),
                     txb.object(poolData.parentPoolId),
                     txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                    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.CETUS_GLOBAL_CONFIG_ID),
-                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "VSUI") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_VSUI_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    : []) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-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: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_no_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw_with_two_swaps`,
-                typeArguments: [
-                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                    coins_js_1.coinsList["SUI"].type,
-                    coins_js_1.coinsList["NAVX"].type,
-                ],
+                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
                 arguments: [
                     txb.object(C.VERSION),
                     txb.object(receipt[0].objectId),
@@ -562,27 +1340,70 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.NAVI_STORAGE),
                     txb.object(poolData.parentPoolId),
                     txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                    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[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "WETH" ||
             maps_js_1.singleAssetPoolCoinMap[poolName].coin == "USDT") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["WUSDC"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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["WUSDC-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["WUSDC"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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["WUSDC-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw_with_three_swaps`,
-                typeArguments: [
-                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                    coins_js_1.coinsList["WUSDC"].type,
-                    coins_js_1.coinsList["SUI"].type,
-                    coins_js_1.coinsList["VSUI"].type,
-                ],
+                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
                 arguments: [
                     txb.object(C.VERSION),
                     txb.object(receipt[0].objectId),
@@ -596,26 +1417,71 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.NAVI_STORAGE),
                     txb.object(poolData.parentPoolId),
                     txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                    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.CETUS_GLOBAL_CONFIG_ID),
-                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "WUSDC") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    : []) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["CETUS"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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["CETUS-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-CETUS`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["CETUS"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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["CETUS-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-CETUS`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw_with_three_swaps`,
-                typeArguments: [
-                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                    coins_js_1.coinsList["CETUS"].type,
-                    coins_js_1.coinsList["SUI"].type,
-                    coins_js_1.coinsList["VSUI"].type,
-                ],
+                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
                 arguments: [
                     txb.object(C.VERSION),
                     txb.object(receipt[0].objectId),
@@ -629,26 +1495,71 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.NAVI_STORAGE),
                     txb.object(poolData.parentPoolId),
                     txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                    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.CETUS_GLOBAL_CONFIG_ID),
-                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap["CETUS-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-CETUS`]),
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "USDC") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    : []) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["BUCK"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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["BUCK-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-BUCK`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["BUCK"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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["BUCK-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-BUCK`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw_with_three_swaps`,
-                typeArguments: [
-                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                    coins_js_1.coinsList["BUCK"].type,
-                    coins_js_1.coinsList["SUI"].type,
-                    coins_js_1.coinsList["VSUI"].type,
-                ],
+                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
                 arguments: [
                     txb.object(C.VERSION),
                     txb.object(receipt[0].objectId),
@@ -662,26 +1573,69 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.NAVI_STORAGE),
                     txb.object(poolData.parentPoolId),
                     txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                    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.CETUS_GLOBAL_CONFIG_ID),
-                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap["BUCK-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-BUCK`]),
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "USDY") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["WUSDC"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["WUSDC"].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(poolData.investorId),
+                                txb.object(C.VERSION),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw_with_three_swaps`,
-                typeArguments: [
-                    coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
-                    coins_js_1.coinsList["WUSDC"].type,
-                    coins_js_1.coinsList["SUI"].type,
-                    coins_js_1.coinsList["VSUI"].type,
-                ],
+                target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_pool::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
                 arguments: [
                     txb.object(C.VERSION),
                     txb.object(receipt[0].objectId),
@@ -695,21 +1649,60 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.NAVI_STORAGE),
                     txb.object(poolData.parentPoolId),
                     txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
-                    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.CETUS_GLOBAL_CONFIG_ID),
-                    txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap["WUSDC-SUI"]),
-                    txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-WUSDC`]),
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "AUSD" ||
             maps_js_1.singleAssetPoolCoinMap[poolName].coin == "ETH") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw_with_three_swaps`,
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_three_swaps`,
                 typeArguments: [
                     coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                     coins_js_1.coinsList["USDC"].type,
@@ -718,12 +1711,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                 ],
                 arguments: [
                     txb.object(C.ALPHA_3_VERSION),
-                    txb.object(C.VERSION),
-                    txb.object(receipt[0].objectId),
-                    alpha_receipt,
-                    txb.object(C.ALPHA_POOL),
                     txb.object(poolData.poolId),
-                    txb.pure.u64(xTokens),
                     txb.object(poolData.investorId),
                     txb.object(C.ALPHA_DISTRIBUTOR),
                     txb.object(C.PRICE_ORACLE),
@@ -740,10 +1728,118 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
+            txb.moveCall({
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
+                arguments: [
+                    txb.object(C.ALPHA_3_VERSION),
+                    txb.object(C.VERSION),
+                    txb.object(receipt[0].objectId),
+                    alpha_receipt,
+                    txb.object(C.ALPHA_POOL),
+                    txb.object(poolData.poolId),
+                    txb.pure.u64(xTokens),
+                    txb.object(poolData.investorId),
+                    txb.object(C.ALPHA_DISTRIBUTOR),
+                    txb.object(C.PRICE_ORACLE),
+                    txb.object(C.NAVI_STORAGE),
+                    txb.object(poolData.parentPoolId),
+                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                    txb.object(C.NAVI_INCENTIVE_V3),
+                    txb.object(C.NAVI_INCENTIVE_V2),
+                    txb.object(C.CLOCK_PACKAGE_ID),
+                ],
+            });
         }
         else if (poolName === "NAVI-NS") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_NS_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["NAVX-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["DEEP"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_DEEP_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["DEEP-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["NS"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NS_REWARDS_POOL),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw_with_two_swaps_v2`,
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_two_swaps_v2`,
                 typeArguments: [
                     coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                     coins_js_1.coinsList["SUI"].type,
@@ -751,12 +1847,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                 ],
                 arguments: [
                     txb.object(C.ALPHA_3_VERSION),
-                    txb.object(C.VERSION),
-                    txb.object(receipt[0].objectId),
-                    alpha_receipt,
-                    txb.object(C.ALPHA_POOL),
                     txb.object(poolData.poolId),
-                    txb.pure.u64(xTokens),
                     txb.object(poolData.investorId),
                     txb.object(C.ALPHA_DISTRIBUTOR),
                     txb.object(C.PRICE_ORACLE),
@@ -773,10 +1864,76 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
+            txb.moveCall({
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
+                arguments: [
+                    txb.object(C.ALPHA_3_VERSION),
+                    txb.object(C.VERSION),
+                    txb.object(receipt[0].objectId),
+                    alpha_receipt,
+                    txb.object(C.ALPHA_POOL),
+                    txb.object(poolData.poolId),
+                    txb.pure.u64(xTokens),
+                    txb.object(poolData.investorId),
+                    txb.object(C.ALPHA_DISTRIBUTOR),
+                    txb.object(C.PRICE_ORACLE),
+                    txb.object(C.NAVI_STORAGE),
+                    txb.object(poolData.parentPoolId),
+                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                    txb.object(C.NAVI_INCENTIVE_V3),
+                    txb.object(C.NAVI_INCENTIVE_V2),
+                    txb.object(C.CLOCK_PACKAGE_ID),
+                ],
+            });
         }
         else if (poolName === "NAVI-NAVX") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_NAVX_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw_with_two_swaps_v2`,
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_two_swaps_v2`,
                 typeArguments: [
                     coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                     coins_js_1.coinsList["SUI"].type,
@@ -784,12 +1941,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                 ],
                 arguments: [
                     txb.object(C.ALPHA_3_VERSION),
-                    txb.object(C.VERSION),
-                    txb.object(receipt[0].objectId),
-                    alpha_receipt,
-                    txb.object(C.ALPHA_POOL),
                     txb.object(poolData.poolId),
-                    txb.pure.u64(xTokens),
                     txb.object(poolData.investorId),
                     txb.object(C.ALPHA_DISTRIBUTOR),
                     txb.object(C.PRICE_ORACLE),
@@ -806,10 +1958,76 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
+            txb.moveCall({
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
+                arguments: [
+                    txb.object(C.ALPHA_3_VERSION),
+                    txb.object(C.VERSION),
+                    txb.object(receipt[0].objectId),
+                    alpha_receipt,
+                    txb.object(C.ALPHA_POOL),
+                    txb.object(poolData.poolId),
+                    txb.pure.u64(xTokens),
+                    txb.object(poolData.investorId),
+                    txb.object(C.ALPHA_DISTRIBUTOR),
+                    txb.object(C.PRICE_ORACLE),
+                    txb.object(C.NAVI_STORAGE),
+                    txb.object(poolData.parentPoolId),
+                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                    txb.object(C.NAVI_INCENTIVE_V3),
+                    txb.object(C.NAVI_INCENTIVE_V2),
+                    txb.object(C.CLOCK_PACKAGE_ID),
+                ],
+            });
         }
         else if (poolName === "NAVI-STSUI") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_STSUI_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw_with_two_swaps_v2`,
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_two_swaps_v2`,
                 typeArguments: [
                     coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                     coins_js_1.coinsList["SUI"].type,
@@ -817,12 +2035,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                 ],
                 arguments: [
                     txb.object(C.ALPHA_3_VERSION),
-                    txb.object(C.VERSION),
-                    txb.object(receipt[0].objectId),
-                    alpha_receipt,
-                    txb.object(C.ALPHA_POOL),
                     txb.object(poolData.poolId),
-                    txb.pure.u64(xTokens),
                     txb.object(poolData.investorId),
                     txb.object(C.ALPHA_DISTRIBUTOR),
                     txb.object(C.PRICE_ORACLE),
@@ -839,10 +2052,81 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
+            txb.moveCall({
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
+                arguments: [
+                    txb.object(C.ALPHA_3_VERSION),
+                    txb.object(C.VERSION),
+                    txb.object(receipt[0].objectId),
+                    alpha_receipt,
+                    txb.object(C.ALPHA_POOL),
+                    txb.object(poolData.poolId),
+                    txb.pure.u64(xTokens),
+                    txb.object(poolData.investorId),
+                    txb.object(C.ALPHA_DISTRIBUTOR),
+                    txb.object(C.PRICE_ORACLE),
+                    txb.object(C.NAVI_STORAGE),
+                    txb.object(poolData.parentPoolId),
+                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                    txb.object(C.NAVI_INCENTIVE_V3),
+                    txb.object(C.NAVI_INCENTIVE_V2),
+                    txb.object(C.CLOCK_PACKAGE_ID),
+                ],
+            });
         }
         else if (poolName === "NAVI-SUIBTC") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_SUIBTC_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["NAVX"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_NAVI_V2_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                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.bluefinPoolMap[`SUI-${maps_js_1.singleAssetPoolCoinMap[poolName].coin}`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_v3_rewards_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["DEEP"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_NAVI_V2_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_DEEP_REWARDS_POOL),
+                                txb.object(maps_js_1.cetusPoolMap["DEEP-SUI"]),
+                                txb.object(maps_js_1.bluefinPoolMap[`SUI-${maps_js_1.singleAssetPoolCoinMap[poolName].coin}`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw`,
+                target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool`,
                 typeArguments: [
                     coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                     coins_js_1.coinsList["VSUI"].type,
@@ -851,12 +2135,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                 ],
                 arguments: [
                     txb.object(C.ALPHA_NAVI_V2_VERSION),
-                    txb.object(C.VERSION),
-                    txb.object(receipt[0].objectId),
-                    alpha_receipt,
-                    txb.object(C.ALPHA_POOL),
                     txb.object(poolData.poolId),
-                    txb.pure.u64(xTokens),
                     txb.object(poolData.investorId),
                     txb.object(C.ALPHA_DISTRIBUTOR),
                     txb.object(C.CLOCK_PACKAGE_ID),
@@ -877,10 +2156,76 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.CETUS_GLOBAL_CONFIG_ID),
                 ],
             });
+            txb.moveCall({
+                target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw_v2`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
+                arguments: [
+                    txb.object(C.ALPHA_NAVI_V2_VERSION),
+                    txb.object(C.VERSION),
+                    txb.object(receipt[0].objectId),
+                    alpha_receipt,
+                    txb.object(C.ALPHA_POOL),
+                    txb.object(poolData.poolId),
+                    txb.pure.u64(xTokens),
+                    txb.object(poolData.investorId),
+                    txb.object(C.ALPHA_DISTRIBUTOR),
+                    txb.object(C.PRICE_ORACLE),
+                    txb.object(C.NAVI_STORAGE),
+                    txb.object(poolData.parentPoolId),
+                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                    txb.object(C.NAVI_INCENTIVE_V3),
+                    txb.object(C.NAVI_INCENTIVE_V2),
+                    txb.object(C.CLOCK_PACKAGE_ID),
+                ],
+            });
         }
         else if (poolName === "NAVI-SUIUSDT") {
+            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), (0, constants_js_1.getConf)().NAVI_SUIUSDT_ACCOUNT_ADDRESS);
+            if (claimableRewards) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
+                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_NAVX_REWARDS_POOL),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        txb.moveCall({
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
+                            typeArguments: [
+                                coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
+                                coins_js_1.coinsList["SUI"].type,
+                                coins_js_1.coinsList["VSUI"].type,
+                            ],
+                            arguments: [
+                                txb.object(C.ALPHA_3_VERSION),
+                                txb.object(poolData.investorId),
+                                txb.object(C.NAVI_STORAGE),
+                                txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                                txb.object(C.NAVI_INCENTIVE_V3),
+                                txb.object(C.NAVI_VSUI_REWARDS_POOL),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-SUI`]),
+                                txb.object(C.CLOCK_PACKAGE_ID),
+                            ],
+                        });
+                    }
+                }
+            }
             txb.moveCall({
-                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw_with_three_swaps`,
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::update_pool_with_three_swaps`,
                 typeArguments: [
                     coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                     coins_js_1.coinsList["USDC"].type,
@@ -889,12 +2234,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                 ],
                 arguments: [
                     txb.object(C.ALPHA_3_VERSION),
-                    txb.object(C.VERSION),
-                    txb.object(receipt[0].objectId),
-                    alpha_receipt,
-                    txb.object(C.ALPHA_POOL),
                     txb.object(poolData.poolId),
-                    txb.pure.u64(xTokens),
                     txb.object(poolData.investorId),
                     txb.object(C.ALPHA_DISTRIBUTOR),
                     txb.object(C.PRICE_ORACLE),
@@ -911,6 +2251,28 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                     txb.object(C.CLOCK_PACKAGE_ID),
                 ],
             });
+            txb.moveCall({
+                target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::user_withdraw`,
+                typeArguments: [coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type],
+                arguments: [
+                    txb.object(C.ALPHA_3_VERSION),
+                    txb.object(C.VERSION),
+                    txb.object(receipt[0].objectId),
+                    alpha_receipt,
+                    txb.object(C.ALPHA_POOL),
+                    txb.object(poolData.poolId),
+                    txb.pure.u64(xTokens),
+                    txb.object(poolData.investorId),
+                    txb.object(C.ALPHA_DISTRIBUTOR),
+                    txb.object(C.PRICE_ORACLE),
+                    txb.object(C.NAVI_STORAGE),
+                    txb.object(poolData.parentPoolId),
+                    txb.pure.u8(Number(maps_js_1.naviAssetMap[maps_js_1.singleAssetPoolCoinMap[poolName].coin])),
+                    txb.object(C.NAVI_INCENTIVE_V3),
+                    txb.object(C.NAVI_INCENTIVE_V2),
+                    txb.object(C.CLOCK_PACKAGE_ID),
+                ],
+            });
         }
         else {
             txb.moveCall({