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

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.
@@ -100,6 +101,7 @@ export declare class ScallopQuery {
         hasui?: import("../types").MarketCollateral | undefined;
         vsui?: import("../types").MarketCollateral | undefined;
         sca?: import("../types").MarketCollateral | undefined;
+        fdusd?: import("../types").MarketCollateral | undefined;
     }>;
     /**
      * Get market collateral
@@ -124,7 +126,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.
      *
@@ -312,6 +314,7 @@ export declare class ScallopQuery {
         sca?: import("../types").BorrowIncentivePool | undefined;
         fud?: import("../types").BorrowIncentivePool | undefined;
         deep?: import("../types").BorrowIncentivePool | undefined;
+        fdusd?: import("../types").BorrowIncentivePool | undefined;
     }>;
     /**
      * Get borrow incentive accounts data.
@@ -320,7 +323,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;
@@ -337,6 +340,7 @@ export declare class ScallopQuery {
         sca?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         fud?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         deep?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+        fdusd?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     }>;
     /**
      * Get user lending and spool infomation for specific pools.
@@ -365,6 +369,7 @@ export declare class ScallopQuery {
         sca?: import("../types").Lending | undefined;
         fud?: import("../types").Lending | undefined;
         deep?: import("../types").Lending | undefined;
+        fdusd?: import("../types").Lending | undefined;
     }>;
     /**
      * Get user lending and spool information for specific pool.
@@ -475,7 +480,7 @@ export declare class ScallopQuery {
      * @param ownerAddress - The owner address.
      * @return All market sCoin amounts.
      */
