@scallop-io/sui-scallop-sdk 1.4.13 → 1.4.14-alpha.1

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 = 50;
+export declare const DEFAULT_INTERVAL_IN_MS = 250;

package/dist/index.js

@@ -371,12 +371,19 @@ var voloCoinIds = {
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55"
 };
 var sCoinIds = {
+  // prod values
+  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  // swusdc:
+  //   '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  // swusdt:
+  //   '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  // ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
+  ssui: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
+  swusdt: "0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
+  swusdc: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
+  ssca: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
   susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
   ssbeth: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
-  ssui: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
-  swusdc: "0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
-  swusdt: "0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
-  ssca: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
   scetus: "0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS",
   sweth: "0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
   safsui: "0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI",
@@ -1065,7 +1072,7 @@ var TEST_ADDRESSES = {
 
 // src/constants/tokenBucket.ts
 var DEFAULT_TOKENS_PER_INTERVAL = 10;
-var DEFAULT_INTERVAL_IN_MS = 50;
+var DEFAULT_INTERVAL_IN_MS = 250;
 
 // src/constants/vesca.ts
 var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
@@ -1441,7 +1448,7 @@ var parseOriginBorrowIncentivesPoolPointData = (originBorrowIncentivePoolPointDa
     createdAt: Number(originBorrowIncentivePoolPointData.created_at)
   };
 };
-var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
+var parseOriginBorrowIncentivePoolData = (utils, originBorrowIncentivePoolData) => {
   return {
     poolType: (0, import_utils.normalizeStructTag)(originBorrowIncentivePoolData.pool_type.name),
     minStakes: Number(originBorrowIncentivePoolData.min_stakes),
@@ -1450,12 +1457,9 @@ var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);
-        let name = (0, import_utils.parseStructTag)(
-          parsed.pointType
-        ).name.toLowerCase();
-        if (sCoinRawNameToName[name]) {
-          name = sCoinRawNameToName[name];
-        }
+        const name = utils.parseSCoinTypeNameToMarketCoinName(
+          (0, import_utils.parseStructTag)(parsed.pointType).name.toLowerCase()
+        );
         acc[name] = parsed;
         return acc;
       },
@@ -1669,7 +1673,7 @@ var TokenBucket = class {
     return false;
   }
 };
-var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 15, backoffFactor = 2) => {
+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)) {
@@ -1748,6 +1752,13 @@ var ScallopCache = class {
       })
     );
   }
+  retryFn(errCount, err) {
+    if (err.status === 429)
+      return true;
+    if (errCount >= 5)
+      return false;
+    return false;
+  }
   /**
    * @description Provides cache for inspectTxn of the SuiKit.
    * @param QueryInspectTxnParams
@@ -1762,7 +1773,7 @@ var ScallopCache = class {
     const txBlock = new import_sui_kit.SuiTxBlock();
     txBlock.moveCall(queryTarget, args, typeArgs);
     const query = await this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: 1e3,
       queryKey: queryKeys.rpc.getInspectTxn(queryTarget, args, typeArgs),
       queryFn: async () => {
@@ -1782,7 +1793,7 @@ var ScallopCache = class {
    */
   async queryGetObject(objectId, options) {
     return this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: 1e3,
       queryKey: queryKeys.rpc.getObject(objectId, this.walletAddress, options),
       queryFn: async () => {
@@ -1807,7 +1818,7 @@ var ScallopCache = class {
     if (objectIds.length === 0)
       return [];
     return this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: 1e3,
       queryKey: queryKeys.rpc.getObjects(
         objectIds,
@@ -1829,7 +1840,7 @@ var ScallopCache = class {
    */
   async queryGetOwnedObjects(input) {
     return this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: 1e3,
       queryKey: queryKeys.rpc.getOwnedObjects(input),
       queryFn: async () => {
@@ -1842,7 +1853,7 @@ var ScallopCache = class {
   }
   async queryGetDynamicFields(input) {
     return this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: 1e3,
       queryKey: queryKeys.rpc.getDynamicFields(input),
       queryFn: async () => {
@@ -1855,7 +1866,7 @@ var ScallopCache = class {
   }
   async queryGetDynamicFieldObject(input) {
     return this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: (attemptIndex) => Math.min(1e3 * attemptIndex, 8e3),
       queryKey: queryKeys.rpc.getDynamicFieldObject(input),
       queryFn: async () => {
@@ -1868,7 +1879,7 @@ var ScallopCache = class {
   }
   async queryGetAllCoinBalances(owner) {
     return this.queryClient.fetchQuery({
-      retry: 5,
+      retry: this.retryFn,
       retryDelay: 1e3,
       queryKey: queryKeys.rpc.getAllCoinBalances(owner),
       queryFn: async () => {
@@ -2612,7 +2623,10 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
   );
   for (const pool of borrowIncentivePoolsQueryData?.incentive_pools ?? []) {
     const borrowIncentivePoolPoints = {};
-    const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(pool);
+    const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(
+      query.utils,
+      pool
+    );
     const poolCoinType = (0, import_utils3.normalizeStructTag)(pool.pool_type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(
       poolCoinType
@@ -2626,12 +2640,9 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
       parsedBorrowIncentivePoolData.poolPoints
     )) {
       const rewardCoinType = poolPoint.pointType;
-      let rewardCoinName = query.utils.parseCoinNameFromType(
+      const rewardCoinName = query.utils.parseCoinNameFromType(
         rewardCoinType
       );
-      if (sCoinRawNameToName[rewardCoinName]) {
-        rewardCoinName = sCoinRawNameToName[rewardCoinName];
-      }
       const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
       const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
       const symbol = query.utils.parseSymbol(rewardCoinName);
@@ -2779,7 +2790,7 @@ var supplyLimitZod = import_zod.z.object({
     value: import_zod.z.string()
   })
 });
-var supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`;
+var supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 var getSupplyLimit = async (utils, poolName) => {
   try {
     const poolCoinType = utils.parseCoinType(poolName).slice(2);
@@ -2819,7 +2830,7 @@ var isolatedAssetZod = import_zod2.z.object({
     value: import_zod2.z.boolean()
   })
 });
-var isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`;
+var isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
 var getIsolatedAssets = async (address) => {
   try {
     const marketObject = address.get("core.market");
@@ -2899,7 +2910,7 @@ var borrowLimitZod = import_zod3.z.object({
     value: import_zod3.z.string()
   })
 });
-var borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`;
+var borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
 var getBorrowLimit = async (utils, poolName) => {
   try {
     const poolCoinType = utils.parseCoinType(poolName).slice(2);
@@ -3941,7 +3952,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
       const rewards = [];
       Object.entries(borrowIncentiveAccount.pointList).forEach(
         ([key, accountPoint]) => {
-          const poolPoint = borrowIncentivePool.points[key];
+          const poolPoint = borrowIncentivePool.points[query.utils.parseSCoinTypeNameToMarketCoinName(key)];
           if (accountPoint && poolPoint) {
             let availableClaimAmount = (0, import_bignumber5.default)(0);
             let availableClaimCoin = (0, import_bignumber5.default)(0);
@@ -4973,13 +4984,14 @@ var ScallopUtils = class {
     }
   }
   /**
-   * Convert sCoin name to coin name.
+   * Convert sCoin name to market coin name.
    * This function will parse new sCoin name `scallop_...` to its old market coin name which is shorter
    * e.g: `scallop_sui -> ssui
+   * if no `scallop_...` is encountered, return coinName
    * @return sCoin name
    */
-  parseCoinNameFromSCoinName(coinName) {
-    return sCoinRawNameToName[coinName];
+  parseSCoinTypeNameToMarketCoinName(coinName) {
+    return sCoinRawNameToName[coinName] ?? coinName;
   }
   /**
    * Convert sCoin name into sCoin type
@@ -5028,6 +5040,9 @@ var ScallopUtils = class {
   }
   parseCoinNameFromType(coinType) {
     coinType = (0, import_utils10.normalizeStructTag)(coinType);
+    if (sCoinTypeToName[coinType]) {
+      return sCoinTypeToName[coinType];
+    }
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");