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

package/dist/index.mjs

@@ -240,13 +240,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",
@@ -263,6 +256,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
 import { SuiKit as SuiKit7 } from "@scallop-io/sui-kit";
 
@@ -391,7 +391,7 @@ var checkRenewExpiredVeSca = (scaAmount, lockPeriodInDays, prevUnlockAtInMillisT
 
 // src/utils/query.ts
 import BigNumber from "bignumber.js";
-import { normalizeStructTag, parseStructTag } from "@mysten/sui.js/utils";
+import { normalizeStructTag, parseStructTag } from "@mysten/sui/utils";
 var parseOriginMarketPoolData = (originMarketPoolData) => {
   return {
     coinType: normalizeStructTag(originMarketPoolData.type.name),
@@ -928,21 +928,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.
@@ -956,20 +975,8 @@ var ScallopCache = class {
     typeArgs
   }) {
     const txBlock = new 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",
@@ -980,7 +987,7 @@ var ScallopCache = class {
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.suiKit.inspectTxn(txBytes)
+          () => this.suiKit.inspectTxn(txBlock)
         );
       }
     });
@@ -2201,16 +2208,16 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-import { normalizeSuiAddress as normalizeSuiAddress4 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress as normalizeSuiAddress4 } from "@mysten/sui/utils";
 import { SuiKit as SuiKit6 } from "@scallop-io/sui-kit";
 
 // src/models/scallopUtils.ts
-import { SUI_TYPE_ARG, normalizeStructTag as normalizeStructTag6 } from "@mysten/sui.js/utils";
+import { SUI_TYPE_ARG, normalizeStructTag as normalizeStructTag6 } from "@mysten/sui/utils";
 import { SuiKit as SuiKit2 } from "@scallop-io/sui-kit";
 import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 
 // src/queries/coreQuery.ts
-import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
+import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui/utils";
 import BigNumber2 from "bignumber.js";
 
 // src/queries/supplyLimit.ts
@@ -2865,7 +2872,7 @@ var getFlashLoanFees = async (query, assetNames) => {
 };
 
 // src/queries/spoolQuery.ts
-import { normalizeStructTag as normalizeStructTag4 } from "@mysten/sui.js/utils";
+import { normalizeStructTag as normalizeStructTag4 } from "@mysten/sui/utils";
 var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false) => {
   const stakeCoinNames = stakeMarketCoinNames.map(
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
@@ -3261,7 +3268,7 @@ var getStakeRewardPool = async ({
 };
 
 // src/queries/borrowIncentiveQuery.ts
-import { normalizeStructTag as normalizeStructTag5 } from "@mysten/sui.js/utils";
+import { normalizeStructTag as normalizeStructTag5 } from "@mysten/sui/utils";
 import BigNumber3 from "bignumber.js";
 var queryBorrowIncentivePools = async (address) => {
   const queryPkgId = address.get("borrowIncentive.query");
@@ -4048,8 +4055,9 @@ var getTotalValueLocked = async (query, indexer = false) => {
 // src/queries/vescaQuery.ts
 import BigNumber5 from "bignumber.js";
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock as SuiTxBlock2 } from "@scallop-io/sui-kit";
-import { bcs } from "@mysten/sui.js/bcs";
+import { bcs } from "@mysten/sui/bcs";
 import { z as zod2 } from "zod";
+import assert from "assert";
 var getVescaKeys = async (utils, ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
   const veScaObjId = utils.address.get("vesca.object");
@@ -4183,7 +4191,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 bcs.de(type, value);
+    assert(type === "u64", "Result type is not u64");
+    return bcs.u64().parse(value);
   }
   return "0";
 };
@@ -4720,20 +4729,21 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui/utils";
 import { SuiKit as SuiKit5 } from "@scallop-io/sui-kit";
 
 // src/builders/coreBuilder.ts
-import { TransactionBlock } from "@mysten/sui.js/transactions";
-import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID3 } from "@mysten/sui.js/utils";
+import { Transaction } from "@mysten/sui/transactions";
+import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID3 } from "@mysten/sui/utils";
 import { SuiTxBlock as SuiKitTxBlock } from "@scallop-io/sui-kit";
 
 // src/builders/oracle.ts
-import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID2 } from "@mysten/sui.js/utils";
+import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID2 } from "@mysten/sui/utils";
 import {
   SuiPythClient,
   SuiPriceServiceConnection as SuiPriceServiceConnection2
 } from "@pythnetwork/pyth-sui-js";
