@scallop-io/sui-scallop-sdk 0.47.2 → 1.3.0-alpha.1

package/dist/builders/borrowIncentiveBuilder.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from 'src/models';
 import type { BorrowIncentiveTxBlock, ScallopTxBlock } from '../types';
@@ -9,4 +9,4 @@ import type { BorrowIncentiveTxBlock, ScallopTxBlock } from '../types';
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop borrow incentive txBlock.
  */
-export declare const newBorrowIncentiveTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => BorrowIncentiveTxBlock;
+export declare const newBorrowIncentiveTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction) => BorrowIncentiveTxBlock;

package/dist/builders/coreBuilder.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { CoreTxBlock, ScallopTxBlock, SuiTxBlockWithSpool } from '../types';
@@ -9,4 +9,4 @@ import type { CoreTxBlock, ScallopTxBlock, SuiTxBlockWithSpool } from '../types'
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop core txBlock.
  */
-export declare const newCoreTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock | SuiTxBlockWithSpool) => CoreTxBlock;
+export declare const newCoreTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction | SuiTxBlockWithSpool) => CoreTxBlock;

package/dist/builders/index.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { ScallopTxBlock } from '../types';
@@ -9,4 +9,4 @@ import type { ScallopTxBlock } from '../types';
  * @param txBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return ScallopTxBlock.
  */
-export declare const newScallopTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => ScallopTxBlock;
+export declare const newScallopTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction) => ScallopTxBlock;

package/dist/builders/loyaltyProgramBuilder.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
 import { LoyaltyProgramTxBlock, ScallopTxBlock } from 'src/types';
@@ -9,4 +9,4 @@ import { LoyaltyProgramTxBlock, ScallopTxBlock } from 'src/types';
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop loyalty program txBlock.
  */
-export declare const newLoyaltyProgramTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => LoyaltyProgramTxBlock;
+export declare const newLoyaltyProgramTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction) => LoyaltyProgramTxBlock;

package/dist/builders/oracle.d.ts

@@ -7,5 +7,8 @@ import type { SupportAssetCoins } from '../types';
  * @param builder - The scallop builder.
  * @param txBlock - TxBlock created by SuiKit.
  * @param assetCoinNames - Specific an array of support asset coin name.
+ * @param options - The options for update oracles.
  */
-export declare const updateOracles: (builder: ScallopBuilder, txBlock: SuiKitTxBlock, assetCoinNames?: SupportAssetCoins[]) => Promise<void>;
+export declare const updateOracles: (builder: ScallopBuilder, txBlock: SuiKitTxBlock, assetCoinNames?: SupportAssetCoins[], options?: {
+    usePythPullModel: boolean;
+}) => Promise<void>;

package/dist/builders/referralBuilder.d.ts

@@ -1,6 +1,6 @@
 import { ScallopBuilder } from 'src/models';
 import { ScallopTxBlock } from 'src/types';
-import { SuiTxBlock as SuiKitTxBlock, TransactionBlock } from '@scallop-io/sui-kit';
+import { SuiTxBlock as SuiKitTxBlock, Transaction } from '@scallop-io/sui-kit';
 import { ReferralTxBlock } from 'src/types/builder/referral';
 /**
  * Create an enhanced transaction block instance for interaction with borrow incentive modules of the Scallop contract.
@@ -9,4 +9,4 @@ import { ReferralTxBlock } from 'src/types/builder/referral';
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop referral txBlock.
  */
-export declare const newReferralTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => ReferralTxBlock;
+export declare const newReferralTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction) => ReferralTxBlock;

package/dist/builders/sCoinBuilder.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock, SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
+import { Transaction, SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
 import { BaseScallopTxBlock, SCoinTxBlock, ScallopTxBlock } from 'src/types';
-export declare const newSCoinTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock | BaseScallopTxBlock) => SCoinTxBlock;
+export declare const newSCoinTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction | BaseScallopTxBlock) => SCoinTxBlock;

package/dist/builders/spoolBuilder.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { SpoolTxBlock, ScallopTxBlock, SuiTxBlockWithSCoin } from '../types';
@@ -9,4 +9,4 @@ import type { SpoolTxBlock, ScallopTxBlock, SuiTxBlockWithSCoin } from '../types
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop spool txBlock.
  */
