@scallop-io/sui-scallop-sdk 0.46.57 → 0.46.58

package/dist/constants/tokenBucket.d.ts

@@ -1,2 +1,2 @@
-export declare const DEFAULT_TOKENS_PER_INTERVAL = 10;
-export declare const DEFAULT_INTERVAL_IN_MS = 1000;
+export declare const DEFAULT_TOKENS_PER_INTERVAL = 50;
+export declare const DEFAULT_INTERVAL_IN_MS = 300;

package/dist/index.js

@@ -339,7 +339,7 @@ var import_sui_kit = require("@scallop-io/sui-kit");
 var DEFAULT_CACHE_OPTIONS = {
   defaultOptions: {
     queries: {
-      staleTime: 1500
+      staleTime: 2e3
     }
   }
 };
@@ -888,8 +888,8 @@ var findClosestUnlockRound = (unlockAtInSecondTimestamp) => {
 };
 
 // src/constants/tokenBucket.ts
-var DEFAULT_TOKENS_PER_INTERVAL = 10;
-var DEFAULT_INTERVAL_IN_MS = 1e3;
+var DEFAULT_TOKENS_PER_INTERVAL = 50;
+var DEFAULT_INTERVAL_IN_MS = 300;
 
 // src/utils/tokenBucket.ts
 var TokenBucket = class {
@@ -917,14 +917,31 @@ var TokenBucket = class {
     return false;
   }
 };
