@scallop-io/sui-scallop-sdk 1.4.1-alpha.1 → 1.4.11

package/dist/index.mjs

@@ -23,10 +23,9 @@ var COIN_GECKGO_IDS = {
   afsui: "sui",
   hasui: "sui",
   vsui: "sui",
-  sca: "scallop-2"
-  // TODO: enable for production
-  // deep: 'deepbook',
-  // fud: 'fud-the-pug',
+  sca: "scallop-2",
+  deep: "deepbook",
+  fud: "fud-the-pug"
 };
 
 // src/constants/common.ts
@@ -55,10 +54,9 @@ var SUPPORT_POOLS = [
   "afsui",
   "hasui",
   "vsui",
-  "sca"
-  // TODO: enable for production
-  // 'fud',
-  // 'deep',
+  "sca",
+  "fud",
+  "deep"
 ];
 var SUPPORT_COLLATERALS = [
   "usdc",
@@ -102,10 +100,9 @@ var SUPPORT_SCOIN = [
   "ssca",
   "scetus",
   "swsol",
-  "swbtc"
-  // TODO: enable for production
-  // 'sdeep',
-  // 'sfud',
+  "swbtc",
+  "sdeep",
+  "sfud"
 ];
 var SUPPORT_SUI_BRIDGE = ["sbeth"];
 var SUPPORT_WORMHOLE = [
@@ -165,9 +162,8 @@ var coinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
-  // TODO: enable for production
-  // deep: 6,
-  // fud: 5,
+  deep: 6,
+  fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -181,10 +177,9 @@ var coinDecimals = {
   safsui: 9,
   shasui: 9,
   svsui: 9,
-  ssca: 9
-  // TODO: enable for production
-  // sdeep: 6,
-  // sfud: 5,
+  ssca: 9,
+  sdeep: 6,
+  sfud: 5
 };
 var assetCoins = {
   usdc: "usdc",
@@ -200,10 +195,9 @@ var assetCoins = {
   afsui: "afsui",
   hasui: "hasui",
   vsui: "vsui",
-  sca: "sca"
-  // TODO: enable for production
-  // deep: 'deep',
-  // fud: 'fud',
+  sca: "sca",
+  deep: "deep",
+  fud: "fud"
 };
 var marketCoins = {
   susdc: "susdc",
@@ -219,10 +213,9 @@ var marketCoins = {
   safsui: "safsui",
   shasui: "shasui",
   svsui: "svsui",
-  ssca: "ssca"
-  // TODO: enable for production
-  // sdeep: 'sdeep',
-  // sfud: 'sfud',
+  ssca: "ssca",
+  sdeep: "sdeep",
+  sfud: "sfud"
 };
 var sCoins = {
   susdc: "susdc",
@@ -237,10 +230,9 @@ var sCoins = {
   svsui: "svsui",
   ssca: "ssca",
   swsol: "swsol",
-  swbtc: "swbtc"
-  // TODO: enable for production
-  // sfud: 'sfud',
-  // sdeep: 'sdeep',
+  swbtc: "swbtc",
+  sfud: "sfud",
+  sdeep: "sdeep"
 };
 var stakeMarketCoins = {
   susdc: "susdc",
@@ -281,10 +273,10 @@ var coinIds = {
   afsui: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc",
   hasui: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
-  sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6"
+  sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
   // isolated assets
-  // deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
-  // fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
+  deep: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270",
+  fud: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1"
 };
 var wormholeCoinIds = {
   weth: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
@@ -300,28 +292,19 @@ var voloCoinIds = {
 var sCoinIds = {
   susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
   ssbeth: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
-  // 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',
-  // test values
-  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",
+  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",
   shasui: "0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI",
   svsui: "0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI",
   swsol: "0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL",
-  swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC"
-  // sdeep:
-  //   '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
-  // sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
+  swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC",
+  sdeep: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
+  sfud: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD"
 };
 var sCoinTypeToName = Object.entries(sCoinIds).reduce(
   (acc, [coinName, coinType]) => {
@@ -411,16 +394,13 @@ var POOL_ADDRESSES = {
   sca: {
     lendingPoolAddress: "0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7",
     collateralPoolAddress: "0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31"
+  },
+  fud: {
+    lendingPoolAddress: "0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb"
+  },
+  deep: {
+    lendingPoolAddress: "0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03"
   }
-  // TODO: enable for production
-  // fud: {
-  //   lendingPoolAddress:
-  //     '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
-  // },
-  // deep: {
-  //   lendingPoolAddress:
-  //     '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
-  // },
 };
 
 // src/constants/pyth.ts
@@ -442,10 +422,9 @@ var PYTH_FEED_IDS = {
   afsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   hasui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   vsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc"
-  // TODO: enable for production
-  // deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
-  // fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
+  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
+  deep: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
+  fud: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75"
 };
 
 // src/constants/queryKeys.ts
@@ -745,6 +724,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: {
@@ -964,14 +969,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;
@@ -1359,9 +1372,12 @@ var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);
-        const name = parseStructTag(
+        let name = parseStructTag(
           parsed.pointType
         ).name.toLowerCase();
+        if (sCoinRawNameToName[name]) {
+          name = sCoinRawNameToName[name];
+        }
         acc[name] = parsed;
         return acc;
       },
@@ -1560,10 +1576,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) {
@@ -1579,26 +1595,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 {
@@ -1682,11 +1684,13 @@ var ScallopCache = class {
     const txBlock = new 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)
         );
       }
     });
@@ -1700,11 +1704,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
           })
@@ -1723,6 +1729,8 @@ var ScallopCache = class {
     if (objectIds.length === 0)
       return [];
     return this.queryClient.fetchQuery({
+      retry: 5,
+      retryDelay: 1e3,
       queryKey: queryKeys.rpc.getObjects(
         objectIds,
         this.walletAddress,
@@ -1731,7 +1739,7 @@ var ScallopCache = class {
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.suiKit.getObjects(objectIds, options)
+          async () => await this.suiKit.getObjects(objectIds, options)
         );
       }
     });
@@ -1743,28 +1751,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(
@@ -1776,11 +1790,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 {};
@@ -2493,7 +2509,7 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
   ...SUPPORT_BORROW_INCENTIVE_POOLS
 ], indexer = false, marketPools, coinPrices) => {
   const borrowIncentivePools = {};
-  marketPools = marketPools ?? await query.getMarketPools(void 0, { indexer, coinPrices });
+  marketPools = marketPools ?? await query.getMarketPools(void 0, { coinPrices, indexer });
   coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools });
   if (indexer) {
     const borrowIncentivePoolsIndexer = await query.indexer.getBorrowIncentivePools();
@@ -2685,7 +2701,7 @@ var supplyLimitZod = zod.object({
     value: zod.string()
   })
 });
-var supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
+var supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`;
 var getSupplyLimit = async (utils, poolName) => {
   try {
     const poolCoinType = utils.parseCoinType(poolName).slice(2);
@@ -2725,7 +2741,7 @@ var isolatedAssetZod = zod2.object({
     value: zod2.boolean()
   })
 });
-var isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
+var isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`;
 var getIsolatedAssets = async (address) => {
   try {
     const marketObject = address.get("core.market");
@@ -2805,7 +2821,7 @@ var borrowLimitZod = zod3.object({
     value: zod3.string()
   })
 });
-var borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
+var borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`;
 var getBorrowLimit = async (utils, poolName) => {
   try {
     const poolCoinType = utils.parseCoinType(poolName).slice(2);
@@ -3705,7 +3721,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     query.queryObligation(obligationId),
     query.getBorrowIncentivePools(void 0, {
       coinPrices,
-      indexer
+      indexer,
+      marketPools: market.pools
     }),
     query.getBorrowIncentiveAccounts(obligationId)
   ]);
@@ -5099,7 +5116,7 @@ var ScallopUtils = class {
       );
       const priceIds = priceIdPairs.map(([_2, priceId]) => priceId);
       const pythConnection = new SuiPriceServiceConnection(endpoint, {
-        timeout: 2e3
+        timeout: 4e3
       });
       try {
         const feeds = await this.cache.queryClient.fetchQuery({