@scallop-io/sui-scallop-sdk 1.4.3 → 1.4.5

package/dist/index.mjs

@@ -24,6 +24,7 @@ var COIN_GECKGO_IDS = {
   hasui: "sui",
   vsui: "sui",
   sca: "scallop-2",
+  fdusd: "first-digital-usd",
   deep: "deepbook",
   fud: "fud-the-pug"
 };
@@ -56,7 +57,8 @@ var SUPPORT_POOLS = [
   "vsui",
   "sca",
   "fud",
-  "deep"
+  "deep",
+  "fdusd"
 ];
 var SUPPORT_COLLATERALS = [
   "usdc",
@@ -74,7 +76,8 @@ var SUPPORT_COLLATERALS = [
   "afsui",
   "hasui",
   "vsui",
-  "sca"
+  "sca",
+  "fdusd"
 ];
 var SUPPORT_SPOOLS = [
   "susdc",
@@ -102,7 +105,8 @@ var SUPPORT_SCOIN = [
   "swsol",
   "swbtc",
   "sdeep",
-  "sfud"
+  "sfud",
+  "sfdusd"
 ];
 var SUPPORT_SUI_BRIDGE = ["sbeth"];
 var SUPPORT_WORMHOLE = [
@@ -151,6 +155,7 @@ var coinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
+  fdusd: 6,
   deep: 6,
   fud: 5,
   susdc: 6,
@@ -167,6 +172,7 @@ var coinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
+  sfdusd: 6,
   sdeep: 6,
   sfud: 5
 };
@@ -185,6 +191,7 @@ var assetCoins = {
   hasui: "hasui",
   vsui: "vsui",
   sca: "sca",
+  fdusd: "fdusd",
   deep: "deep",
   fud: "fud"
 };
@@ -203,6 +210,7 @@ var marketCoins = {
   shasui: "shasui",
   svsui: "svsui",
   ssca: "ssca",
+  sfdusd: "sfdusd",
   sdeep: "sdeep",
   sfud: "sfud"
 };
@@ -220,6 +228,7 @@ var sCoins = {
   ssca: "ssca",
   swsol: "swsol",
   swbtc: "swbtc",
+  sfdusd: "sfdusd",
   sfud: "sfud",
   sdeep: "sdeep"
 };
@@ -263,6 +272,7 @@ var coinIds = {
   hasui: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
   sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
+  fdusd: "0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a",
   // isolated assets
   deep: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270",
   fud: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1"
@@ -292,6 +302,7 @@ var sCoinIds = {
   svsui: "0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI",
   swsol: "0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL",
   swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC",
+  sfdusd: "0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD",
   sdeep: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
   sfud: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD"
 };
@@ -567,6 +578,21 @@ var POOL_ADDRESSES = {
     spoolReward: void 0,
     sCoinTreasury: "0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88",
     coinDecimalId: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0"
+  },
+  fdusd: {
+    lendingPoolAddress: "0x4f46051a01f05c3ad9aecf29a771aad5c884e1a1888e08d7709085e3a095bc9c",
+    collateralPoolAddress: "0x4f6647a9afcfdb62bb9b27e4d1cb7bd7130aca1b4f13fa7164453c869c1681ae",
+    borrowDynamic: "0x4ddcf19b6290a8b048ecb314b14ef7f52c1c5b9ddc9259a2a242cd91d681a085",
+    interestModel: "0xb57a33706b29d2d253c74c1c0869e6e20da99036338d2b0b7235ab41621ee9dd",
+    riskModel: "0xd65fb21758dc1e6184940a1a27efb13228d7cf5e19f6dcca06cc2d996af4a6b9",
+    borrowFeeKey: "0xafe673a27747b063fa918d2dfe47794e44af553737ac562c2a63186539a07f45",
+    supplyLimitKey: "0x730e0785ba056a7a95f4a6959371a598d7fe782e81c40785c79982ced4cf4e35",
+    borrowLimitKey: "0x1630c6954918a06fe56312afb8958366c5ed7af653dae0e32c09d088da38577e",
+    isolatedAssetKey: void 0,
+    spool: void 0,
+    spoolReward: void 0,
+    sCoinTreasury: "0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0",
+    coinDecimalId: "0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7"
   }
 };
 
@@ -590,6 +616,7 @@ var PYTH_FEED_IDS = {
   hasui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   vsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
+  fdusd: "0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979",
   deep: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
   fud: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75"
 };
@@ -899,6 +926,19 @@ var TEST_ADDRESSES = {
           }
         }
       },
