@alphafi/alphafi-sdk 0.0.92 → 0.0.94

package/dist/cjs/transactions/navi.js

@@ -9,8 +9,7 @@ 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";
+const get_navi_rewards_js_1 = require("./get_navi_rewards.js");
 async function naviDepositTx(amount, poolName, options) {
     const C = (0, constants_js_1.getConf)();
     const suiClient = (0, client_js_1.getSuiClient)();
@@ -37,12 +36,12 @@ 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);
+        const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)]
+            for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                 : []) {
-                if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                     txb.moveCall({
                         target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap_bluefin`,
                         typeArguments: [
@@ -62,7 +61,7 @@ async function naviDepositTx(amount, poolName, options) {
                         ],
                     });
                 }
-                else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                     txb.moveCall({
                         target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
                         typeArguments: [
@@ -144,12 +143,12 @@ 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);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)]
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -171,7 +170,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_no_swap`,
                                 typeArguments: [
@@ -214,12 +213,12 @@ async function naviDepositTx(amount, poolName, options) {
             }
             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]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -243,7 +242,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -292,12 +291,12 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -319,7 +318,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin_v2`,
                                 typeArguments: [
@@ -366,12 +365,12 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                                 typeArguments: [
@@ -393,7 +392,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                                 typeArguments: [
@@ -440,12 +439,12 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -469,7 +468,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -519,10 +518,10 @@ async function naviDepositTx(amount, poolName, options) {
             }
             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]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -539,7 +538,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps_bluefin`,
                                 typeArguments: [
@@ -589,10 +588,10 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -613,7 +612,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["DEEP"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -634,7 +633,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -656,7 +655,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["NS"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["NS"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -725,10 +724,10 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -745,7 +744,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -819,10 +818,10 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -839,7 +838,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -861,7 +860,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["STSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["STSUI"].type) {
                             txb.moveCall({
                                 target: `${poolData.packageId}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [coins_js_1.coinsList["STSUI"].type],
@@ -928,10 +927,10 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -953,7 +952,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["DEEP"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -975,7 +974,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -1054,10 +1053,10 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             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);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -1074,7 +1073,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps`,
                                 typeArguments: [
@@ -1124,15 +1123,15 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "WAL") {
-                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                         ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
                         : [
-                            { reward_coin_type: coins_js_1.coinsList["WAL"].type.substring(2) },
-                            { reward_coin_type: coins_js_1.coinsList["VSUI"].type.substring(2) },
+                            { rewardCoinType: coins_js_1.coinsList["WAL"].type },
+                            { rewardCoinType: coins_js_1.coinsList["VSUI"].type },
                         ]) {
-                        if (reward.reward_coin_type === coins_js_1.coinsList["WAL"].type.substring(2)) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["WAL"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -1149,7 +1148,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -1197,10 +1196,10 @@ async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "DEEP") {
-                const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+                const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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["DEEP"].type.substring(2)) {
+                    for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coins_js_1.coinsList["DEEP"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -1217,7 +1216,7 @@ async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -1328,12 +1327,12 @@ 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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)]
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap_bluefin`,
                             typeArguments: [
@@ -1353,7 +1352,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
                             typeArguments: [
@@ -1398,12 +1397,12 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)]
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -1425,7 +1424,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_no_swap`,
                             typeArguments: [
@@ -1468,10 +1467,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
         }
         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]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1495,7 +1494,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1544,12 +1543,12 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1573,7 +1572,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1622,12 +1621,12 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                             typeArguments: [
@@ -1649,7 +1648,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                             typeArguments: [
@@ -1696,10 +1695,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1723,7 +1722,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1773,10 +1772,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
         }
         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]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -1793,12 +1792,13 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
-                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
+                            target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps`,
                             typeArguments: [
                                 coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type,
                                 coins_js_1.coinsList["USDC"].type,
+                                coins_js_1.coinsList["SUI"].type,
                                 coins_js_1.coinsList["VSUI"].type,
                             ],
                             arguments: [
@@ -1808,9 +1808,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                                 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.BLUEFIN_GLOBAL_CONFIG),
-                                txb.object(maps_js_1.bluefinPoolMap["VSUI-USDC"]),
-                                txb.object(maps_js_1.bluefinPoolMap[`${maps_js_1.singleAssetPoolCoinMap[poolName].coin}-USDC`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.cetusPoolMap["VSUI-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap["USDC-SUI"]),
+                                txb.object(maps_js_1.cetusPoolMap[`USDC-${maps_js_1.singleAssetPoolCoinMap[poolName].coin}`]),
                                 txb.object(C.CLOCK_PACKAGE_ID),
                             ],
                         });
@@ -1841,10 +1842,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -1865,7 +1866,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["DEEP"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -1886,7 +1887,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -1908,7 +1909,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["NS"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["NS"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -1977,10 +1978,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -1997,7 +1998,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -2071,10 +2072,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2091,7 +2092,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -2113,7 +2114,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["STSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["STSUI"].type) {
                         txb.moveCall({
                             target: `${poolData.packageId}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [coins_js_1.coinsList["STSUI"].type],
@@ -2180,10 +2181,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2205,7 +2206,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["DEEP"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["DEEP"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2227,7 +2228,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2306,10 +2307,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         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);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)((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)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2326,7 +2327,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps`,
                             typeArguments: [
@@ -2376,15 +2377,15 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "WAL") {
-            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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)]
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]
                     : [
-                        { reward_coin_type: coins_js_1.coinsList["WAL"].type.substring(2) },
-                        { reward_coin_type: coins_js_1.coinsList["VSUI"].type.substring(2) },
+                        { rewardCoinType: coins_js_1.coinsList["WAL"].type },
+                        { rewardCoinType: coins_js_1.coinsList["VSUI"].type },
                     ]) {
-                    if (reward.reward_coin_type === coins_js_1.coinsList["WAL"].type.substring(2)) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["WAL"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2401,7 +2402,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2449,10 +2450,10 @@ async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (maps_js_1.singleAssetPoolCoinMap[poolName].coin == "DEEP") {
-            const claimableRewards = await (0, V3_js_1.getAvailableRewards)((0, client_js_1.getSuiClient)(), maps_js_1.loopingAccountAddresses[poolName]);
+            const claimableRewards = await (0, get_navi_rewards_js_1.getAvailableRewards)(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["DEEP"].type.substring(2)) {
+                for (const reward of claimableRewards[coins_js_1.coinsList[maps_js_1.singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coins_js_1.coinsList["DEEP"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2469,7 +2470,7 @@ async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coins_js_1.coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [