@scallop-io/sui-scallop-sdk 1.4.1 → 1.4.12

package/dist/constants/tokenBucket.d.ts

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

package/dist/index.js

@@ -816,6 +816,32 @@ var TEST_ADDRESSES = {
             feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
           }
         }
+      },
+      deep: {
+        id: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270",
+        metaData: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
+            feedObject: "0x8c7f3a322b94cc69db2a2ac575cbd94bf5766113324c3a3eceac91e3e88a51ed"
+          }
+        }
+      },
+      fud: {
+        id: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1",
+        metaData: "0x01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75",
+            feedObject: "0x4531c3ed0d22f21f5fce882905372006c9aafa30f01db03b789e95a6c50de7b2"
+          }
+        }
       }
     },
     oracles: {
@@ -1035,14 +1061,22 @@ var TEST_ADDRESSES = {
       ssbeth: {
         coinType: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
         treasury: "0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed"
+      },
+      sdeep: {
+        coinType: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
+        treasury: "0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88"
+      },
+      sfud: {
+        coinType: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD",
+        treasury: "0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867"
       }
     }
   }
 };
 
 // src/constants/tokenBucket.ts
-var DEFAULT_TOKENS_PER_INTERVAL = 50;
-var DEFAULT_INTERVAL_IN_MS = 100;
+var DEFAULT_TOKENS_PER_INTERVAL = 10;
+var DEFAULT_INTERVAL_IN_MS = 50;
 
 // src/constants/vesca.ts
 var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
@@ -1427,9 +1461,12 @@ var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);
-        const name = (0, import_utils.parseStructTag)(
+        let name = (0, import_utils.parseStructTag)(
           parsed.pointType
         ).name.toLowerCase();
+        if (sCoinRawNameToName[name]) {
+          name = sCoinRawNameToName[name];
+        }
         acc[name] = parsed;
         return acc;
       },
@@ -1628,10 +1665,10 @@ var TokenBucket = class {
   refill() {
     const now = Date.now();
     const elapsed = now - this.lastRefill;
-    if (elapsed > this.interval) {
+    if (elapsed >= this.interval) {
       const tokensToAdd = Math.floor(elapsed / this.interval) * this.tokensPerInterval;
       this.tokens = Math.min(this.tokens + tokensToAdd, this.tokensPerInterval);
-      this.lastRefill = now;
+      this.lastRefill += Math.floor(elapsed / this.interval) * this.interval;
     }
   }
   removeTokens(count) {
@@ -1647,26 +1684,12 @@ var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVA
   let retries = 0;
   const tryRequest = async () => {
     if (tokenBucket.removeTokens(1)) {
-      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.message);
-          return null;
-        }
-      }
+      const result = await fn();
+      return result;
     } else if (retries < maxRetries) {
       retries++;
       const delay = retryDelayInMs * Math.pow(backoffFactor, retries);
+      console.error(`Rate limit exceeded, retrying in ${delay} ms`);
       await new Promise((resolve) => setTimeout(resolve, delay));
       return tryRequest();
     } else {
@@ -1750,11 +1773,13 @@ var ScallopCache = class {
     const txBlock = new import_sui_kit.SuiTxBlock();
     txBlock.moveCall(queryTarget, args, typeArgs);
     const query = await this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getInspectTxn(queryTarget, args, typeArgs),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.suiKit.inspectTxn(txBlock)
+          async () => await this.suiKit.inspectTxn(txBlock)
         );
       }
     });
@@ -1768,11 +1793,13 @@ var ScallopCache = class {
    */
   async queryGetObject(objectId, options) {
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getObject(objectId, this.walletAddress, options),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.client.getObject({
+          async () => await this.client.getObject({
             id: objectId,
             options
           })
@@ -1791,6 +1818,8 @@ var ScallopCache = class {
     if (objectIds.length === 0)
       return [];
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getObjects(
         objectIds,
         this.walletAddress,
@@ -1799,7 +1828,7 @@ var ScallopCache = class {
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.suiKit.getObjects(objectIds, options)
+          async () => await this.suiKit.getObjects(objectIds, options)
         );
       }
     });
@@ -1811,28 +1840,34 @@ var ScallopCache = class {
    */
   async queryGetOwnedObjects(input) {
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getOwnedObjects(input),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.client.getOwnedObjects(input)
+          async () => await this.client.getOwnedObjects(input)
         );
       }
     });
   }
   async queryGetDynamicFields(input) {
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getDynamicFields(input),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.client.getDynamicFields(input)
+          async () => await this.client.getDynamicFields(input)
         );
       }
     });
   }
   async queryGetDynamicFieldObject(input) {
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: (attemptIndex) => Math.min(1e3 * attemptIndex, 8e3),
       queryKey: queryKeys.rpc.getDynamicFieldObject(input),
       queryFn: async () => {
         return await callWithRateLimit(
@@ -1844,11 +1879,13 @@ var ScallopCache = class {
   }
   async queryGetAllCoinBalances(owner) {
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getAllCoinBalances(owner),
       queryFn: async () => {
         const allBalances = await callWithRateLimit(
           this.tokenBucket,
-          () => this.client.getAllBalances({ owner })
+          async () => await this.client.getAllBalances({ owner })
         );
         if (!allBalances)
           return {};
@@ -3763,17 +3800,21 @@ var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
   return obligationAccounts;
 };
 var getObligationAccount = async (query, obligationId, ownerAddress, indexer = false, market, coinPrices, coinAmounts) => {
+  const coinNames = Array.from(
+    /* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
+  );
   const collateralAssetCoinNames = [
     ...SUPPORT_COLLATERALS
   ];
   market = market ?? await query.queryMarket({ indexer });
   coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools: market.pools });
-  coinAmounts = coinAmounts || await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress);
+  coinAmounts = coinAmounts || await query.getCoinAmounts(coinNames, ownerAddress);
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] = await Promise.all([
     query.queryObligation(obligationId),
     query.getBorrowIncentivePools(void 0, {
       coinPrices,
-      indexer
+      indexer,
+      marketPools: market.pools
     }),
     query.getBorrowIncentiveAccounts(obligationId)
   ]);
@@ -5167,7 +5208,7 @@ var ScallopUtils = class {
       );
       const priceIds = priceIdPairs.map(([_2, priceId]) => priceId);
       const pythConnection = new import_pyth_sui_js.SuiPriceServiceConnection(endpoint, {
-        timeout: 2e3
+        timeout: 4e3
       });
       try {
         const feeds = await this.cache.queryClient.fetchQuery({