+      fdusd: {
+        id: "0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a",
+        metaData: "0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979",
+            feedObject: "0x5f6583b2b0fe1ecf94aaffeaab8a838794693960cea48c0da282d5f4a24be027"
+          }
+        }
+      },
       deep: {
         id: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270",
         metaData: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0",
@@ -1144,6 +1184,10 @@ var TEST_ADDRESSES = {
         coinType: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
         treasury: "0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed"
       },
+      sfdusd: {
+        coinType: "0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD",
+        treasury: "0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0"
+      },
       sdeep: {
         coinType: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
         treasury: "0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88"
@@ -1382,8 +1426,8 @@ var calculateMarketPoolData = (utils, parsedMarketPoolData) => {
     supplyApy: utils.parseAprToApy(supplyApr.toNumber()),
     conversionRate: conversionRate.toNumber(),
     isIsolated: parsedMarketPoolData.isIsolated,
-    maxSupplyCoin: BigNumber(parsedMarketPoolData.supplyLimit).shiftedBy(coinDecimal).toNumber(),
-    maxBorrowCoin: BigNumber(parsedMarketPoolData.borrowLimit).shiftedBy(coinDecimal).toNumber()
+    maxSupplyCoin: BigNumber(parsedMarketPoolData.supplyLimit).shiftedBy(-coinDecimal).toNumber(),
+    maxBorrowCoin: BigNumber(parsedMarketPoolData.borrowLimit).shiftedBy(-coinDecimal).toNumber()
   };
 };
 var parseOriginMarketCollateralData = (originMarketCollateralData) => {
@@ -3368,28 +3412,60 @@ var queryRequiredMarketObjects = async (query, poolCoinNames) => {
       tasks.map((task) => task.isolatedAssetKey).filter((t) => !!t)
     )
   ]);