-export declare const newSpoolTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock | SuiTxBlockWithSCoin) => SpoolTxBlock;
+export declare const newSpoolTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction | SuiTxBlockWithSCoin) => SpoolTxBlock;

package/dist/builders/vescaBuilder.d.ts

@@ -1,4 +1,4 @@
-import { SuiTxBlock, TransactionBlock, SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
+import { SuiTxBlock, Transaction, SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from '../models';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopTxBlock, VeScaTxBlock } from 'src/types';
@@ -22,4 +22,4 @@ export declare const requireVeSca: (builder: ScallopBuilder, SuiTxBlock: SuiTxBl
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop borrow incentive txBlock.
  */
-export declare const newVeScaTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => VeScaTxBlock;
+export declare const newVeScaTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction) => VeScaTxBlock;

package/dist/constants/common.d.ts

@@ -1,7 +1,7 @@
-export declare const API_BASE_URL = "https://sui.apis.scallop.io";
-export declare const SDK_API_BASE_URL = "https://sdk.api.scallop.io";
-export declare const IS_VE_SCA_TEST = false;
-export declare const USE_TEST_ADDRESS = false;
+export declare const API_BASE_URL: "https://sui.apis.scallop.io";
+export declare const SDK_API_BASE_URL: "https://sdk.api.scallop.io";
+export declare const IS_VE_SCA_TEST: boolean;
+export declare const USE_TEST_ADDRESS: boolean;
 export declare const ADDRESSES_ID: "65fb07c39c845425d71d7b18" | "66f8e7ed9bb9e07fdfb86bbb";
 export declare const PROTOCOL_OBJECT_ID: "0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778" | "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf";
 export declare const BORROW_FEE_PROTOCOL_ID: "0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778" | "0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da";

package/dist/constants/index.d.ts

@@ -1,4 +1,4 @@
 export * from './common';
 export * from './enum';
-export * from './vesca';
 export * from './flashloan';
+export * from './vesca';

package/dist/constants/vesca.d.ts

@@ -1,5 +1,5 @@
 export declare const UNLOCK_ROUND_DURATION: number;
-export declare const MAX_LOCK_ROUNDS: number;
+export declare const MAX_LOCK_ROUNDS: 1460;
 export declare const MAX_LOCK_DURATION: number;
-export declare const MIN_INITIAL_LOCK_AMOUNT: number;
-export declare const MIN_TOP_UP_AMOUNT: number;
+export declare const MIN_INITIAL_LOCK_AMOUNT: 10000000000;
+export declare const MIN_TOP_UP_AMOUNT: 1000000000;

package/dist/index.js

@@ -318,13 +318,6 @@ var sCoinIds = {
   swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC"
 };
 
-// src/constants/vesca.ts
-var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
-var MAX_LOCK_ROUNDS = 1460;
-var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
-var MIN_INITIAL_LOCK_AMOUNT = 1e10;
-var MIN_TOP_UP_AMOUNT = 1e9;
-
 // src/constants/flashloan.ts
 var FlashLoanFeeObjectMap = {
   vsui: "0x0069cddee7a5c0b1d34beb5ef0620f978096525f1830b055f38b110f40d73fbb",
@@ -341,6 +334,13 @@ var FlashLoanFeeObjectMap = {
   wsol: "0xe84bdb35b790fc7bdd1645122ac6ac0fc904531d6772c9e25904fece322c5f34"
 };
 
+// src/constants/vesca.ts
+var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
+var MAX_LOCK_ROUNDS = 1460;
+var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
+var MIN_INITIAL_LOCK_AMOUNT = 1e10;
+var MIN_TOP_UP_AMOUNT = 1e9;
+
 // src/models/scallop.ts
 var import_sui_kit16 = require("@scallop-io/sui-kit");
 
@@ -465,7 +465,7 @@ var checkRenewExpiredVeSca = (scaAmount, lockPeriodInDays, prevUnlockAtInMillisT
 
 // src/utils/query.ts
 var import_bignumber = __toESM(require("bignumber.js"));
-var import_utils = require("@mysten/sui.js/utils");
+var import_utils = require("@mysten/sui/utils");
 var parseOriginMarketPoolData = (originMarketPoolData) => {
   return {
     coinType: (0, import_utils.normalizeStructTag)(originMarketPoolData.type.name),
@@ -1002,21 +1002,40 @@ var ScallopCache = class {
       refetchType
     });
   }
-  /**
-   * @description Cache protocol config call for 60 seconds.
-   * @returns Promise<ProtocolConfig>
-   */
-  async getProtocolConfig() {
-    return await this.queryClient.fetchQuery({
-      queryKey: ["getProtocolConfig"],
-      queryFn: async () => {
-        return await callWithRateLimit(
-          this.tokenBucket,
-          () => this.client.getProtocolConfig()
-        );
-      },
-      staleTime: 3e4
-    });
+  async resolveArgs(txb, args) {
+    return await Promise.all(
+      args.map(async (arg) => {
+        if (typeof arg === "string") {
+          const objData = (await this.queryGetObject(arg, { showOwner: true }))?.data;
+          if (!objData)
+            return arg;
+          const owner = objData?.owner;
+          if (!owner)
+            return arg;
+          if ("Shared" in owner) {
+            return txb.sharedObjectRef({
+              objectId: objData.objectId,
+              initialSharedVersion: owner.Shared.initial_shared_version,
+              mutable: true
+            });
+          } else {
+            return txb.objectRef({
+              objectId: objData.objectId,
+              version: objData.version,
+              digest: objData.digest
+            });
+          }
+        } else if ("objectId" in arg && "version" in arg && "digest" in arg) {
+          return txb.objectRef({
+            objectId: arg.objectId,
+            version: arg.version,
+            digest: arg.digest
+          });
+        } else {
+          return arg;
+        }
+      })
+    );
   }
   /**
    * @description Provides cache for inspectTxn of the SuiKit.
@@ -1030,20 +1049,8 @@ var ScallopCache = class {
     typeArgs
   }) {
     const txBlock = new import_sui_kit.SuiTxBlock();
-    const resolvedArgs = await Promise.all(
-      args.map(async (arg) => {
-        if (typeof arg === "string") {
-          return (await this.queryGetObject(arg, { showContent: true }))?.data;
-        }
-        return arg;
-      })
-    );
+    const resolvedArgs = await this.resolveArgs(txBlock, args);
     txBlock.moveCall(queryTarget, resolvedArgs, typeArgs);
-    const txBytes = await txBlock.txBlock.build({
-      client: this.client,
-      onlyTransactionKind: true,
-      protocolConfig: await this.getProtocolConfig() ?? void 0
-    });
     const query = await this.queryClient.fetchQuery({
       queryKey: typeArgs ? ["inspectTxn", queryTarget, JSON.stringify(args)] : [
         "inspectTxn",
@@ -1054,7 +1061,7 @@ var ScallopCache = class {
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.suiKit.inspectTxn(txBytes)
+          () => this.suiKit.inspectTxn(txBlock)
         );
       }
     });
@@ -2275,16 +2282,16 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-var import_utils25 = require("@mysten/sui.js/utils");
+var import_utils25 = require("@mysten/sui/utils");
 var import_sui_kit15 = require("@scallop-io/sui-kit");
 
 // src/models/scallopUtils.ts
-var import_utils10 = require("@mysten/sui.js/utils");
+var import_utils10 = require("@mysten/sui/utils");
 var import_sui_kit4 = require("@scallop-io/sui-kit");
 var import_pyth_sui_js = require("@pythnetwork/pyth-sui-js");
 
 // src/queries/coreQuery.ts
-var import_utils3 = require("@mysten/sui.js/utils");
+var import_utils3 = require("@mysten/sui/utils");
 var import_bignumber2 = __toESM(require("bignumber.js"));
 
 // src/queries/supplyLimit.ts
@@ -2939,7 +2946,7 @@ var getFlashLoanFees = async (query, assetNames) => {
 };
 
 // src/queries/spoolQuery.ts
-var import_utils5 = require("@mysten/sui.js/utils");
+var import_utils5 = require("@mysten/sui/utils");
 var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false) => {
   const stakeCoinNames = stakeMarketCoinNames.map(
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
@@ -3335,7 +3342,7 @@ var getStakeRewardPool = async ({
 };
 
 // src/queries/borrowIncentiveQuery.ts
-var import_utils7 = require("@mysten/sui.js/utils");
+var import_utils7 = require("@mysten/sui/utils");
 var import_bignumber3 = __toESM(require("bignumber.js"));
 var queryBorrowIncentivePools = async (address) => {
   const queryPkgId = address.get("borrowIncentive.query");
@@ -4122,8 +4129,9 @@ var getTotalValueLocked = async (query, indexer = false) => {
 // src/queries/vescaQuery.ts
 var import_bignumber5 = __toESM(require("bignumber.js"));
 var import_sui_kit3 = require("@scallop-io/sui-kit");
-var import_bcs = require("@mysten/sui.js/bcs");
+var import_bcs = require("@mysten/sui/bcs");
 var import_zod2 = require("zod");
+var import_assert = __toESM(require("assert"));
 var getVescaKeys = async (utils, ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
   const veScaObjId = utils.address.get("vesca.object");
@@ -4257,7 +4265,8 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
   if (results && results[1].returnValues) {
     const value = Uint8Array.from(results[1].returnValues[0][0]);
     const type = results[1].returnValues[0][1];
-    return import_bcs.bcs.de(type, value);
+    (0, import_assert.default)(type === "u64", "Result type is not u64");
+    return import_bcs.bcs.u64().parse(value);
   }
   return "0";
 };
@@ -4794,25 +4803,27 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-var import_utils24 = require("@mysten/sui.js/utils");
+var import_utils24 = require("@mysten/sui/utils");
 var import_sui_kit14 = require("@scallop-io/sui-kit");
 
 // src/builders/coreBuilder.ts
-var import_transactions = require("@mysten/sui.js/transactions");
-var import_utils13 = require("@mysten/sui.js/utils");
+var import_transactions2 = require("@mysten/sui/transactions");
+var import_utils13 = require("@mysten/sui/utils");
 var import_sui_kit5 = require("@scallop-io/sui-kit");
 
 // src/builders/oracle.ts
-var import_utils12 = require("@mysten/sui.js/utils");
+var import_utils12 = require("@mysten/sui/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
-var updateOracles = async (builder, txBlock, assetCoinNames) => {
+var import_transactions = require("@mysten/sui.js/transactions");
+var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePythPullModel: true }) => {
+  const usePythPullModel = builder.params.usePythPullModel ?? options.usePythPullModel;
   assetCoinNames = assetCoinNames ?? [
     .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
   ];
   const rules = builder.isTestnet ? ["pyth"] : ["pyth"];
-  if (rules.includes("pyth")) {
+  if (usePythPullModel && rules.includes("pyth")) {
     const pythClient = new import_pyth_sui_js2.SuiPythClient(
-      builder.suiKit.client(),
+      builder.oldSuiClient,
       builder.address.get("core.oracles.pyth.state"),
       builder.address.get("core.oracles.pyth.wormholeState")
     );
@@ -4825,7 +4836,8 @@ var updateOracles = async (builder, txBlock, assetCoinNames) => {
         const pythConnection = new import_pyth_sui_js2.SuiPriceServiceConnection(endpoint);
         const priceUpdateData = await pythConnection.getPriceFeedsUpdateData(priceIds);
         await pythClient.updatePriceFeeds(
-          txBlock.txBlock,
+          import_transactions.TransactionBlock.from(txBlock.serialize()),
+          // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
           priceUpdateData,
           priceIds
         );
@@ -5006,7 +5018,7 @@ var generateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           import_utils13.SUI_CLOCK_OBJECT_ID
         ],
@@ -5073,7 +5085,7 @@ var generateCoreNormalMethod = ({
           coreIds.market,
           coreIds.coinDecimalsRegistry,
           borrowReferral,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           import_utils13.SUI_CLOCK_OBJECT_ID
         ],
@@ -5090,7 +5102,7 @@ var generateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           import_utils13.SUI_CLOCK_OBJECT_ID
         ],
@@ -5308,7 +5320,7 @@ var generateCoreQuickMethod = ({
   };
 };
 var newCoreTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions.TransactionBlock ? new import_sui_kit5.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit5.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions2.Transaction ? new import_sui_kit5.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit5.SuiTxBlock();
   const normalMethod = generateCoreNormalMethod({
     builder,
     txBlock
@@ -5336,8 +5348,8 @@ var newCoreTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/spoolBuilder.ts
-var import_transactions2 = require("@mysten/sui.js/transactions");
-var import_utils15 = require("@mysten/sui.js/utils");
+var import_transactions3 = require("@mysten/sui/transactions");
+var import_utils15 = require("@mysten/sui/utils");
 var import_sui_kit6 = require("@scallop-io/sui-kit");
 var requireStakeAccountIds = async (...params) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;
@@ -5530,7 +5542,7 @@ var generateSpoolQuickMethod = ({
   };
 };
 var newSpoolTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions2.TransactionBlock ? new import_sui_kit6.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit6.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions3.Transaction ? new import_sui_kit6.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit6.SuiTxBlock();
   const normalMethod = generateSpoolNormalMethod({
     builder,
     txBlock
@@ -5558,8 +5570,8 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/borrowIncentiveBuilder.ts
-var import_transactions3 = require("@mysten/sui.js/transactions");
-var import_utils17 = require("@mysten/sui.js/utils");
+var import_transactions4 = require("@mysten/sui/transactions");
+var import_utils17 = require("@mysten/sui/utils");
 var import_sui_kit7 = require("@scallop-io/sui-kit");
 var requireObligationInfo2 = async (...params) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
@@ -5717,19 +5729,14 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
       );
       if (!obligationLocked || unstakeObligationBeforeStake) {
         const bindedVeScaKey = await builder.query.getBindedVeScaKey(obligationArg);
-        if (veScaKey && veScaKey !== bindedVeScaKey) {
-          throw new Error(
-            "Binded veScaKey is not equal to the provided veScaKey"
-          );
-        }
-        if (bindedVeScaKey) {
+        if (veScaKey && veScaKey !== bindedVeScaKey || !bindedVeScaKey) {
+          txBlock.stakeObligation(obligationArg, obligationKeyArg);
+        } else {
           txBlock.stakeObligationWithVesca(
             obligationArg,
             obligationKeyArg,
             bindedVeScaKey
           );
-        } else {
-          txBlock.stakeObligation(obligationArg, obligationKeyArg);
         }
       }
     },
@@ -5765,7 +5772,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
   };
 };
 var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions3.TransactionBlock ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions4.Transaction ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
   const normalMethod = generateBorrowIncentiveNormalMethod({
     builder,
     txBlock
@@ -6041,7 +6048,7 @@ var generateQuickVeScaMethod = ({
   };
 };
 var newVeScaTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit8.TransactionBlock ? new import_sui_kit8.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit8.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit8.Transaction ? new import_sui_kit8.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit8.SuiTxBlock();
   const normalMethod = generateNormalVeScaMethod({
     builder,
     txBlock
@@ -6091,7 +6098,7 @@ var generateReferralNormalMethod = ({
         `${referralIds.referralPgkId}::referral_bindings::bind_ve_sca_referrer`,
         [
           referralIds.referralBindings,
-          txBlock.pure(veScaKeyId),
+          txBlock.pure.id(veScaKeyId),
           veScaTable,
           import_sui_kit9.SUI_CLOCK_OBJECT_ID
         ],
@@ -6175,7 +6182,7 @@ var generateReferralQuickMethod = ({
   };
 };
 var newReferralTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit9.TransactionBlock ? new import_sui_kit9.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit9.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit9.Transaction ? new import_sui_kit9.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit9.SuiTxBlock();
   const normalMethod = generateReferralNormalMethod({
     builder,
     txBlock
@@ -6203,7 +6210,7 @@ var newReferralTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/loyaltyProgramBuilder.ts
-var import_transactions4 = require("@mysten/sui.js/transactions");
+var import_transactions5 = require("@mysten/sui/transactions");
 var import_sui_kit10 = require("@scallop-io/sui-kit");
 var generateLoyaltyProgramNormalMethod = ({ builder, txBlock }) => {
   const loyaltyProgramIds = {
@@ -6244,7 +6251,7 @@ var generateLoyaltyProgramQuickMethod = ({
   };
 };
 var newLoyaltyProgramTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions4.TransactionBlock ? new import_sui_kit10.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit10.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions5.Transaction ? new import_sui_kit10.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit10.SuiTxBlock();
   const normalMethod = generateLoyaltyProgramNormalMethod({
     builder,
     txBlock
@@ -6333,7 +6340,7 @@ var generateSCoinQuickMethod = ({
   };
 };
 var newSCoinTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit11.TransactionBlock ? new import_sui_kit11.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit11.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit11.Transaction ? new import_sui_kit11.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit11.SuiTxBlock();
   const normalMethod = generateSCoinNormalMethod({
     builder,
     txBlock
@@ -6565,8 +6572,8 @@ var ScallopIndexer = class {
 };
 
 // src/queries/sCoinQuery.ts
-var import_bcs2 = require("@mysten/sui.js/bcs");
-var import_assert = __toESM(require("assert"));
+var import_bcs2 = require("@mysten/sui/bcs");
+var import_assert2 = __toESM(require("assert"));
 var import_bignumber7 = __toESM(require("bignumber.js"));
 var getSCoinTotalSupply = async ({
   utils
@@ -6587,8 +6594,8 @@ var getSCoinTotalSupply = async ({
   if (results && results[0].returnValues) {
     const value = Uint8Array.from(results[0].returnValues[0][0]);
     const type = results[0].returnValues[0][1];
-    (0, import_assert.default)(type === "u64", "Result type is not u64");
-    return (0, import_bignumber7.default)(import_bcs2.bcs.de(type, value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
+    (0, import_assert2.default)(type === "u64", "Result type is not u64");
+    return (0, import_bignumber7.default)(import_bcs2.bcs.u64().parse(value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
   }
   return 0;
 };
@@ -6658,7 +6665,7 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
 };
 
 // src/models/scallopQuery.ts
-var import_utils23 = require("@mysten/sui.js/utils");
+var import_utils23 = require("@mysten/sui/utils");
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
@@ -7146,6 +7153,7 @@ var ScallopQuery = class {
 };
 
 // src/models/scallopBuilder.ts
+var import_client = require("@mysten/sui.js/client");
 var ScallopBuilder = class {
   constructor(params, instance) {
     this.suiKit = instance?.suiKit ?? new import_sui_kit14.SuiKit(params);
@@ -7186,6 +7194,9 @@ var ScallopBuilder = class {
       );
     }
     this.isTestnet = params.networkType ? params.networkType === "testnet" : false;
+    this.oldSuiClient = new import_client.SuiClient({
+      url: this.suiKit.suiInteractor.currentFullNode
+    });
   }
   /**
    * Request the scallop API to initialize data.
@@ -7707,6 +7718,7 @@ var ScallopClient = class {
       false
     );
     const stakeCoinName = this.utils.parseCoinName(stakeMarketCoinName);
+    console.log(stakeMarketCoin, stakeCoinName);
     if (stakeMarketCoin) {
       const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
       await this.utils.mergeSimilarCoins(
@@ -7995,11 +8007,15 @@ var Scallop = class {
    *
    * @return Scallop Builder.
    */
-  async createScallopBuilder() {
+  async createScallopBuilder(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopBuilder = new ScallopBuilder(this.params, {
-      query: await this.createScallopQuery()
+    const builderParams = {
+      ...this.params,
+      ...params
+    };
+    const scallopBuilder = new ScallopBuilder(builderParams, {
+      query: await this.createScallopQuery(builderParams)
     });
     return scallopBuilder;
   }
@@ -8009,13 +8025,16 @@ var Scallop = class {
    * @param walletAddress - When user cannot provide a secret key or mnemonic, the scallop client cannot directly derive the address of the transaction the user wants to sign. This argument specifies the wallet address for signing the transaction.
    * @return Scallop Client.
    */
-  async createScallopClient(walletAddress) {
+  async createScallopClient(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopClient = new ScallopClient(
-      { ...this.params, walletAddress },
-      { builder: await this.createScallopBuilder() }
-    );
+    const clientParams = {
+      ...this.params,
+      ...params
+    };
+    const scallopClient = new ScallopClient(clientParams, {
+      builder: await this.createScallopBuilder(clientParams)
+    });
     return scallopClient;
   }
   /**
@@ -8023,11 +8042,15 @@ var Scallop = class {
    *
    * @return Scallop Query.
    */
-  async createScallopQuery() {
+  async createScallopQuery(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopQuery = new ScallopQuery(this.params, {
-      utils: await this.createScallopUtils()
+    const queryParams = {
+      ...this.params,
+      ...params
+    };
+    const scallopQuery = new ScallopQuery(queryParams, {
+      utils: await this.createScallopUtils(queryParams)
     });
     return scallopQuery;
   }
@@ -8047,12 +8070,18 @@ var Scallop = class {
    *
    * @return Scallop Utils.
    */
-  async createScallopUtils() {
+  async createScallopUtils(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopUtils = new ScallopUtils(this.params, {
-      address: this.address
-    });
+    const scallopUtils = new ScallopUtils(
+      {
+        ...this.params,
+        ...params
+      },
+      {
+        address: this.address
+      }
+    );
     return scallopUtils;
   }
 };