-var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 5) => {
+var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 15, backoffFactor = 1.25) => {
   let retries = 0;
   const tryRequest = async () => {
     if (tokenBucket.removeTokens(1)) {
-      return await fn();
+      try {
+        const result = await fn();
+        if (result && result.status === 429) {
+          throw new Error("Unexpected status code: 429");
+        }
+        return result;
+      } catch (error) {
+        if (error.message === "Unexpected status code: 429" && retries < maxRetries) {
+          retries++;
+          const delay = retryDelayInMs * Math.pow(backoffFactor, retries);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          return tryRequest();
+        } else {
+          console.error("An error occurred:", error);
+          return null;
+        }
+      }
     } else if (retries < maxRetries) {
       retries++;
-      await new Promise((resolve) => setTimeout(resolve, retryDelayInMs));
+      const delay = retryDelayInMs * Math.pow(backoffFactor, retries);
+      await new Promise((resolve) => setTimeout(resolve, delay));
       return tryRequest();
     } else {
       console.error("Maximum retries reached");
@@ -936,10 +953,11 @@ var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVA
 
 // src/models/scallopCache.ts
 var ScallopCache = class {
-  constructor(suiKit, cacheOptions, tokenBucket) {
+  constructor(suiKit, walletAddress, cacheOptions, tokenBucket) {
     this.queryClient = new import_query_core.QueryClient(cacheOptions ?? DEFAULT_CACHE_OPTIONS);
     this._suiKit = suiKit;
     this.tokenBucket = tokenBucket ?? new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS);
+    this.walletAddress = walletAddress ?? suiKit.currentAddress();
   }
   get suiKit() {
     if (!this._suiKit) {
@@ -1029,7 +1047,7 @@ var ScallopCache = class {
    * @returns Promise<SuiObjectResponse>
    */
   async queryGetObject(objectId, options) {
-    const queryKey = ["getObject", objectId, this.suiKit.currentAddress()];
+    const queryKey = ["getObject", objectId, this.walletAddress];
     if (options) {
       queryKey.push(JSON.stringify(options));
     }
@@ -1051,13 +1069,15 @@ var ScallopCache = class {
    * @param objectIds
    * @returns Promise<SuiObjectData[]>
    */
-  async queryGetObjects(objectIds, options) {
+  async queryGetObjects(objectIds, options = {
+    showContent: true
+  }) {
     if (objectIds.length === 0)
       return [];
     const queryKey = [
       "getObjects",
       JSON.stringify(objectIds),
-      this.suiKit.currentAddress()
+      this.walletAddress
     ];
     if (options) {
       queryKey.push(JSON.stringify(options));
@@ -1930,6 +1950,7 @@ var ScallopAddress = class {
     const { id, auth, network } = params;
     this.cache = instance?.cache ?? new ScallopCache(
       instance?.suiKit ?? new import_sui_kit2.SuiKit({}),
+      void 0,
       DEFAULT_CACHE_OPTIONS
     );
     this._requestClient = import_axios.default.create({
@@ -2691,7 +2712,8 @@ var getObligations = async ({
       filter: {
         StructType: `${protocolObjectId}::obligation::ObligationKey`
       },
-      cursor: nextCursor
+      cursor: nextCursor,
+      limit: 10
     });
     if (!paginatedKeyObjectsResponse)
       break;
@@ -3005,10 +3027,10 @@ var getStakeAccounts = async ({
       owner,
       filter: { StructType: stakeAccountType },
       options: {
-        showContent: true,
-        showType: true
+        showContent: true
       },
-      cursor: nextCursor
+      cursor: nextCursor,
+      limit: 10
     });
     if (!paginatedStakeObjectsResponse)
       continue;
@@ -3041,7 +3063,10 @@ var getStakeAccounts = async ({
     {}
   );
   const stakeObjectIds = stakeObjectsResponse.map((ref) => ref?.data?.objectId).filter((id) => id !== void 0);
-  const stakeObjects = await utils.cache.queryGetObjects(stakeObjectIds);
+  const stakeObjects = await utils.cache.queryGetObjects(stakeObjectIds, {
+    showContent: true,
+    showType: true
+  });
   for (const stakeObject of stakeObjects) {
     const id = stakeObject.objectId;
     const type = stakeObject.type;
@@ -4027,7 +4052,8 @@ var getVescaKeys = async (utils, ownerAddress) => {
       filter: {
         StructType: veScaKeyType
       },
-      cursor: nextCursor
+      cursor: nextCursor,
+      limit: 10
     });
     if (!paginatedKeyObjectsResponse)
       continue;
@@ -4274,12 +4300,17 @@ var ScallopUtils = class {
       ...params
     };
     this.suiKit = instance?.suiKit ?? instance?.address?.cache._suiKit ?? new import_sui_kit4.SuiKit(params);
+    this.walletAddress = params.walletAddress ?? this.suiKit.currentAddress();
     if (instance?.address) {
       this.address = instance.address;
       this.cache = this.address.cache;
       this.suiKit = this.address.cache._suiKit;
     } else {
-      this.cache = new ScallopCache(this.suiKit, DEFAULT_CACHE_OPTIONS);
+      this.cache = new ScallopCache(
+        this.suiKit,
+        this.walletAddress,
+        DEFAULT_CACHE_OPTIONS
+      );
       this.address = instance?.address ?? new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
@@ -4492,7 +4523,7 @@ var ScallopUtils = class {
    * @param coinType
    * @param sender
    */
-  async mergeSimilarCoins(txBlock, dest, coinType, sender) {
+  async mergeSimilarCoins(txBlock, dest, coinType, sender = this.walletAddress) {
     try {
       const existingCoins = await this.selectCoins(
         Number.MAX_SAFE_INTEGER,
@@ -6295,7 +6326,7 @@ var import_sui_kit12 = require("@scallop-io/sui-kit");
 var ScallopIndexer = class {
   constructor(params, instance) {
     this.params = params;
-    this.cache = instance?.cache ?? new ScallopCache(new import_sui_kit12.SuiKit({}), DEFAULT_CACHE_OPTIONS);
+    this.cache = instance?.cache ?? new ScallopCache(new import_sui_kit12.SuiKit({}), void 0, DEFAULT_CACHE_OPTIONS);
     this._requestClient = import_axios2.default.create({
       baseURL: SDK_API_BASE_URL,
       headers: {
@@ -6558,12 +6589,19 @@ var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
     this.suiKit = instance?.suiKit ?? instance?.utils?.suiKit ?? new import_sui_kit13.SuiKit(params);
+    this.walletAddress = (0, import_utils23.normalizeSuiAddress)(
+      params.walletAddress || this.suiKit.currentAddress()
+    );
     if (instance?.utils) {
       this.utils = instance.utils;
       this.address = instance.utils.address;
       this.cache = this.address.cache;
     } else {
-      this.cache = new ScallopCache(this.suiKit, DEFAULT_CACHE_OPTIONS);
+      this.cache = new ScallopCache(
+        this.suiKit,
+        this.walletAddress,
+        DEFAULT_CACHE_OPTIONS
+      );
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
@@ -6578,9 +6616,6 @@ var ScallopQuery = class {
       });
     }
     this.indexer = instance?.indexer ?? new ScallopIndexer(this.params, { cache: this.cache });
-    this.walletAddress = (0, import_utils23.normalizeSuiAddress)(
-      params.walletAddress || this.suiKit.currentAddress()
-    );
   }
   /**
    * Request the scallop API to initialize data.
@@ -7036,7 +7071,11 @@ var ScallopBuilder = class {
       this.address = this.utils.address;
       this.cache = this.address.cache;
     } else {
-      this.cache = new ScallopCache(this.suiKit, DEFAULT_CACHE_OPTIONS);
+      this.cache = new ScallopCache(
+        this.suiKit,
+        this.walletAddress,
+        DEFAULT_CACHE_OPTIONS
+      );
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
@@ -7179,7 +7218,11 @@ var ScallopClient = class {
       this.address = this.utils.address;
       this.cache = this.address.cache;
     } else {
-      this.cache = new ScallopCache(this.suiKit, DEFAULT_CACHE_OPTIONS);
+      this.cache = new ScallopCache(
+        this.suiKit,
+        this.walletAddress,
+        DEFAULT_CACHE_OPTIONS
+      );
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
@@ -7696,7 +7739,7 @@ var ScallopClient = class {
    * Function to migrate all market coin in user wallet into sCoin
    * @returns Transaction response
    */
-  async migrateAllMarketCoin(sign = true) {
+  async migrateAllMarketCoin(includeStakePool = true, sign = true) {
     const txBlock = this.builder.createTxBlock();
     txBlock.setSender(this.walletAddress);
     const toTransfer = [];
@@ -7732,16 +7775,18 @@ var ScallopClient = class {
           );
           sCoins2.push(sCoin);
         }
-        if (SUPPORT_SPOOLS.includes(sCoinName)) {
-          try {
-            const sCoin = await txBlock.unstakeQuick(
-              Number.MAX_SAFE_INTEGER,
-              sCoinName
-            );
-            if (sCoin) {
-              sCoins2.push(sCoin);
+        if (includeStakePool) {
+          if (SUPPORT_SPOOLS.includes(sCoinName)) {
+            try {
+              const sCoin = await txBlock.unstakeQuick(
+                Number.MAX_SAFE_INTEGER,
+                sCoinName
+              );
+              if (sCoin) {
+                sCoins2.push(sCoin);
+              }
+            } catch (e) {
             }
-          } catch (e) {
           }
         }
         if (sCoins2.length > 0) {
@@ -7835,6 +7880,7 @@ var Scallop = class {
     this.suiKit = new import_sui_kit16.SuiKit(params);
     this.cache = new ScallopCache(
       this.suiKit,
+      params.walletAddress,
       cacheOptions ?? DEFAULT_CACHE_OPTIONS,
       tokenBucket ?? new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS)
     );