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

package/dist/index.js

@@ -473,7 +473,8 @@ var import_sui_kit = require("@scallop-io/sui-kit");
 var DEFAULT_CACHE_OPTIONS = {
   defaultOptions: {
     queries: {
-      staleTime: 2e3
+      staleTime: 5e3,
+      gcTime: 5e3
     }
   }
 };
@@ -1124,6 +1125,10 @@ function withIndexerFallback(method) {
 var ScallopCache = class {
   constructor(suiKit, walletAddress, cacheOptions, tokenBucket, queryClient) {
     this.queryClient = queryClient ?? new import_query_core.QueryClient(cacheOptions ?? DEFAULT_CACHE_OPTIONS);
+    if (queryClient && cacheOptions) {
+      if (cacheOptions.defaultOptions)
+        this.queryClient.setDefaultOptions(cacheOptions.defaultOptions);
+    }
     this._suiKit = suiKit;
     this.tokenBucket = tokenBucket ?? new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS);
     this.walletAddress = walletAddress ?? suiKit.currentAddress();
@@ -4903,14 +4908,13 @@ var import_utils24 = require("@mysten/sui/utils");
 var import_sui_kit14 = require("@scallop-io/sui-kit");
 
 // src/builders/coreBuilder.ts
-var import_transactions2 = require("@mysten/sui/transactions");
+var import_transactions = 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/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
-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 ?? [
@@ -4919,7 +4923,7 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
   const rules = builder.isTestnet ? ["pyth"] : ["pyth"];
   if (usePythPullModel && rules.includes("pyth")) {
     const pythClient = new import_pyth_sui_js2.SuiPythClient(
-      builder.oldSuiClient,
+      builder.suiKit.client(),
       builder.address.get("core.oracles.pyth.state"),
       builder.address.get("core.oracles.pyth.wormholeState")
     );
@@ -4932,7 +4936,7 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
         const pythConnection = new import_pyth_sui_js2.SuiPriceServiceConnection(endpoint);
         const priceUpdateData = await pythConnection.getPriceFeedsUpdateData(priceIds);
         await pythClient.updatePriceFeeds(
-          import_transactions.TransactionBlock.from(txBlock.serialize()),
+          txBlock.txBlock,
           // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
           priceUpdateData,
           priceIds
@@ -5416,7 +5420,7 @@ var generateCoreQuickMethod = ({
   };
 };
 var newCoreTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions2.Transaction ? new import_sui_kit5.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit5.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions.Transaction ? new import_sui_kit5.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit5.SuiTxBlock();
   const normalMethod = generateCoreNormalMethod({
     builder,
     txBlock
@@ -5444,7 +5448,7 @@ var newCoreTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/spoolBuilder.ts
-var import_transactions3 = require("@mysten/sui/transactions");
+var import_transactions2 = require("@mysten/sui/transactions");
 var import_utils15 = require("@mysten/sui/utils");
 var import_sui_kit6 = require("@scallop-io/sui-kit");
 var requireStakeAccountIds = async (...params) => {
@@ -5638,7 +5642,7 @@ var generateSpoolQuickMethod = ({
   };
 };
 var newSpoolTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions3.Transaction ? new import_sui_kit6.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit6.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions2.Transaction ? new import_sui_kit6.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit6.SuiTxBlock();
   const normalMethod = generateSpoolNormalMethod({
     builder,
     txBlock
@@ -5666,7 +5670,7 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/borrowIncentiveBuilder.ts
-var import_transactions4 = require("@mysten/sui/transactions");
+var import_transactions3 = require("@mysten/sui/transactions");
 var import_utils17 = require("@mysten/sui/utils");
 var import_sui_kit7 = require("@scallop-io/sui-kit");
 var requireObligationInfo2 = async (...params) => {
@@ -5868,7 +5872,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
   };
 };
 var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions4.Transaction ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions3.Transaction ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
   const normalMethod = generateBorrowIncentiveNormalMethod({
     builder,
     txBlock
@@ -6306,7 +6310,7 @@ var newReferralTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/loyaltyProgramBuilder.ts
-var import_transactions5 = require("@mysten/sui/transactions");
+var import_transactions4 = require("@mysten/sui/transactions");
 var import_sui_kit10 = require("@scallop-io/sui-kit");
 var generateLoyaltyProgramNormalMethod = ({ builder, txBlock }) => {
   const loyaltyProgramIds = {
@@ -6347,7 +6351,7 @@ var generateLoyaltyProgramQuickMethod = ({
   };
 };
 var newLoyaltyProgramTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions5.Transaction ? new import_sui_kit10.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit10.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions4.Transaction ? new import_sui_kit10.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit10.SuiTxBlock();
   const normalMethod = generateLoyaltyProgramNormalMethod({
     builder,
     txBlock
@@ -7294,7 +7298,6 @@ 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);
@@ -7336,9 +7339,6 @@ 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.