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

package/dist/models/scallopQuery.d.ts

@@ -1,10 +1,11 @@
-import { SuiKit } from '@scallop-io/sui-kit';
+import { SuiKit, SuiObjectArg } from '@scallop-io/sui-kit';
 import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams, MarketPool, CoinPrices, MarketPools } from '../types';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
 import { SuiObjectData } from '@mysten/sui/client';
+import { SuiObjectRef } from '@mysten/sui/client';
 /**
  * @description
  * It provides methods for getting on-chain data from the Scallop contract.
@@ -124,7 +125,7 @@ export declare class ScallopQuery {
      * @param obligationId - The obligation id.
      * @return Obligation data.
      */
-    queryObligation(obligationId: string): Promise<import("../types").ObligationQueryInterface | undefined>;
+    queryObligation(obligationId: string | SuiObjectArg): Promise<import("../types").ObligationQueryInterface | undefined>;
     /**
      * Get all asset coin amounts.
      *
@@ -320,7 +321,7 @@ export declare class ScallopQuery {
      * @param ownerAddress - The owner address.
      * @return Borrow incentive accounts data.
      */
-    getBorrowIncentiveAccounts(obligationId: string, coinNames?: SupportBorrowIncentiveCoins[]): Promise<{
+    getBorrowIncentiveAccounts(obligationId: string | SuiObjectRef, coinNames?: SupportBorrowIncentiveCoins[]): Promise<{
         usdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         sbeth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -1,5 +1,6 @@
 import type { ScallopAddress, ScallopQuery, ScallopUtils } from '../models';
 import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool, CoinPrices, MarketPools } from '../types';
+import { SuiObjectRef } from '@mysten/sui/client';
 /**
  * Query borrow incentive pools data using moveCall
  * @param address
@@ -41,7 +42,7 @@ export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncent
  */
 export declare const queryBorrowIncentiveAccounts: ({ utils, }: {
     utils: ScallopUtils;
-}, obligationId: string, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[]) => Promise<{
+}, obligationId: string | SuiObjectRef, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[]) => Promise<{
     usdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     sbeth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;

package/dist/queries/portfolioQuery.d.ts

@@ -1,5 +1,6 @@
 import type { ScallopQuery } from '../models';
 import type { Market, SupportPoolCoins, MarketPool, Spool, StakeAccount, Lending, ObligationAccount, CoinAmounts, CoinPrices, TotalValueLocked } from '../types';
+import { SuiObjectRef } from '@mysten/sui/client';
 /**
  * Get user lending infomation for specific pools.
  *
@@ -60,11 +61,11 @@ export declare const getObligationAccounts: (query: ScallopQuery, ownerAddress?:
  * Get obligation account data.
  *
  * @param query - The Scallop query instance.
- * @param obligationId - The obligation id.
+ * @param obligation - The obligation id.
  * @param indexer - Whether to use indexer.
  * @return Obligation account data.
  */
-export declare const getObligationAccount: (query: ScallopQuery, obligationId: string, ownerAddress?: string, indexer?: boolean, market?: Market, coinPrices?: CoinPrices, coinAmounts?: CoinAmounts) => Promise<ObligationAccount>;
+export declare const getObligationAccount: (query: ScallopQuery, obligation: string | SuiObjectRef, ownerAddress?: string, indexer?: boolean, market?: Market, coinPrices?: CoinPrices, coinAmounts?: CoinAmounts) => Promise<ObligationAccount>;
 /**
  * Get total value locked data.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.4.3-rc.1",
+  "version": "1.4.4",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopQuery.ts

@@ -1,4 +1,4 @@
-import { SuiKit } from '@scallop-io/sui-kit';
+import { SuiKit, SuiObjectArg } from '@scallop-io/sui-kit';
 import {
   ADDRESSES_ID,
   SUPPORT_POOLS,
@@ -72,6 +72,7 @@ import { SuiObjectData } from '@mysten/sui/client';
 import { normalizeSuiAddress } from '@mysten/sui/utils';
 import { withIndexerFallback } from 'src/utils/indexer';
 import { newSuiKit } from './suiKit';
+import { SuiObjectRef } from '@mysten/sui/client';
 /**
  * @description
  * It provides methods for getting on-chain data from the Scallop contract.
@@ -298,7 +299,7 @@ export class ScallopQuery {
    * @param obligationId - The obligation id.
    * @return Obligation data.
    */
-  public async queryObligation(obligationId: string) {
+  public async queryObligation(obligationId: string | SuiObjectArg) {
     return queryObligation(this, obligationId);
   }
 
@@ -564,7 +565,7 @@ export class ScallopQuery {
    * @return Borrow incentive accounts data.
    */
   public async getBorrowIncentiveAccounts(
-    obligationId: string,
+    obligationId: string | SuiObjectRef,
     coinNames?: SupportBorrowIncentiveCoins[]
   ) {
     return await queryBorrowIncentiveAccounts(this, obligationId, coinNames);

package/src/queries/borrowIncentiveQuery.ts

@@ -23,6 +23,7 @@ import type {
   MarketPools,
 } from '../types';
 import BigNumber from 'bignumber.js';
+import { SuiObjectRef } from '@mysten/sui/client';
 
 /**
  * Query borrow incentive pools data using moveCall
@@ -188,7 +189,7 @@ export const queryBorrowIncentiveAccounts = async (
   }: {
     utils: ScallopUtils;
   },
-  obligationId: string,
+  obligationId: string | SuiObjectRef,
   borrowIncentiveCoinNames: SupportBorrowIncentiveCoins[] = [
     ...SUPPORT_BORROW_INCENTIVE_POOLS,
   ]

package/src/queries/portfolioQuery.ts

@@ -27,6 +27,8 @@ import type {
   SupportBorrowIncentiveRewardCoins,
   SupportAssetCoins,
 } from '../types';
+import { SuiObjectRef } from '@mysten/sui/client';
+import { queryMultipleObjects } from './objectsQuery';
 
 /**
  * Get user lending infomation for specific pools.
@@ -311,7 +313,7 @@ export const getObligationAccounts = async (
   ownerAddress?: string,
   indexer: boolean = false
 ) => {
-  const market = await query.queryMarket({ indexer });
+  const market = await query.getMarketPools(undefined, { indexer });
   const coinPrices = await query.getAllCoinPrices({
     marketPools: market.pools,
   });
@@ -320,12 +322,16 @@ export const getObligationAccounts = async (
     query.getObligations(ownerAddress),
   ]);
 
+  const obligationObjects = await queryMultipleObjects(
+    query.cache,
+    obligations.map((obligation) => obligation.id)
+  );
   const obligationAccounts: 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,
@@ -342,13 +348,13 @@ export const getObligationAccounts = async (
  * Get obligation account data.
  *
  * @param query - The Scallop query instance.
- * @param obligationId - The obligation id.
+ * @param obligation - The obligation id.
  * @param indexer - Whether to use indexer.
  * @return Obligation account data.
  */
 export const getObligationAccount = async (
   query: ScallopQuery,
-  obligationId: string,
+  obligation: string | SuiObjectRef,
   ownerAddress?: string,
   indexer: boolean = false,
   market?: Market,
@@ -362,7 +368,6 @@ export const getObligationAccount = async (
     ...SUPPORT_COLLATERALS,
   ] as SupportCollateralCoins[];
 
-  // market = market ?? (await query.queryMarket({ indexer }));
   market = market ?? (await query.getMarketPools(undefined, { indexer }));
   coinPrices =
     coinPrices ?? (await query.getAllCoinPrices({ marketPools: market.pools }));
@@ -371,13 +376,13 @@ export const getObligationAccount = async (
 
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] =
     await Promise.all([
-      query.queryObligation(obligationId),
+      query.queryObligation(obligation),
       query.getBorrowIncentivePools(undefined, {
         coinPrices,
         indexer,
         marketPools: market.pools,
       }),
-      query.getBorrowIncentiveAccounts(obligationId),
+      query.getBorrowIncentiveAccounts(obligation),
     ]);
 
   const collaterals: ObligationAccount['collaterals'] = {};
@@ -657,7 +662,8 @@ export const getObligationAccount = async (
     : BigNumber(0);
 
   const obligationAccount: ObligationAccount = {
-    obligationId: obligationId,
+    obligationId:
+      typeof obligation === 'string' ? obligation : obligation.objectId,
     // Deposited collateral value (collateral balance)
     totalDepositedValue: totalDepositedValue.toNumber(),
     // Borrowed debt value (liabilities balance)
@@ -790,7 +796,6 @@ export const getTotalValueLocked = async (
   query: ScallopQuery,
   indexer: boolean = false
 ) => {
-  // const market = await query.queryMarket({ indexer });
   const market = await query.getMarketPools(undefined, { indexer });
 
   let supplyValue = BigNumber(0);