@alphafi/alphafi-sdk 0.0.91 → 0.0.93

package/dist/esm/transactions/navi.js

@@ -5,8 +5,7 @@ import { getReceipts } from "../sui-sdk/functions/getReceipts.js";
 import { getConf } from "../common/constants.js";
 import { getSuiClient } from "../sui-sdk/client.js";
 import { updateSingleTokenPrice } from "./naviOracle.js";
-import { getAvailableRewards } from "navi-sdk/dist/libs/PTB/V3.js";
-// import { getAvailableRewards } from "navi-sdk";
+import { getAvailableRewards } from "./get_navi_rewards.js";
 export async function naviDepositTx(amount, poolName, options) {
     const C = getConf();
     const suiClient = getSuiClient();
@@ -33,12 +32,12 @@ export async function naviDepositTx(amount, poolName, options) {
             });
         }
         const [depositCoin] = txb.splitCoins(txb.gas, [amount]);
-        const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_SUI_ACCOUNT_ADDRESS);
+        const claimableRewards = await getAvailableRewards(getConf().NAVI_SUI_ACCOUNT_ADDRESS);
         if (claimableRewards) {
-            for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+            for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                 : []) {
-                if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                if (reward.rewardCoinType === coinsList["NAVX"].type) {
                     txb.moveCall({
                         target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap_bluefin`,
                         typeArguments: [
@@ -58,7 +57,7 @@ export async function naviDepositTx(amount, poolName, options) {
                         ],
                     });
                 }
-                else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                     txb.moveCall({
                         target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
                         typeArguments: [
@@ -140,12 +139,12 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             if (singleAssetPoolCoinMap[poolName].coin == "VSUI") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_VSUI_ACCOUNT_ADDRESS);
+                const claimableRewards = await getAvailableRewards(getConf().NAVI_VSUI_ACCOUNT_ADDRESS);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -167,7 +166,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_no_swap`,
                                 typeArguments: [
@@ -210,12 +209,12 @@ export async function naviDepositTx(amount, poolName, options) {
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "WETH" ||
                 singleAssetPoolCoinMap[poolName].coin == "USDT") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -239,7 +238,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -288,12 +287,12 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "WUSDC") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -315,7 +314,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin_v2`,
                                 typeArguments: [
@@ -362,12 +361,12 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "USDC") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                                 typeArguments: [
@@ -389,7 +388,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                                 typeArguments: [
@@ -436,12 +435,12 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "USDY") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                        ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                         : []) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -465,7 +464,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                                 typeArguments: [
@@ -515,10 +514,10 @@ export async function naviDepositTx(amount, poolName, options) {
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "AUSD" ||
                 singleAssetPoolCoinMap[poolName].coin == "ETH") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -535,7 +534,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps_bluefin`,
                                 typeArguments: [
@@ -585,10 +584,10 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (poolName === "NAVI-NS") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_NS_ACCOUNT_ADDRESS);
+                const claimableRewards = await getAvailableRewards(getConf().NAVI_NS_ACCOUNT_ADDRESS);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -609,7 +608,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["DEEP"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["DEEP"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -630,7 +629,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -652,7 +651,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["NS"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["NS"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -721,10 +720,10 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (poolName === "NAVI-NAVX") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_NAVX_ACCOUNT_ADDRESS);
+                const claimableRewards = await getAvailableRewards(getConf().NAVI_NAVX_ACCOUNT_ADDRESS);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -741,7 +740,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -815,10 +814,10 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (poolName === "NAVI-STSUI") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_STSUI_ACCOUNT_ADDRESS);
+                const claimableRewards = await getAvailableRewards(getConf().NAVI_STSUI_ACCOUNT_ADDRESS);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -835,7 +834,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                                 typeArguments: [
@@ -857,7 +856,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["STSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["STSUI"].type) {
                             txb.moveCall({
                                 target: `${poolData.packageId}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [coinsList["STSUI"].type],
@@ -924,10 +923,10 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (poolName === "NAVI-SUIBTC") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_SUIBTC_ACCOUNT_ADDRESS);
+                const claimableRewards = await getAvailableRewards(getConf().NAVI_SUIBTC_ACCOUNT_ADDRESS);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -949,7 +948,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["DEEP"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["DEEP"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -971,7 +970,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -1050,10 +1049,10 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (poolName === "NAVI-SUIUSDT") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_SUIUSDT_ACCOUNT_ADDRESS);
+                const claimableRewards = await getAvailableRewards(getConf().NAVI_SUIUSDT_ACCOUNT_ADDRESS);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["NAVX"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -1070,7 +1069,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps`,
                                 typeArguments: [
@@ -1120,15 +1119,15 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "WAL") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                         ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
                         : [
-                            { reward_coin_type: coinsList["WAL"].type.substring(2) },
-                            { reward_coin_type: coinsList["VSUI"].type.substring(2) },
+                            { rewardCoinType: coinsList["WAL"].type },
+                            { rewardCoinType: coinsList["VSUI"].type },
                         ]) {
-                        if (reward.reward_coin_type === coinsList["WAL"].type.substring(2)) {
+                        if (reward.rewardCoinType === coinsList["WAL"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -1145,7 +1144,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -1193,10 +1192,10 @@ export async function naviDepositTx(amount, poolName, options) {
                 });
             }
             else if (singleAssetPoolCoinMap[poolName].coin == "DEEP") {
-                const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+                const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
                 if (claimableRewards) {
-                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                        if (reward.reward_coin_type === coinsList["DEEP"].type.substring(2)) {
+                    for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                        if (reward.rewardCoinType === coinsList["DEEP"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                                 typeArguments: [
@@ -1213,7 +1212,7 @@ export async function naviDepositTx(amount, poolName, options) {
                                 ],
                             });
                         }
-                        else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                        else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                             txb.moveCall({
                                 target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                                 typeArguments: [
@@ -1324,12 +1323,12 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
         }
         updateSingleTokenPrice(naviPriceFeedMap[singleAssetPoolCoinMap[poolName].coin].pythPriceInfo, naviPriceFeedMap[singleAssetPoolCoinMap[poolName].coin].feedId, txb);
         if (singleAssetPoolCoinMap[poolName].coin == "SUI") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_SUI_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_SUI_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap_bluefin`,
                             typeArguments: [
@@ -1349,7 +1348,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_one_swap`,
                             typeArguments: [
@@ -1394,12 +1393,12 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "VSUI") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_VSUI_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_VSUI_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -1421,7 +1420,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_no_swap`,
                             typeArguments: [
@@ -1464,10 +1463,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "WETH" ||
             singleAssetPoolCoinMap[poolName].coin == "USDT") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1491,7 +1490,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1540,12 +1539,12 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "WUSDC") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1569,7 +1568,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1618,12 +1617,12 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "USDC") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                     : []) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                             typeArguments: [
@@ -1645,7 +1644,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
                             typeArguments: [
@@ -1692,10 +1691,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "USDY") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1719,7 +1718,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_LATEST_PACKAGE_ID}::alphafi_navi_investor::collect_v3_rewards_with_three_swaps`,
                             typeArguments: [
@@ -1769,10 +1768,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "AUSD" ||
             singleAssetPoolCoinMap[poolName].coin == "ETH") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -1789,12 +1788,13 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === 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: [
                                 coinsList[singleAssetPoolCoinMap[poolName].coin].type,
                                 coinsList["USDC"].type,
+                                coinsList["SUI"].type,
                                 coinsList["VSUI"].type,
                             ],
                             arguments: [
@@ -1804,9 +1804,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                                 txb.pure.u8(Number(naviAssetMap[singleAssetPoolCoinMap[poolName].coin])),
                                 txb.object(C.NAVI_INCENTIVE_V3),
                                 txb.object(C.NAVI_VSUI_REWARDS_POOL),
-                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
-                                txb.object(bluefinPoolMap["VSUI-USDC"]),
-                                txb.object(bluefinPoolMap[`${singleAssetPoolCoinMap[poolName].coin}-USDC`]),
+                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(cetusPoolMap["VSUI-SUI"]),
+                                txb.object(cetusPoolMap["USDC-SUI"]),
+                                txb.object(cetusPoolMap[`USDC-${singleAssetPoolCoinMap[poolName].coin}`]),
                                 txb.object(C.CLOCK_PACKAGE_ID),
                             ],
                         });
@@ -1837,10 +1838,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (poolName === "NAVI-NS") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_NS_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_NS_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -1861,7 +1862,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["DEEP"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["DEEP"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -1882,7 +1883,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -1904,7 +1905,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["NS"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["NS"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -1973,10 +1974,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (poolName === "NAVI-NAVX") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_NAVX_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_NAVX_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -1993,7 +1994,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -2067,10 +2068,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (poolName === "NAVI-STSUI") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_STSUI_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_STSUI_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2087,7 +2088,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps`,
                             typeArguments: [
@@ -2109,7 +2110,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["STSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["STSUI"].type) {
                         txb.moveCall({
                             target: `${poolData.packageId}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [coinsList["STSUI"].type],
@@ -2176,10 +2177,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (poolName === "NAVI-SUIBTC") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_SUIBTC_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_SUIBTC_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2201,7 +2202,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["DEEP"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["DEEP"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2223,7 +2224,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_NAVI_V2_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2302,10 +2303,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (poolName === "NAVI-SUIUSDT") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), getConf().NAVI_SUIUSDT_ACCOUNT_ADDRESS);
+            const claimableRewards = await getAvailableRewards(getConf().NAVI_SUIUSDT_ACCOUNT_ADDRESS);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["NAVX"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["NAVX"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2322,7 +2323,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_three_swaps`,
                             typeArguments: [
@@ -2372,15 +2373,15 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "WAL") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
-                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
+                    ? claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]
                     : [
-                        { reward_coin_type: coinsList["WAL"].type.substring(2) },
-                        { reward_coin_type: coinsList["VSUI"].type.substring(2) },
+                        { rewardCoinType: coinsList["WAL"].type },
+                        { rewardCoinType: coinsList["VSUI"].type },
                     ]) {
-                    if (reward.reward_coin_type === coinsList["WAL"].type.substring(2)) {
+                    if (reward.rewardCoinType === coinsList["WAL"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2397,7 +2398,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [
@@ -2445,10 +2446,10 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
             });
         }
         else if (singleAssetPoolCoinMap[poolName].coin == "DEEP") {
-            const claimableRewards = await getAvailableRewards(getSuiClient(), loopingAccountAddresses[poolName]);
+            const claimableRewards = await getAvailableRewards(loopingAccountAddresses[poolName]);
             if (claimableRewards) {
-                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type.substring(2)]) {
-                    if (reward.reward_coin_type === coinsList["DEEP"].type.substring(2)) {
+                for (const reward of claimableRewards[coinsList[singleAssetPoolCoinMap[poolName].coin].type]) {
+                    if (reward.rewardCoinType === coinsList["DEEP"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_no_swap`,
                             typeArguments: [
@@ -2465,7 +2466,7 @@ export async function naviWithdrawTx(xTokens, poolName, options) {
                             ],
                         });
                     }
-                    else if (reward.reward_coin_type === coinsList["VSUI"].type.substring(2)) {
+                    else if (reward.rewardCoinType === coinsList["VSUI"].type) {
                         txb.moveCall({
                             target: `${C.ALPHA_3_LATEST_PACKAGE_ID}::alphafi_navi_pool_v2::collect_reward_with_two_swaps_bluefin`,
                             typeArguments: [