-    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep", number>>>;
+    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -490,7 +495,7 @@ export declare class ScallopQuery {
      * @returns
      */
     getSCoinSwapRate(fromSCoin: SupportSCoin, toSCoin: SupportSCoin): Promise<number>;
-    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep", number>>;
+    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd", number>>;
     /**
      * Get supply limit of lending pool
      */
@@ -536,6 +541,7 @@ export declare class ScallopQuery {
         ssca?: number | undefined;
         sfud?: number | undefined;
         sdeep?: number | undefined;
+        sfdusd?: number | undefined;
         usdc?: number | undefined;
         sbeth?: number | undefined;
         weth?: number | undefined;
@@ -552,13 +558,14 @@ export declare class ScallopQuery {
         sca?: number | undefined;
         fud?: number | undefined;
         deep?: number | undefined;
+        fdusd?: number | undefined;
         swapt?: number | undefined;
     }>;
     /**
      * Query all address (lending pool, collateral pool, borrow dynamics, interest models) of all pool
      * @returns
      */
-    getPoolAddresses(): Promise<import("../types").OptionalKeys<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep", {
+    getPoolAddresses(): Promise<import("../types").OptionalKeys<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd", {
         lendingPoolAddress?: string;
         collateralPoolAddress?: string;
         borrowDynamic?: string;

package/dist/models/scallopUtils.d.ts

@@ -65,7 +65,7 @@ export declare class ScallopUtils {
      * if no `scallop_...` is encountered, return coinName
      * @return sCoin name
      */
-    parseSCoinTypeNameToMarketCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
+    parseSCoinTypeNameToMarketCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd";
     /**
      * Convert sCoin name into sCoin type
      * @param sCoinName
@@ -77,7 +77,7 @@ export declare class ScallopUtils {
      * @param sCoinType
      * @returns sCoin name
      */
-    parseSCoinNameFromType(sCoinType: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
+    parseSCoinNameFromType(sCoinType: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd";
     /**
      * Convert sCoin name into its underlying coin type
      * @param sCoinName

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
@@ -31,6 +32,7 @@ export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncent
     sca?: BorrowIncentivePool | undefined;
     fud?: BorrowIncentivePool | undefined;
     deep?: BorrowIncentivePool | undefined;
+    fdusd?: BorrowIncentivePool | undefined;
 }>;
 /**
  * Query borrow incentive accounts data.
@@ -41,7 +43,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;
@@ -58,6 +60,7 @@ export declare const queryBorrowIncentiveAccounts: ({ utils, }: {
     sca?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     fud?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     deep?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+    fdusd?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
 }>;
 /**
  * Check veSca bind status

package/dist/queries/coreQuery.d.ts

@@ -80,6 +80,7 @@ export declare const getMarketCollaterals: (query: ScallopQuery, collateralCoinN
     hasui?: MarketCollateral | undefined;
     vsui?: MarketCollateral | undefined;
     sca?: MarketCollateral | undefined;
+    fdusd?: MarketCollateral | undefined;
 }>;
 /**
  * Get market collateral data.

package/dist/queries/poolAddressesQuery.d.ts

@@ -1,6 +1,6 @@
 import { ScallopQuery } from 'src/models';
 import { OptionalKeys } from 'src/types';
-export declare const getAllAddresses: (query: ScallopQuery) => Promise<OptionalKeys<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep", {
+export declare const getAllAddresses: (query: ScallopQuery) => Promise<OptionalKeys<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd", {
     lendingPoolAddress?: string;
     collateralPoolAddress?: string;
     borrowDynamic?: string;

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.
  *
@@ -26,6 +27,7 @@ export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportP
     sca?: Lending | undefined;
     fud?: Lending | undefined;
     deep?: Lending | undefined;
+    fdusd?: Lending | undefined;
 }>;
 /**
  * Get user lending infomation for specific pool.
@@ -60,11 +62,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/dist/queries/priceQuery.d.ts

@@ -30,6 +30,7 @@ export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: Marke
     ssca?: number | undefined;
     sfud?: number | undefined;
     sdeep?: number | undefined;
+    sfdusd?: number | undefined;
     usdc?: number | undefined;
     sbeth?: number | undefined;
     weth?: number | undefined;
@@ -46,5 +47,6 @@ export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: Marke
     sca?: number | undefined;
     fud?: number | undefined;
     deep?: number | undefined;
+    fdusd?: number | undefined;
     swapt?: number | undefined;
 }>;

package/dist/queries/sCoinQuery.d.ts

@@ -19,7 +19,7 @@ export declare const getSCoinTotalSupply: ({ utils, }: {
  */
 export declare const getSCoinAmounts: ({ utils, }: {
     utils: ScallopUtils;
-}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/package.json

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

package/src/constants/coinGecko.ts

@@ -15,6 +15,7 @@ export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
   hasui: 'sui',
   vsui: 'sui',
   sca: 'scallop-2',
+  fdusd: 'first-digital-usd',
   deep: 'deepbook',
   fud: 'fud-the-pug',
 };

package/src/constants/common.ts

@@ -46,6 +46,7 @@ export const SUPPORT_POOLS = [
   'sca',
   'fud',
   'deep',
+  'fdusd',
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
@@ -63,6 +64,7 @@ export const SUPPORT_COLLATERALS = [
   'hasui',
   'vsui',
   'sca',
+  'fdusd',
 ] as const;
 
 export const SUPPORT_SPOOLS = [
@@ -93,6 +95,7 @@ export const SUPPORT_SCOIN = [
   'swbtc',
   'sdeep',
   'sfud',
+  'sfdusd',
 ] as const;
 
 export const SUPPORT_SUI_BRIDGE = ['sbeth'] as const;

package/src/constants/enum.ts

@@ -16,6 +16,7 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
+  fdusd: 6,
   deep: 6,
   fud: 5,
   susdc: 6,
@@ -32,6 +33,7 @@ export const coinDecimals: types.SupportCoinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
+  sfdusd: 6,
   sdeep: 6,
   sfud: 5,
 };
@@ -51,6 +53,7 @@ export const assetCoins: types.AssetCoins = {
   hasui: 'hasui',
   vsui: 'vsui',
   sca: 'sca',
+  fdusd: 'fdusd',
   deep: 'deep',
   fud: 'fud',
 };
@@ -70,6 +73,7 @@ export const marketCoins: types.MarketCoins = {
   shasui: 'shasui',
   svsui: 'svsui',
   ssca: 'ssca',
+  sfdusd: 'sfdusd',
   sdeep: 'sdeep',
   sfud: 'sfud',
 };
@@ -88,6 +92,7 @@ export const sCoins: types.SCoins = {
   ssca: 'ssca',
   swsol: 'swsol',
   swbtc: 'swbtc',
+  sfdusd: 'sfdusd',
   sfud: 'sfud',
   sdeep: 'sdeep',
 };
@@ -137,6 +142,7 @@ export const coinIds: types.AssetCoinIds = {
   sca: IS_VE_SCA_TEST
     ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
     : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
+  fdusd: '0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a',
   // isolated assets
   deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
   fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
@@ -181,6 +187,8 @@ export const sCoinIds: types.SCoinIds = {
     '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',

package/src/constants/poolAddress.ts

@@ -425,4 +425,29 @@ export const POOL_ADDRESSES: OptionalKeys<
     coinDecimalId:
       '0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0',
   },
+  fdusd: {
+    lendingPoolAddress:
+      '0x4f46051a01f05c3ad9aecf29a771aad5c884e1a1888e08d7709085e3a095bc9c',
+    collateralPoolAddress:
+      '0x4f6647a9afcfdb62bb9b27e4d1cb7bd7130aca1b4f13fa7164453c869c1681ae',
+    borrowDynamic:
+      '0x4ddcf19b6290a8b048ecb314b14ef7f52c1c5b9ddc9259a2a242cd91d681a085',
+    interestModel:
+      '0xb57a33706b29d2d253c74c1c0869e6e20da99036338d2b0b7235ab41621ee9dd',
+    riskModel:
+      '0xd65fb21758dc1e6184940a1a27efb13228d7cf5e19f6dcca06cc2d996af4a6b9',
+    borrowFeeKey:
+      '0xafe673a27747b063fa918d2dfe47794e44af553737ac562c2a63186539a07f45',
+    supplyLimitKey:
+      '0x730e0785ba056a7a95f4a6959371a598d7fe782e81c40785c79982ced4cf4e35',
+    borrowLimitKey:
+      '0x1630c6954918a06fe56312afb8958366c5ed7af653dae0e32c09d088da38577e',
+    isolatedAssetKey: undefined,
+    spool: undefined,
+    spoolReward: undefined,
+    sCoinTreasury:
+      '0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0',
+    coinDecimalId:
+      '0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7',
+  },
 };

package/src/constants/pyth.ts

@@ -22,6 +22,7 @@ export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
   hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
   vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
   sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
+  fdusd: '0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979',
   deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
   fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
 };

package/src/constants/testAddress.ts

@@ -236,6 +236,21 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      fdusd: {
+        id: '0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a',
+        metaData:
+          '0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7',
+        treasury: '',
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979',
+            feedObject:
+              '0x5f6583b2b0fe1ecf94aaffeaab8a838794693960cea48c0da282d5f4a24be027',
+          },
+        },
+      },
       deep: {
         id: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
         metaData:
@@ -543,6 +558,12 @@ export const TEST_ADDRESSES: AddressesInterface = {
         treasury:
           '0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed',
       },
+      sfdusd: {
+        coinType:
+          '0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD',
+        treasury:
+          '0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0',
+      },
       sdeep: {
         coinType:
           '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',

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/coreQuery.ts

@@ -292,33 +292,65 @@ const queryRequiredMarketObjects = async (
   // Map the results back to poolCoinNames
   const mapObjects = (
     tasks: { poolCoinName: string; [key: string]: string | undefined }[],
-    fetchedObjects: SuiObjectData[]
+    fetchedObjects: SuiObjectData[],
+    keyValue: string
   ) => {
     const resultMap: Record<string, SuiObjectData> = {};
-    let fetchedIndex = 0;
+    const fetchedObjectMap = fetchedObjects.reduce(
+      (acc, obj) => {
+        acc[obj.objectId] = obj;
+        return acc;
+      },
+      {} as Record<string, SuiObjectData>
+    );
 
     for (const task of tasks) {
-      const key = task[Object.keys(task)[1]]; // current object key being queried
-      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);
-
+  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'
+  );
   // Construct the final requiredObjects result
-  return poolCoinNames.reduce(
+  const result = poolCoinNames.reduce(
     (acc, name) => {
       acc[name] = {
         balanceSheet: balanceSheetMap[name],
@@ -348,6 +380,8 @@ const queryRequiredMarketObjects = async (
       }
     >
   );
+
+  return result;
 };
 
 /**

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);