-  const mapObjects = (tasks2, fetchedObjects) => {
+  const mapObjects = (tasks2, fetchedObjects, keyValue) => {
     const resultMap = {};
-    let fetchedIndex = 0;
+    const fetchedObjectMap = fetchedObjects.reduce(
+      (acc, obj) => {
+        acc[obj.objectId] = obj;
+        return acc;
+      },
+      {}
+    );
     for (const task of tasks2) {
-      const key = task[Object.keys(task)[1]];
-      if (key) {
-        resultMap[task.poolCoinName] = fetchedObjects[fetchedIndex];
-        fetchedIndex++;
+      if (task[keyValue]) {
+        resultMap[task.poolCoinName] = fetchedObjectMap[task[keyValue]];
       }
     }
     return resultMap;
   };
-  const balanceSheetMap = mapObjects(tasks, balanceSheetObjects);
-  const collateralStatMap = mapObjects(tasks, collateralStatObjects);
-  const borrowDynamicMap = mapObjects(tasks, borrowDynamicObjects);
-  const interestModelMap = mapObjects(tasks, interestModelObjects);
-  const riskModelMap = mapObjects(tasks, riskModelObjects);
-  const borrowFeeMap = mapObjects(tasks, borrowFeeObjects);
-  const supplyLimitMap = mapObjects(tasks, supplyLimitObjects);
-  const borrowLimitMap = mapObjects(tasks, borrowLimitObjects);
-  const isolatedAssetMap = mapObjects(tasks, isolatedAssetObjects);
-  return poolCoinNames.reduce(
+  const balanceSheetMap = mapObjects(
+    tasks,
+    balanceSheetObjects,
+    "balanceSheet"
+  );
+  const collateralStatMap = mapObjects(
+    tasks,
+    collateralStatObjects,
+    "collateralStat"
+  );
+  const borrowDynamicMap = mapObjects(
+    tasks,
+    borrowDynamicObjects,
+    "borrowDynamic"
+  );
+  const interestModelMap = mapObjects(
+    tasks,
+    interestModelObjects,
+    "interestModel"
+  );
+  const riskModelMap = mapObjects(tasks, riskModelObjects, "riskModel");
+  const borrowFeeMap = mapObjects(tasks, borrowFeeObjects, "borrowFeeKey");
+  const supplyLimitMap = mapObjects(
+    tasks,
+    supplyLimitObjects,
+    "supplyLimitKey"
+  );
+  const borrowLimitMap = mapObjects(
+    tasks,
+    borrowLimitObjects,
+    "borrowLimitKey"
+  );
+  const isolatedAssetMap = mapObjects(
+    tasks,
+    isolatedAssetObjects,
+    "isolatedAssetKey"
+  );
+  const result = poolCoinNames.reduce(
     (acc, name) => {
       acc[name] = {
         balanceSheet: balanceSheetMap[name],
@@ -3406,6 +3482,7 @@ var queryRequiredMarketObjects = async (query, poolCoinNames) => {
     },
     {}
   );
+  return result;
 };
 var getMarketPools = async (query, poolCoinNames, indexer = false, coinPrices) => {
   coinPrices = coinPrices ?? await query.utils.getCoinPrices();
@@ -4128,7 +4205,7 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   return lending;
 };
 var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
-  const market = await query.queryMarket({ indexer });
+  const market = await query.getMarketPools(void 0, { indexer });
   const coinPrices = await query.getAllCoinPrices({
     marketPools: market.pools
   });
@@ -4136,12 +4213,16 @@ var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
     query.getCoinAmounts(void 0, ownerAddress),
     query.getObligations(ownerAddress)
   ]);
+  const obligationObjects = await queryMultipleObjects(
+    query.cache,
+    obligations.map((obligation) => obligation.id)
+  );
   const obligationAccounts = {};
   await Promise.allSettled(
-    obligations.map(async (obligation) => {
+    obligations.map(async (obligation, idx) => {
       obligationAccounts[obligation.keyId] = await getObligationAccount(
         query,
-        obligation.id,
+        obligationObjects[idx] ?? obligation.id,
         ownerAddress,
         indexer,
         market,
@@ -4152,7 +4233,7 @@ var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
   );
   return obligationAccounts;
 };
-var getObligationAccount = async (query, obligationId, ownerAddress, indexer = false, market, coinPrices, coinAmounts) => {
+var getObligationAccount = async (query, obligation, ownerAddress, indexer = false, market, coinPrices, coinAmounts) => {
   const coinNames = Array.from(
     /* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
   );
@@ -4163,13 +4244,13 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools: market.pools });
   coinAmounts = coinAmounts ?? await query.getCoinAmounts(coinNames, ownerAddress);
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] = await Promise.all([
-    query.queryObligation(obligationId),
+    query.queryObligation(obligation),
     query.getBorrowIncentivePools(void 0, {
       coinPrices,
       indexer,
       marketPools: market.pools
     }),
-    query.getBorrowIncentiveAccounts(obligationId)
+    query.getBorrowIncentiveAccounts(obligation)
   ]);
   const collaterals = {};
   const debts = {};
@@ -4367,7 +4448,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   const requiredCollateralValue = totalBorrowedValueWithWeight.isGreaterThan(0) ? totalRequiredCollateralValue : BigNumber5(0);
   const unhealthyCollateralValue = totalBorrowedValueWithWeight.minus(requiredCollateralValue).isGreaterThan(0) ? totalBorrowedValueWithWeight.minus(requiredCollateralValue) : BigNumber5(0);
   const obligationAccount = {
-    obligationId,
+    obligationId: typeof obligation === "string" ? obligation : obligation.objectId,
     // Deposited collateral value (collateral balance)
     totalDepositedValue: totalDepositedValue.toNumber(),
     // Borrowed debt value (liabilities balance)
@@ -4718,21 +4799,29 @@ var queryRequiredSpoolObjects = async (query, stakePoolCoinNames) => {
       tasks.map((task) => task.sCoinTreasury).filter((t) => !!t)
     )
   ]);
-  const mapObjects = (tasks2, fetchedObjects) => {
+  const mapObjects = (tasks2, fetchedObjects, keyValue) => {
     const resultMap = {};
-    let fetchedIndex = 0;
+    const fetchedObjectMap = fetchedObjects.reduce(
+      (acc, obj) => {
+        acc[obj.objectId] = obj;
+        return acc;
+      },
+      {}
+    );
     for (const task of tasks2) {
-      const key = task[Object.keys(task)[1]];
-      if (key) {
-        resultMap[task.poolCoinName] = fetchedObjects[fetchedIndex];
-        fetchedIndex++;
+      if (task[keyValue]) {
+        resultMap[task.poolCoinName] = fetchedObjectMap[task[keyValue]];
       }
     }
     return resultMap;
   };
-  const spoolMap = mapObjects(tasks, spoolObjects);
-  const spoolRewardMap = mapObjects(tasks, spoolRewardObjects);
-  const sCoinTreasuryMap = mapObjects(tasks, sCoinTreasuryObjects);
+  const spoolMap = mapObjects(tasks, spoolObjects, "spool");
+  const spoolRewardMap = mapObjects(tasks, spoolRewardObjects, "spoolReward");
+  const sCoinTreasuryMap = mapObjects(
+    tasks,
+    sCoinTreasuryObjects,
+    "sCoinTreasury"
+  );
   return stakePoolCoinNames.reduce(
     (acc, name) => {
       acc[name] = {