@alphafi/alphafi-sdk 0.0.80 → 0.0.81

package/dist/cjs/transactions/bucket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../../src/transactions/bucket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAavD,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAgFtB;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA4DtB"}
+{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../../src/transactions/bucket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAcvD,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA2FtB;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAuEtB"}

package/dist/cjs/transactions/bucket.js

@@ -49,6 +49,18 @@ async function bucketDepositTx(amount, options) {
                 arguments: [txb.object(receipt[0].objectId)],
             });
         }
+        txb.moveCall({
+            target: `${poolData.packageId}::alphafi_bucket_investor_v1::collect_and_convert_reward_to_buck`,
+            arguments: [
+                txb.object(C.ALPHA_3_VERSION),
+                txb.object(poolData.investorId),
+                txb.object(C.BUCKET_PROTOCOL),
+                txb.object(C.FOUNTAIN),
+                txb.object(index_js_1.bluefinPoolMap["SUI-USDC"]),
+                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
+                txb.object(C.CLOCK_PACKAGE_ID),
+            ],
+        });
         txb.moveCall({
             target: `${poolData.packageId}::alphafi_bucket_pool_v1::user_deposit`,
             arguments: [
@@ -97,6 +109,18 @@ async function bucketWithdrawTx(xTokens, options) {
                 arguments: [txb.object(alphaReceipt[0].objectId)],
             });
         }
+        txb.moveCall({
+            target: `${poolData.packageId}::alphafi_bucket_investor_v1::collect_and_convert_reward_to_buck`,
+            arguments: [
+                txb.object(C.ALPHA_3_VERSION),
+                txb.object(poolData.investorId),
+                txb.object(C.BUCKET_PROTOCOL),
+                txb.object(C.FOUNTAIN),
+                txb.object(index_js_1.bluefinPoolMap["SUI-USDC"]),
+                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
+                txb.object(C.CLOCK_PACKAGE_ID),
+            ],
+        });
         const [buck] = txb.moveCall({
             target: `${poolData.packageId}::alphafi_bucket_pool_v1::user_withdraw`,
             arguments: [

package/dist/cjs/transactions/bucket.js.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../../src/transactions/bucket.ts"],"names":[],"mappings":"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","sourcesContent":["import { CoinStruct } from \"@mysten/sui/client\";\nimport { Transaction } from \"@mysten/sui/transactions\";\nimport {\n  cetusPoolMap,\n  coinsList,\n  getConf,\n  getReceipts,\n  getSuiClient,\n  poolInfo,\n  PoolName,\n  Receipt,\n  singleAssetPoolCoinMap,\n} from \"../index.js\";\n\nexport async function bucketDepositTx(\n  amount: string,\n  options: { address: string },\n): Promise<Transaction> {\n  const C = await getConf();\n  const suiClient = getSuiClient();\n  const address = options.address;\n  const txb = new Transaction();\n  const poolData = poolInfo[\"BUCKET-BUCK\"];\n\n  const receipt: Receipt[] = await getReceipts(\n    \"BUCKET-BUCK\" as PoolName,\n    address,\n    true,\n  );\n  let coins: CoinStruct[] = [];\n\n  let currentCursor: string | null | undefined = null;\n\n  do {\n    const response = await suiClient.getCoins({\n      owner: address,\n      coinType: coinsList[singleAssetPoolCoinMap[\"BUCKET-BUCK\"].coin].type,\n      cursor: currentCursor,\n    });\n\n    coins = coins.concat(response.data);\n\n    // Check if there's a next page\n    if (response.hasNextPage && response.nextCursor) {\n      currentCursor = response.nextCursor;\n    } else {\n      // No more pages available\n      // console.log(\"No more receipts available.\");\n      break;\n    }\n  } while (true);\n\n  if (coins.length >= 1) {\n    const [coin] = txb.splitCoins(txb.object(coins[0].coinObjectId), [0]);\n    txb.mergeCoins(\n      coin,\n      coins.map((c) => c.coinObjectId),\n    );\n    const [depositCoin] = txb.splitCoins(coin, [amount]);\n    let someReceipt: any;\n    if (receipt.length == 0) {\n      [someReceipt] = txb.moveCall({\n        target: `0x1::option::none`,\n        typeArguments: [poolData.receiptType],\n        arguments: [],\n      });\n    } else {\n      [someReceipt] = txb.moveCall({\n        target: `0x1::option::some`,\n        typeArguments: [receipt[0].content.type],\n        arguments: [txb.object(receipt[0].objectId)],\n      });\n    }\n\n    txb.moveCall({\n      target: `${poolData.packageId}::alphafi_bucket_pool_v1::user_deposit`,\n      arguments: [\n        txb.object(C.ALPHA_3_VERSION),\n        txb.object(C.VERSION),\n        someReceipt,\n        txb.object(poolData.poolId),\n        depositCoin,\n        txb.object(poolData.investorId),\n        txb.object(C.ALPHA_DISTRIBUTOR),\n        txb.object(C.BUCKET_PROTOCOL),\n        txb.object(C.FOUNTAIN),\n        txb.object(C.FLASK),\n        txb.object(cetusPoolMap[\"USDC-SUI\"]),\n        txb.object(C.CETUS_GLOBAL_CONFIG_ID),\n        txb.object(C.CLOCK_PACKAGE_ID),\n      ],\n    });\n    txb.transferObjects([coin], address);\n  } else {\n    throw new Error(\"No coin\");\n  }\n  return txb;\n}\n\nexport async function bucketWithdrawTx(\n  xTokens: string,\n  options: { address: string },\n): Promise<Transaction> {\n  const C = await getConf();\n  const address = options.address;\n  const txb = new Transaction();\n  const poolData = poolInfo[\"BUCKET-BUCK\"];\n\n  const receipt: Receipt[] = await getReceipts(\n    \"BUCKET-BUCK\" as PoolName,\n    address,\n    true,\n  );\n\n  const alphaReceipt: Receipt[] = await getReceipts(\"ALPHA\", address, true);\n\n  if (receipt.length > 0) {\n    let alpha_receipt: any;\n    if (alphaReceipt.length == 0) {\n      [alpha_receipt] = txb.moveCall({\n        target: `0x1::option::none`,\n        typeArguments: [C.ALPHA_POOL_RECEIPT],\n        arguments: [],\n      });\n    } else {\n      [alpha_receipt] = txb.moveCall({\n        target: `0x1::option::some`,\n        typeArguments: [alphaReceipt[0].content.type],\n        arguments: [txb.object(alphaReceipt[0].objectId)],\n      });\n    }\n\n    const [buck] = txb.moveCall({\n      target: `${poolData.packageId}::alphafi_bucket_pool_v1::user_withdraw`,\n      arguments: [\n        txb.object(C.ALPHA_3_VERSION),\n        txb.object(C.VERSION),\n        txb.object(receipt[0].objectId),\n        alpha_receipt,\n        txb.object(C.ALPHA_POOL),\n        txb.object(poolData.poolId),\n        txb.pure.u64(xTokens),\n        txb.object(poolData.investorId),\n        txb.object(C.ALPHA_DISTRIBUTOR),\n        txb.object(C.BUCKET_PROTOCOL),\n        txb.object(C.FOUNTAIN),\n        txb.object(C.FLASK),\n        txb.object(cetusPoolMap[\"USDC-SUI\"]),\n        txb.object(C.CETUS_GLOBAL_CONFIG_ID),\n        txb.object(C.CLOCK_PACKAGE_ID),\n      ],\n    });\n    txb.moveCall({\n      target: `0x2::transfer::public_transfer`,\n      typeArguments: [`0x2::coin::Coin<${coinsList[\"BUCK\"].type}>`],\n      arguments: [buck, txb.pure.address(address)],\n    });\n  } else {\n    throw new Error(`No ${\"BUCKET-BUCK\"} Receipt`);\n  }\n\n  return txb;\n}\n"]}
+{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../../src/transactions/bucket.ts"],"names":[],"mappings":"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","sourcesContent":["import { CoinStruct } from \"@mysten/sui/client\";\nimport { Transaction } from \"@mysten/sui/transactions\";\nimport {\n  bluefinPoolMap,\n  cetusPoolMap,\n  coinsList,\n  getConf,\n  getReceipts,\n  getSuiClient,\n  poolInfo,\n  PoolName,\n  Receipt,\n  singleAssetPoolCoinMap,\n} from \"../index.js\";\n\nexport async function bucketDepositTx(\n  amount: string,\n  options: { address: string },\n): Promise<Transaction> {\n  const C = await getConf();\n  const suiClient = getSuiClient();\n  const address = options.address;\n  const txb = new Transaction();\n  const poolData = poolInfo[\"BUCKET-BUCK\"];\n\n  const receipt: Receipt[] = await getReceipts(\n    \"BUCKET-BUCK\" as PoolName,\n    address,\n    true,\n  );\n  let coins: CoinStruct[] = [];\n\n  let currentCursor: string | null | undefined = null;\n\n  do {\n    const response = await suiClient.getCoins({\n      owner: address,\n      coinType: coinsList[singleAssetPoolCoinMap[\"BUCKET-BUCK\"].coin].type,\n      cursor: currentCursor,\n    });\n\n    coins = coins.concat(response.data);\n\n    // Check if there's a next page\n    if (response.hasNextPage && response.nextCursor) {\n      currentCursor = response.nextCursor;\n    } else {\n      // No more pages available\n      // console.log(\"No more receipts available.\");\n      break;\n    }\n  } while (true);\n\n  if (coins.length >= 1) {\n    const [coin] = txb.splitCoins(txb.object(coins[0].coinObjectId), [0]);\n    txb.mergeCoins(\n      coin,\n      coins.map((c) => c.coinObjectId),\n    );\n    const [depositCoin] = txb.splitCoins(coin, [amount]);\n    let someReceipt: any;\n    if (receipt.length == 0) {\n      [someReceipt] = txb.moveCall({\n        target: `0x1::option::none`,\n        typeArguments: [poolData.receiptType],\n        arguments: [],\n      });\n    } else {\n      [someReceipt] = txb.moveCall({\n        target: `0x1::option::some`,\n        typeArguments: [receipt[0].content.type],\n        arguments: [txb.object(receipt[0].objectId)],\n      });\n    }\n    txb.moveCall({\n      target: `${poolData.packageId}::alphafi_bucket_investor_v1::collect_and_convert_reward_to_buck`,\n      arguments: [\n        txb.object(C.ALPHA_3_VERSION),\n        txb.object(poolData.investorId),\n        txb.object(C.BUCKET_PROTOCOL),\n        txb.object(C.FOUNTAIN),\n        txb.object(bluefinPoolMap[\"SUI-USDC\"]),\n        txb.object(C.BLUEFIN_GLOBAL_CONFIG),\n        txb.object(C.CLOCK_PACKAGE_ID),\n      ],\n    });\n    txb.moveCall({\n      target: `${poolData.packageId}::alphafi_bucket_pool_v1::user_deposit`,\n      arguments: [\n        txb.object(C.ALPHA_3_VERSION),\n        txb.object(C.VERSION),\n        someReceipt,\n        txb.object(poolData.poolId),\n        depositCoin,\n        txb.object(poolData.investorId),\n        txb.object(C.ALPHA_DISTRIBUTOR),\n        txb.object(C.BUCKET_PROTOCOL),\n        txb.object(C.FOUNTAIN),\n        txb.object(C.FLASK),\n        txb.object(cetusPoolMap[\"USDC-SUI\"]),\n        txb.object(C.CETUS_GLOBAL_CONFIG_ID),\n        txb.object(C.CLOCK_PACKAGE_ID),\n      ],\n    });\n    txb.transferObjects([coin], address);\n  } else {\n    throw new Error(\"No coin\");\n  }\n  return txb;\n}\n\nexport async function bucketWithdrawTx(\n  xTokens: string,\n  options: { address: string },\n): Promise<Transaction> {\n  const C = await getConf();\n  const address = options.address;\n  const txb = new Transaction();\n  const poolData = poolInfo[\"BUCKET-BUCK\"];\n\n  const receipt: Receipt[] = await getReceipts(\n    \"BUCKET-BUCK\" as PoolName,\n    address,\n    true,\n  );\n\n  const alphaReceipt: Receipt[] = await getReceipts(\"ALPHA\", address, true);\n\n  if (receipt.length > 0) {\n    let alpha_receipt: any;\n    if (alphaReceipt.length == 0) {\n      [alpha_receipt] = txb.moveCall({\n        target: `0x1::option::none`,\n        typeArguments: [C.ALPHA_POOL_RECEIPT],\n        arguments: [],\n      });\n    } else {\n      [alpha_receipt] = txb.moveCall({\n        target: `0x1::option::some`,\n        typeArguments: [alphaReceipt[0].content.type],\n        arguments: [txb.object(alphaReceipt[0].objectId)],\n      });\n    }\n    txb.moveCall({\n      target: `${poolData.packageId}::alphafi_bucket_investor_v1::collect_and_convert_reward_to_buck`,\n      arguments: [\n        txb.object(C.ALPHA_3_VERSION),\n        txb.object(poolData.investorId),\n        txb.object(C.BUCKET_PROTOCOL),\n        txb.object(C.FOUNTAIN),\n        txb.object(bluefinPoolMap[\"SUI-USDC\"]),\n        txb.object(C.BLUEFIN_GLOBAL_CONFIG),\n        txb.object(C.CLOCK_PACKAGE_ID),\n      ],\n    });\n    const [buck] = txb.moveCall({\n      target: `${poolData.packageId}::alphafi_bucket_pool_v1::user_withdraw`,\n      arguments: [\n        txb.object(C.ALPHA_3_VERSION),\n        txb.object(C.VERSION),\n        txb.object(receipt[0].objectId),\n        alpha_receipt,\n        txb.object(C.ALPHA_POOL),\n        txb.object(poolData.poolId),\n        txb.pure.u64(xTokens),\n        txb.object(poolData.investorId),\n        txb.object(C.ALPHA_DISTRIBUTOR),\n        txb.object(C.BUCKET_PROTOCOL),\n        txb.object(C.FOUNTAIN),\n        txb.object(C.FLASK),\n        txb.object(cetusPoolMap[\"USDC-SUI\"]),\n        txb.object(C.CETUS_GLOBAL_CONFIG_ID),\n        txb.object(C.CLOCK_PACKAGE_ID),\n      ],\n    });\n    txb.moveCall({\n      target: `0x2::transfer::public_transfer`,\n      typeArguments: [`0x2::coin::Coin<${coinsList[\"BUCK\"].type}>`],\n      arguments: [buck, txb.pure.address(address)],\n    });\n  } else {\n    throw new Error(`No ${\"BUCKET-BUCK\"} Receipt`);\n  }\n\n  return txb;\n}\n"]}

package/dist/cjs/transactions/navi-looping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navi-looping.d.ts","sourceRoot":"","sources":["../../../src/transactions/navi-looping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAYvD,OAAO,EAAE,QAAQ,EAAW,MAAM,oBAAoB,CAAC;AAMvD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,wBA2B7B;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,wBA2B7B;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAkMtB;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA4JtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAwKtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAgMtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA2FtB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA6KtB;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAyKtB;AACD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAsLtB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAsKtB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA2LtB"}
+{"version":3,"file":"navi-looping.d.ts","sourceRoot":"","sources":["../../../src/transactions/navi-looping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAavD,OAAO,EAAE,QAAQ,EAAW,MAAM,oBAAoB,CAAC;AAMvD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,wBA2B7B;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,wBA2B7B;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAkMtB;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA4JtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAwKtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAgMtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA2FtB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA6KtB;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAyKtB;AACD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAsLtB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CAsKtB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,WAAW,CAAC,CA2LtB"}

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

@@ -266,8 +266,8 @@ async function naviSuiVsuiLoopDepositTx(amount, options) {
                 if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                     rewardCoinSet.add(reward.reward_coin_type);
                     txb.moveCall({
-                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2`,
-                        typeArguments: [coins_js_1.coinsList["NAVX"].type],
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2_bluefin`,
+                        typeArguments: [coins_js_1.coinsList["NAVX"].type, coins_js_1.coinsList["SUI"].type],
                         arguments: [
                             txb.object(poolData.investorId),
                             txb.object(C.ALPHA_2_VERSION),
@@ -278,9 +278,9 @@ async function naviSuiVsuiLoopDepositTx(amount, options) {
                             txb.object(C.VOLO_STAKE_POOL),
                             txb.object(C.VOLO_METADATA),
                             txb.object(C.SUI_SYSTEM_STATE),
-                            txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                            txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                            txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                            txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                         ],
                     });
                 }
@@ -306,8 +306,8 @@ async function naviSuiVsuiLoopDepositTx(amount, options) {
             if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                 if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                     txb.moveCall({
-                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2`,
-                        typeArguments: [coins_js_1.coinsList["NAVX"].type],
+                        target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2_bluefin`,
+                        typeArguments: [coins_js_1.coinsList["NAVX"].type, coins_js_1.coinsList["SUI"].type],
                         arguments: [
                             txb.object(poolData.investorId),
                             txb.object(C.ALPHA_2_VERSION),
@@ -318,9 +318,9 @@ async function naviSuiVsuiLoopDepositTx(amount, options) {
                             txb.object(C.VOLO_STAKE_POOL),
                             txb.object(C.VOLO_METADATA),
                             txb.object(C.SUI_SYSTEM_STATE),
-                            txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                            txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                            txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                            txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                         ],
                     });
                 }
@@ -401,7 +401,7 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
             if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                 if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                     txb.moveCall({
-                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                         typeArguments: [coins_js_1.coinsList["NAVX"].type],
                         arguments: [
                             txb.object(C.ALPHA_5_VERSION),
@@ -411,15 +411,15 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
                             txb.object(C.NAVI_NAVX_REWARDS_POOL),
                             txb.object(C.LST_INFO),
                             txb.object(C.SUI_SYSTEM_STATE),
-                            txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                            txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                             txb.object(C.CLOCK_PACKAGE_ID),
                         ],
                     });
                 }
                 else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
                     txb.moveCall({
-                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                         typeArguments: [coins_js_1.coinsList["VSUI"].type],
                         arguments: [
                             txb.object(C.ALPHA_5_VERSION),
@@ -429,8 +429,8 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
                             txb.object(C.NAVI_VSUI_REWARDS_POOL),
                             txb.object(C.LST_INFO),
                             txb.object(C.SUI_SYSTEM_STATE),
-                            txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                            txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                             txb.object(C.CLOCK_PACKAGE_ID),
                         ],
                     });
@@ -457,7 +457,7 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
             if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                 if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                     txb.moveCall({
-                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                         typeArguments: [coins_js_1.coinsList["NAVX"].type],
                         arguments: [
                             txb.object(C.ALPHA_5_VERSION),
@@ -467,15 +467,15 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
                             txb.object(C.NAVI_NAVX_REWARDS_POOL),
                             txb.object(C.LST_INFO),
                             txb.object(C.SUI_SYSTEM_STATE),
-                            txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                            txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                             txb.object(C.CLOCK_PACKAGE_ID),
                         ],
                     });
                 }
                 else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
                     txb.moveCall({
-                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                        target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                         typeArguments: [coins_js_1.coinsList["VSUI"].type],
                         arguments: [
                             txb.object(C.ALPHA_5_VERSION),
@@ -485,8 +485,8 @@ async function naviSuiStsuiLoopDepositTx(amount, options) {
                             txb.object(C.NAVI_VSUI_REWARDS_POOL),
                             txb.object(C.LST_INFO),
                             txb.object(C.SUI_SYSTEM_STATE),
-                            txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                            txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                            txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                            txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                             txb.object(C.CLOCK_PACKAGE_ID),
                         ],
                     });
@@ -952,8 +952,8 @@ async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                 if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                     if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                         txb.moveCall({
-                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2`,
-                            typeArguments: [coins_js_1.coinsList["NAVX"].type],
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2_bluefin`,
+                            typeArguments: [coins_js_1.coinsList["NAVX"].type, coins_js_1.coinsList["SUI"].type],
                             arguments: [
                                 txb.object(poolData.investorId),
                                 txb.object(C.ALPHA_2_VERSION),
@@ -964,9 +964,9 @@ async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                                 txb.object(C.VOLO_STAKE_POOL),
                                 txb.object(C.VOLO_METADATA),
                                 txb.object(C.SUI_SYSTEM_STATE),
-                                txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                                txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                             ],
                         });
                     }
@@ -992,8 +992,8 @@ async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                 if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                     if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                         txb.moveCall({
-                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2`,
-                            typeArguments: [coins_js_1.coinsList["NAVX"].type],
+                            target: `${poolData.packageId}::alphafi_navi_sui_vsui_investor::collect_reward_with_two_swaps_v2_bluefin`,
+                            typeArguments: [coins_js_1.coinsList["NAVX"].type, coins_js_1.coinsList["SUI"].type],
                             arguments: [
                                 txb.object(poolData.investorId),
                                 txb.object(C.ALPHA_2_VERSION),
@@ -1004,9 +1004,9 @@ async function naviSuiVsuiLoopWithdrawTx(xTokens, options) {
                                 txb.object(C.VOLO_STAKE_POOL),
                                 txb.object(C.VOLO_METADATA),
                                 txb.object(C.SUI_SYSTEM_STATE),
-                                txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                                txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                                txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                             ],
                         });
                     }
@@ -1099,7 +1099,7 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                 if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                     if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                         txb.moveCall({
-                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                             typeArguments: [coins_js_1.coinsList["NAVX"].type],
                             arguments: [
                                 txb.object(C.ALPHA_5_VERSION),
@@ -1109,15 +1109,15 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                                 txb.object(C.NAVI_NAVX_REWARDS_POOL),
                                 txb.object(C.LST_INFO),
                                 txb.object(C.SUI_SYSTEM_STATE),
-                                txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                                 txb.object(C.CLOCK_PACKAGE_ID),
                             ],
                         });
                     }
                     else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
                         txb.moveCall({
-                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                             typeArguments: [coins_js_1.coinsList["VSUI"].type],
                             arguments: [
                                 txb.object(C.ALPHA_5_VERSION),
@@ -1127,8 +1127,8 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                                 txb.object(C.NAVI_VSUI_REWARDS_POOL),
                                 txb.object(C.LST_INFO),
                                 txb.object(C.SUI_SYSTEM_STATE),
-                                txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                                 txb.object(C.CLOCK_PACKAGE_ID),
                             ],
                         });
@@ -1155,7 +1155,7 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                 if (rewardCoinSet.has(reward.reward_coin_type) === false) {
                     if (reward.reward_coin_type === coins_js_1.coinsList["NAVX"].type.substring(2)) {
                         txb.moveCall({
-                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                             typeArguments: [coins_js_1.coinsList["NAVX"].type],
                             arguments: [
                                 txb.object(C.ALPHA_5_VERSION),
@@ -1165,15 +1165,15 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                                 txb.object(C.NAVI_NAVX_REWARDS_POOL),
                                 txb.object(C.LST_INFO),
                                 txb.object(C.SUI_SYSTEM_STATE),
-                                txb.object(maps_js_1.cetusPoolMap[`NAVX-SUI`]),
-                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.bluefinPoolMap[`NAVX-SUI`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                                 txb.object(C.CLOCK_PACKAGE_ID),
                             ],
                         });
                     }
                     else if (reward.reward_coin_type === coins_js_1.coinsList["VSUI"].type.substring(2)) {
                         txb.moveCall({
-                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps`,
+                            target: `${poolData.packageId}::alphafi_navi_sui_stsui_pool::collect_v3_rewards_with_two_swaps_bluefin`,
                             typeArguments: [coins_js_1.coinsList["VSUI"].type],
                             arguments: [
                                 txb.object(C.ALPHA_5_VERSION),
@@ -1183,8 +1183,8 @@ async function naviSuiStsuiLoopWithdrawTx(xTokens, options) {
                                 txb.object(C.NAVI_VSUI_REWARDS_POOL),
                                 txb.object(C.LST_INFO),
                                 txb.object(C.SUI_SYSTEM_STATE),
-                                txb.object(maps_js_1.cetusPoolMap[`VSUI-SUI`]),
-                                txb.object(C.CETUS_GLOBAL_CONFIG_ID),
+                                txb.object(maps_js_1.bluefinPoolMap[`VSUI-SUI`]),
+                                txb.object(C.BLUEFIN_GLOBAL_CONFIG),
                                 txb.object(C.CLOCK_PACKAGE_ID),
                             ],
                         });