@scallop-io/sui-scallop-sdk 1.4.3-rc.1 → 1.4.4

package/dist/index.mjs

@@ -4128,7 +4128,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 +4136,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 +4156,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 +4167,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 +4371,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)