+import { TransactionBlock } from "@mysten/sui.js/transactions";
 var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePythPullModel: true }) => {
   const usePythPullModel = builder.params.usePythPullModel ?? options.usePythPullModel;
   assetCoinNames = assetCoinNames ?? [
@@ -4742,7 +4752,7 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
   const rules = builder.isTestnet ? ["pyth"] : ["pyth"];
   if (usePythPullModel && rules.includes("pyth")) {
     const pythClient = new SuiPythClient(
-      builder.suiKit.client(),
+      builder.oldSuiClient,
       builder.address.get("core.oracles.pyth.state"),
       builder.address.get("core.oracles.pyth.wormholeState")
     );
@@ -4755,7 +4765,8 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
         const pythConnection = new SuiPriceServiceConnection2(endpoint);
         const priceUpdateData = await pythConnection.getPriceFeedsUpdateData(priceIds);
         await pythClient.updatePriceFeeds(
-          txBlock.txBlock,
+          TransactionBlock.from(txBlock.serialize()),
+          // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
           priceUpdateData,
           priceIds
         );
@@ -4936,7 +4947,7 @@ var generateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID3
         ],
@@ -5003,7 +5014,7 @@ var generateCoreNormalMethod = ({
           coreIds.market,
           coreIds.coinDecimalsRegistry,
           borrowReferral,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID3
         ],
@@ -5020,7 +5031,7 @@ var generateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID3
         ],
@@ -5238,7 +5249,7 @@ var generateCoreQuickMethod = ({
   };
 };
 var newCoreTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock ? new SuiKitTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock();
+  const txBlock = initTxBlock instanceof Transaction ? new SuiKitTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock();
   const normalMethod = generateCoreNormalMethod({
     builder,
     txBlock
@@ -5266,8 +5277,8 @@ var newCoreTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/spoolBuilder.ts
-import { TransactionBlock as TransactionBlock2 } from "@mysten/sui.js/transactions";
-import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID4 } from "@mysten/sui.js/utils";
+import { Transaction as Transaction2 } from "@mysten/sui/transactions";
+import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID4 } from "@mysten/sui/utils";
 import { SuiTxBlock as SuiKitTxBlock2 } from "@scallop-io/sui-kit";
 var requireStakeAccountIds = async (...params) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;
@@ -5460,7 +5471,7 @@ var generateSpoolQuickMethod = ({
   };
 };
 var newSpoolTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock2 ? new SuiKitTxBlock2(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock2();
+  const txBlock = initTxBlock instanceof Transaction2 ? new SuiKitTxBlock2(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock2();
   const normalMethod = generateSpoolNormalMethod({
     builder,
     txBlock
@@ -5488,8 +5499,8 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/borrowIncentiveBuilder.ts
-import { TransactionBlock as TransactionBlock3 } from "@mysten/sui.js/transactions";
-import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID5 } from "@mysten/sui.js/utils";
+import { Transaction as Transaction3 } from "@mysten/sui/transactions";
+import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID5 } from "@mysten/sui/utils";
 import { SuiTxBlock as SuiKitTxBlock3 } from "@scallop-io/sui-kit";
 var requireObligationInfo2 = async (...params) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
@@ -5690,7 +5701,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
   };
 };
 var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock3 ? new SuiKitTxBlock3(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock3();
+  const txBlock = initTxBlock instanceof Transaction3 ? new SuiKitTxBlock3(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock3();
   const normalMethod = generateBorrowIncentiveNormalMethod({
     builder,
     txBlock
@@ -5720,7 +5731,7 @@ var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
 // src/builders/vescaBuilder.ts
 import {
   SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID6,
-  TransactionBlock as TransactionBlock4,
+  Transaction as Transaction4,
   SuiTxBlock as SuiKitTxBlock4
 } from "@scallop-io/sui-kit";
 var requireVeSca = async (...params) => {
@@ -5970,7 +5981,7 @@ var generateQuickVeScaMethod = ({
   };
 };
 var newVeScaTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock4 ? new SuiKitTxBlock4(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock4();
+  const txBlock = initTxBlock instanceof Transaction4 ? new SuiKitTxBlock4(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock4();
   const normalMethod = generateNormalVeScaMethod({
     builder,
     txBlock
@@ -6001,7 +6012,7 @@ var newVeScaTxBlock = (builder, initTxBlock) => {
 import {
   SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID7,
   SuiTxBlock as SuiKitTxBlock5,
-  TransactionBlock as TransactionBlock5
+  Transaction as Transaction5
 } from "@scallop-io/sui-kit";
 var generateReferralNormalMethod = ({
   builder,
@@ -6024,7 +6035,7 @@ var generateReferralNormalMethod = ({
         `${referralIds.referralPgkId}::referral_bindings::bind_ve_sca_referrer`,
         [
           referralIds.referralBindings,
-          txBlock.pure(veScaKeyId),
+          txBlock.pure.id(veScaKeyId),
           veScaTable,
           SUI_CLOCK_OBJECT_ID7
         ],
@@ -6108,7 +6119,7 @@ var generateReferralQuickMethod = ({
   };
 };
 var newReferralTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock5 ? new SuiKitTxBlock5(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock5();
+  const txBlock = initTxBlock instanceof Transaction5 ? new SuiKitTxBlock5(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock5();
   const normalMethod = generateReferralNormalMethod({
     builder,
     txBlock
@@ -6136,7 +6147,7 @@ var newReferralTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/loyaltyProgramBuilder.ts
-import { TransactionBlock as TransactionBlock6 } from "@mysten/sui.js/transactions";
+import { Transaction as Transaction6 } from "@mysten/sui/transactions";
 import { SuiTxBlock as SuiKitTxBlock6 } from "@scallop-io/sui-kit";
 var generateLoyaltyProgramNormalMethod = ({ builder, txBlock }) => {
   const loyaltyProgramIds = {
@@ -6177,7 +6188,7 @@ var generateLoyaltyProgramQuickMethod = ({
   };
 };
 var newLoyaltyProgramTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock6 ? new SuiKitTxBlock6(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock6();
+  const txBlock = initTxBlock instanceof Transaction6 ? new SuiKitTxBlock6(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock6();
   const normalMethod = generateLoyaltyProgramNormalMethod({
     builder,
     txBlock
@@ -6205,10 +6216,7 @@ var newLoyaltyProgramTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/sCoinBuilder.ts
-import {
-  TransactionBlock as TransactionBlock7,
-  SuiTxBlock as SuiKitTxBlock7
-} from "@scallop-io/sui-kit";
+import { Transaction as Transaction7, SuiTxBlock as SuiKitTxBlock7 } from "@scallop-io/sui-kit";
 var generateSCoinNormalMethod = ({
   builder,
   txBlock
@@ -6269,7 +6277,7 @@ var generateSCoinQuickMethod = ({
   };
 };
 var newSCoinTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof TransactionBlock7 ? new SuiKitTxBlock7(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock7();
+  const txBlock = initTxBlock instanceof Transaction7 ? new SuiKitTxBlock7(initTxBlock) : initTxBlock ? initTxBlock : new SuiKitTxBlock7();
   const normalMethod = generateSCoinNormalMethod({
     builder,
     txBlock
@@ -6501,8 +6509,8 @@ var ScallopIndexer = class {
 };
 
 // src/queries/sCoinQuery.ts
-import { bcs as bcs2 } from "@mysten/sui.js/bcs";
-import assert from "assert";
+import { bcs as bcs2 } from "@mysten/sui/bcs";
+import assert2 from "assert";
 import BigNumber7 from "bignumber.js";
 var getSCoinTotalSupply = async ({
   utils
@@ -6523,8 +6531,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];
-    assert(type === "u64", "Result type is not u64");
-    return BigNumber7(bcs2.de(type, value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
+    assert2(type === "u64", "Result type is not u64");
+    return BigNumber7(bcs2.u64().parse(value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
   }
   return 0;
 };
@@ -6594,7 +6602,7 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
 };
 
 // src/models/scallopQuery.ts
-import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui/utils";
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
@@ -7082,6 +7090,7 @@ var ScallopQuery = class {
 };
 
 // src/models/scallopBuilder.ts
+import { SuiClient as SuiClientV0 } from "@mysten/sui.js/client";
 var ScallopBuilder = class {
   constructor(params, instance) {
     this.suiKit = instance?.suiKit ?? new SuiKit5(params);
@@ -7122,6 +7131,9 @@ var ScallopBuilder = class {
       );
     }
     this.isTestnet = params.networkType ? params.networkType === "testnet" : false;
+    this.oldSuiClient = new SuiClientV0({
+      url: this.suiKit.suiInteractor.currentFullNode
+    });
   }
   /**
    * Request the scallop API to initialize data.
@@ -7643,6 +7655,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(