@scallop-io/sui-scallop-sdk 1.4.15-rc.3 → 1.4.16

package/dist/models/scallop.d.ts

@@ -8,7 +8,6 @@ import type { ScallopBuilderParams, ScallopClientParams, ScallopParams, ScallopQ
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
 import { QueryClientConfig } from '@tanstack/query-core';
-import { TokenBucket } from 'src/utils';
 import type { QueryClient } from '@tanstack/query-core';
 /**
  * @argument params - The parameters for the Scallop instance.
@@ -32,7 +31,7 @@ export declare class Scallop {
     suiKit: SuiKit;
     cache: ScallopCache;
     private address;
-    constructor(params: ScallopParams, cacheOptions?: QueryClientConfig, tokenBucket?: TokenBucket, queryClient?: QueryClient);
+    constructor(params: ScallopParams, cacheOptions?: QueryClientConfig, queryClient?: QueryClient);
     /**
      * Get a scallop address instance that already has read addresses.
      *

package/dist/models/scallopBuilder.d.ts

@@ -4,7 +4,7 @@ import { ScallopQuery } from './scallopQuery';
 import { ScallopUtils } from './scallopUtils';
 import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
 import type { Transaction } from '@mysten/sui/transactions';
-import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
+import type { SuiAmountsArg, SuiTxBlock as SuiKitTxBlock, SuiObjectArg, SuiTxArg, SuiVecTxArg } from '@scallop-io/sui-kit';
 import type { ScallopBuilderParams, ScallopTxBlock, SupportMarketCoins, SupportAssetCoins, SupportSCoin, ScallopBuilderInstanceParams, SelectCoinReturnType } from '../types';
 import { ScallopCache } from './scallopCache';
 /**
@@ -86,4 +86,5 @@ export declare class ScallopBuilder {
      * @param txBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
      */
     signAndSendTxBlock(txBlock: ScallopTxBlock | SuiKitTxBlock | Transaction): Promise<SuiTransactionBlockResponse>;
+    moveCall(txb: ScallopTxBlock | SuiKitTxBlock, target: string, args?: (SuiTxArg | SuiVecTxArg | SuiObjectArg | SuiAmountsArg)[], typeArgs?: string[]): import("@scallop-io/sui-kit").TransactionResult;
 }

package/dist/models/scallopCache.d.ts

@@ -1,8 +1,8 @@
-import { QueryClient, QueryClientConfig } from '@tanstack/query-core';
+import { QueryClient } from '@tanstack/query-core';
 import { SuiObjectArg } from '@scallop-io/sui-kit';
 import { SuiKit } from '@scallop-io/sui-kit';
-import type { SuiObjectResponse, SuiObjectDataOptions, SuiObjectData, GetOwnedObjectsParams, DevInspectResults, GetDynamicFieldsParams, DynamicFieldPage, GetDynamicFieldObjectParams, GetBalanceParams } from '@mysten/sui/client';
-import { TokenBucket } from 'src/utils';
+import type { SuiObjectResponse, SuiObjectDataOptions, SuiObjectData, GetOwnedObjectsParams, DevInspectResults, GetDynamicFieldsParams, DynamicFieldPage, GetDynamicFieldObjectParams, GetBalanceParams, CoinBalance } from '@mysten/sui/client';
+import { ScallopCacheInstanceParams, ScallopCacheParams } from 'src/types';
 type QueryInspectTxnParams = {
     queryTarget: string;
     args: SuiObjectArg[];
@@ -21,13 +21,19 @@ type QueryInspectTxnParams = {
  * ```
  */
 export declare class ScallopCache {
-    readonly queryClient: QueryClient;
-    readonly _suiKit: SuiKit;
-    private tokenBucket;
+    readonly params: ScallopCacheParams;
+    queryClient: QueryClient;
+    suiKit: SuiKit;
     walletAddress: string;
-    constructor(suiKit: SuiKit, walletAddress?: string, cacheOptions?: QueryClientConfig, tokenBucket?: TokenBucket, queryClient?: QueryClient);
-    private get suiKit();
+    private tokensPerInterval;
+    private interval;
+    private tokens;
+    private lastRefill;
+    constructor(params: ScallopCacheParams, instance?: ScallopCacheInstanceParams);
     private get client();
+    private refill;
+    private removeTokens;
+    private callWithRateLimit;
     /**
      * @description Invalidate cache based on the refetchType parameter
      * @param refetchType Determines the type of queries to be refetched. Defaults to `active`.
@@ -37,7 +43,6 @@ export declare class ScallopCache {
      * - `all`: All queries that match the refetch predicate will be refetched in the background.
      * - `none`: No queries will be refetched. Queries that match the refetch predicate will only be marked as invalid.
      */
-    invalidateAllCache(): Promise<Promise<void>[]>;
     private retryFn;
     /**
      * @description Provides cache for inspectTxn of the SuiKit.
@@ -46,6 +51,7 @@ export declare class ScallopCache {
      * @returns Promise<DevInspectResults>
      */
     queryInspectTxn({ queryTarget, args, typeArgs, }: QueryInspectTxnParams): Promise<DevInspectResults | null>;
+    queryGetNormalizedMoveFunction(target: string): Promise<import("@mysten/sui/client").SuiMoveNormalizedFunction | null>;
     /**
      * @description Provides cache for getObject of the SuiKit.
      * @param objectId
@@ -58,7 +64,7 @@ export declare class ScallopCache {
      * @param objectIds
      * @returns Promise<SuiObjectData[]>
      */
-    queryGetObjects(objectIds: string[], options?: SuiObjectDataOptions): Promise<SuiObjectData[]>;
+    queryGetObjects(objectIds: string[]): Promise<SuiObjectData[]>;
     /**
      * @description Provides cache for getOwnedObjects of the SuiKit.
      * @param input
@@ -68,8 +74,8 @@ export declare class ScallopCache {
     queryGetDynamicFields(input: GetDynamicFieldsParams): Promise<DynamicFieldPage | null>;
     queryGetDynamicFieldObject(input: GetDynamicFieldObjectParams): Promise<SuiObjectResponse | null>;
     queryGetAllCoinBalances(owner: string): Promise<{
-        [k: string]: string;
+        [k: string]: CoinBalance;
     }>;
-    queryGetCoinBalance(input: GetBalanceParams): Promise<string>;
+    queryGetCoinBalance(input: GetBalanceParams): Promise<CoinBalance | null>;
 }
 export {};

package/dist/models/scallopQuery.d.ts

@@ -1,10 +1,11 @@
-import { SuiKit } from '@scallop-io/sui-kit';
-import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams, MarketPool, CoinPrices, MarketPools } from '../types';
+import { SuiKit, SuiObjectArg } from '@scallop-io/sui-kit';
+import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams, MarketPool, CoinPrices, MarketPools, MarketCollaterals } 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.
@@ -59,7 +60,7 @@ export declare class ScallopQuery {
         indexer?: boolean;
     }): Promise<{
         pools: MarketPools;
-        collaterals: import("../types").MarketCollaterals;
+        collaterals: MarketCollaterals;
     }>;
     /**
      * Get  market pool
@@ -88,6 +89,7 @@ export declare class ScallopQuery {
     }): Promise<{
         usdc?: import("../types").MarketCollateral | undefined;
         sbeth?: import("../types").MarketCollateral | undefined;
+        sbusdt?: import("../types").MarketCollateral | undefined;
         weth?: import("../types").MarketCollateral | undefined;
         wbtc?: import("../types").MarketCollateral | undefined;
         wusdc?: import("../types").MarketCollateral | undefined;
@@ -100,6 +102,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 +127,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.
      *
@@ -298,6 +301,7 @@ export declare class ScallopQuery {
     }): Promise<{
         usdc?: import("../types").BorrowIncentivePool | undefined;
         sbeth?: import("../types").BorrowIncentivePool | undefined;
+        sbusdt?: import("../types").BorrowIncentivePool | undefined;
         weth?: import("../types").BorrowIncentivePool | undefined;
         wbtc?: import("../types").BorrowIncentivePool | undefined;
         wusdc?: import("../types").BorrowIncentivePool | undefined;
@@ -312,6 +316,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,9 +325,10 @@ 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;
+        sbusdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         wbtc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         wusdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
@@ -337,6 +343,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.
@@ -348,9 +355,12 @@ export declare class ScallopQuery {
      */
     getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, args?: {
         indexer?: boolean;
+        marketPools?: MarketPools;
+        coinPrices?: CoinPrices;
     }): Promise<{
         usdc?: import("../types").Lending | undefined;
         sbeth?: import("../types").Lending | undefined;
+        sbusdt?: import("../types").Lending | undefined;
         weth?: import("../types").Lending | undefined;
         wbtc?: import("../types").Lending | undefined;
         wusdc?: import("../types").Lending | undefined;
@@ -365,6 +375,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.
@@ -389,6 +400,11 @@ export declare class ScallopQuery {
      */
     getObligationAccounts(ownerAddress?: string, args?: {
         indexer?: boolean;
+        market?: {
+            collaterals: MarketCollaterals;
+            pools: MarketPools;
+        };
+        coinPrices?: CoinPrices;
     }): Promise<{
         [x: string]: import("../types").ObligationAccount | undefined;
     }>;
@@ -475,7 +491,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" | "ssbusdt" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -490,7 +506,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" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd", number>>;
     /**
      * Get supply limit of lending pool
      */
@@ -523,6 +539,7 @@ export declare class ScallopQuery {
     }): Promise<{
         susdc?: number | undefined;
         ssbeth?: number | undefined;
+        ssbusdt?: number | undefined;
         sweth?: number | undefined;
         swbtc?: number | undefined;
         swusdc?: number | undefined;
@@ -536,8 +553,10 @@ export declare class ScallopQuery {
         ssca?: number | undefined;
         sfud?: number | undefined;
         sdeep?: number | undefined;
+        sfdusd?: number | undefined;
         usdc?: number | undefined;
         sbeth?: number | undefined;
+        sbusdt?: number | undefined;
         weth?: number | undefined;
         wbtc?: number | undefined;
         wusdc?: number | undefined;
@@ -552,18 +571,20 @@ 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
+     * Query all address (lending pool, collateral pool, borrow dynamics, interest models, etc.) 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" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd", {
         lendingPoolAddress?: string;
         collateralPoolAddress?: string;
         borrowDynamic?: string;
         spoolReward?: string;
         spool?: string;
+        sCoinType?: string;
         sCoinTreasury?: string;
         interestModel?: string;
         riskModel?: string;
@@ -571,7 +592,71 @@ export declare class ScallopQuery {
         supplyLimitKey?: string;
         borrowLimitKey?: string;
         isolatedAssetKey?: string;
-        coinDecimalId?: string;
+        coinMetadataId?: string;
         borrowIncentivePoolId?: string;
+        coinType?: string;
     }>>>;
+    /**
+     * Get user portfolio
+     */
+    getUserPortfolio(args?: {
+        walletAddress?: string;
+        indexer?: boolean;
+    }): Promise<{
+        totalLockedScaValue: number;
+        lendings: {
+            suppliedCoin: number;
+            suppliedValue: number;
+            stakedCoin: number;
+            coinName: "usdc" | "sbeth" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd";
+            symbol: string;
+            coinType: string;
+            coinPrice: number;
+            coinDecimals: number;
+            supplyApr: number;
+            supplyApy: number;
+            incentiveApr: number;
+        }[];
+        borrowings: {
+            obligationId: string;
+            totalDebtsInUsd: number;
+            totalCollateralInUsd: number;
+            riskLevel: number;
+            availableCollateralInUsd: number;
+            totalUnhealthyCollateralInUsd: number;
+            borrowedPools: {
+                coinName: "usdc" | "sbeth" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd";
+                symbol: string;
+                coinDecimals: number;
+                coinType: string;
+                coinPrice: number;
+                borrowedCoin: number;
+                borrowedValueInUsd: number;
+                borrowApr: number | undefined;
+                borrowApy: number | undefined;
+                incentiveInfos: {
+                    coinName: "usdc" | "sbeth" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "susdc" | "ssbeth" | "ssbusdt" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd";
+                    symbol: string;
+                    coinType: string;
+                    incentiveApr: number;
+                }[];
+            }[];
+        }[];
+        pendingRewards: {
+            lendings: any;
+            borrowIncentives: any;
+        };
+        veScas: {
+            veScaKey: string;
+            coinPrice: number;
+            lockedScaInCoin: number;
+            lockedScaInUsd: number;
+            currentVeScaBalance: number;
+            remainingLockPeriodInDays: number;
+            unlockAt: number;
+        }[];
+        totalDebtValue: number;
+        totalCollateralValue: number;
+        totalSupplyValue: number;
+    }>;
 }

package/dist/models/scallopUtils.d.ts

@@ -2,7 +2,7 @@ import { SuiKit } from '@scallop-io/sui-kit';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopCache } from './scallopCache';
 import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins, PoolAddressInfo } from '../types';
-import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
+import type { SuiObjectArg, SuiTxBlock } from '@scallop-io/sui-kit';
 /**
  * @description
  * Integrates some helper functions frequently used in interactions with the Scallop contract.
@@ -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" | "ssbusdt" | "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" | "ssbusdt" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd";
     /**
      * Convert sCoin name into its underlying coin type
      * @param sCoinName
@@ -166,7 +166,7 @@ export declare class ScallopUtils {
      * @param coinType
      * @param sender
      */
-    mergeSimilarCoins(txBlock: SuiTxBlock, dest: SuiTxArg, coinType: string, sender?: string): Promise<void>;
+    mergeSimilarCoins(txBlock: SuiTxBlock, dest: SuiObjectArg, coinType: string, sender?: string): Promise<void>;
     /**
      * Get all asset coin names in the obligation record by obligation id.
      *

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
@@ -17,6 +18,7 @@ export declare const queryBorrowIncentivePools: (address: ScallopAddress) => Pro
 export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
     usdc?: BorrowIncentivePool | undefined;
     sbeth?: BorrowIncentivePool | undefined;
+    sbusdt?: BorrowIncentivePool | undefined;
     weth?: BorrowIncentivePool | undefined;
     wbtc?: BorrowIncentivePool | undefined;
     wusdc?: BorrowIncentivePool | undefined;
@@ -31,6 +33,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,9 +44,10 @@ 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;
+    sbusdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     wbtc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     wusdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
@@ -58,6 +62,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

@@ -68,6 +68,7 @@ export declare const getMarketPool: (query: ScallopQuery, poolCoinName: SupportP
 export declare const getMarketCollaterals: (query: ScallopQuery, collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean) => Promise<{
     usdc?: MarketCollateral | undefined;
     sbeth?: MarketCollateral | undefined;
+    sbusdt?: MarketCollateral | undefined;
     weth?: MarketCollateral | undefined;
     wbtc?: MarketCollateral | undefined;
     wusdc?: MarketCollateral | undefined;
@@ -80,6 +81,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/objectsQuery.d.ts

@@ -1,3 +1,2 @@
-import { SuiObjectDataOptions } from '@mysten/sui/dist/cjs/client';
 import { ScallopCache } from 'src/models/scallopCache';
-export declare const queryMultipleObjects: (cache: ScallopCache, objectIds: string[], options?: SuiObjectDataOptions, partitionSize?: number) => Promise<import("@mysten/sui/dist/cjs/client").SuiObjectData[]>;
+export declare const queryMultipleObjects: (cache: ScallopCache, objectIds: string[], partitionSize?: number) => Promise<import("@mysten/sui/dist/cjs/client").SuiObjectData[]>;

package/dist/queries/poolAddressesQuery.d.ts

@@ -1,11 +1,12 @@
 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" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd", {
     lendingPoolAddress?: string;
     collateralPoolAddress?: string;
     borrowDynamic?: string;
     spoolReward?: string;
     spool?: string;
+    sCoinType?: string;
     sCoinTreasury?: string;
     interestModel?: string;
     riskModel?: string;
@@ -13,6 +14,7 @@ export declare const getAllAddresses: (query: ScallopQuery) => Promise<OptionalK
     supplyLimitKey?: string;
     borrowLimitKey?: string;
     isolatedAssetKey?: string;
-    coinDecimalId?: string;
+    coinMetadataId?: string;
     borrowIncentivePoolId?: string;
+    coinType?: 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 type { Market, SupportPoolCoins, MarketPool, Spool, StakeAccount, Lending, ObligationAccount, CoinAmounts, CoinPrices, TotalValueLocked, MarketPools, MarketCollaterals } from '../types';
+import { SuiObjectRef } from '@mysten/sui/client';
 /**
  * Get user lending infomation for specific pools.
  *
@@ -9,9 +10,10 @@ import type { Market, SupportPoolCoins, MarketPool, Spool, StakeAccount, Lending
  * @param indexer - Whether to use indexer.
  * @return User lending infomation for specific pools.
  */
-export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, indexer?: boolean) => Promise<{
+export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, marketPools?: MarketPools, coinPrices?: CoinPrices, indexer?: boolean) => Promise<{
     usdc?: Lending | undefined;
     sbeth?: Lending | undefined;
+    sbusdt?: Lending | undefined;
     weth?: Lending | undefined;
     wbtc?: Lending | undefined;
     wusdc?: Lending | undefined;
@@ -26,6 +28,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.
@@ -53,18 +56,21 @@ export declare const getLending: (query: ScallopQuery, poolCoinName: SupportPool
  * @param indexer - Whether to use indexer.
  * @return All obligation accounts data.
  */
-export declare const getObligationAccounts: (query: ScallopQuery, ownerAddress?: string, indexer?: boolean) => Promise<{
+export declare const getObligationAccounts: (query: ScallopQuery, ownerAddress?: string, market?: {
+    pools: MarketPools;
+    collaterals: MarketCollaterals;
+}, coinPrices?: CoinPrices, indexer?: boolean) => Promise<{
     [x: string]: ObligationAccount | undefined;
 }>;
 /**
  * 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.
  *
@@ -73,3 +79,63 @@ export declare const getObligationAccount: (query: ScallopQuery, obligationId: s
  * @return Total value locked data.
  */
 export declare const getTotalValueLocked: (query: ScallopQuery, indexer?: boolean) => Promise<TotalValueLocked>;
+/**
+ * Get user portfolio by wallet address
+ */
+export declare const getUserPortfolio: (query: ScallopQuery, walletAddress: string, indexer?: boolean) => Promise<{
+    totalLockedScaValue: number;
+    lendings: {
+        suppliedCoin: number;
+        suppliedValue: number;
+        stakedCoin: number;
+        coinName: "usdc" | "sbeth" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd";
+        symbol: string;
+        coinType: string;
+        coinPrice: number;
+        coinDecimals: number;
+        supplyApr: number;
+        supplyApy: number;
+        incentiveApr: number;
+    }[];
+    borrowings: {
+        obligationId: string;
+        totalDebtsInUsd: number;
+        totalCollateralInUsd: number;
+        riskLevel: number;
+        availableCollateralInUsd: number;
+        totalUnhealthyCollateralInUsd: number;
+        borrowedPools: {
+            coinName: "usdc" | "sbeth" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd";
+            symbol: string;
+            coinDecimals: number;
+            coinType: string;
+            coinPrice: number;
+            borrowedCoin: number;
+            borrowedValueInUsd: number;
+            borrowApr: number | undefined;
+            borrowApy: number | undefined;
+            incentiveInfos: {
+                coinName: "usdc" | "sbeth" | "sbusdt" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "susdc" | "ssbeth" | "ssbusdt" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd";
+                symbol: string;
+                coinType: string;
+                incentiveApr: number;
+            }[];
+        }[];
+    }[];
+    pendingRewards: {
+        lendings: any;
+        borrowIncentives: any;
+    };
+    veScas: {
+        veScaKey: string;
+        coinPrice: number;
+        lockedScaInCoin: number;
+        lockedScaInUsd: number;
+        currentVeScaBalance: number;
+        remainingLockPeriodInDays: number;
+        unlockAt: number;
+    }[];
+    totalDebtValue: number;
+    totalCollateralValue: number;
+    totalSupplyValue: number;
+}>;

package/dist/queries/priceQuery.d.ts

@@ -17,6 +17,7 @@ export declare const getPythPrices: ({ address, }: {
 export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
     susdc?: number | undefined;
     ssbeth?: number | undefined;
+    ssbusdt?: number | undefined;
     sweth?: number | undefined;
     swbtc?: number | undefined;
     swusdc?: number | undefined;
@@ -30,8 +31,10 @@ 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;
+    sbusdt?: number | undefined;
     weth?: number | undefined;
     wbtc?: number | undefined;
     wusdc?: number | undefined;
@@ -46,5 +49,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" | "ssbusdt" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/dist/types/builder/core.d.ts

@@ -23,12 +23,12 @@ export type CoreNormalMethods = {
     addCollateral: (obligation: SuiObjectArg, coin: SuiObjectArg, collateralCoinName: SupportCollateralCoins) => void;
     takeCollateral: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, collateralCoinName: SupportCollateralCoins) => TransactionResult;
     deposit: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    depositEntry: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
+    depositEntry: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     withdraw: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    withdrawEntry: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
+    withdrawEntry: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     borrow: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
     borrowWithReferral: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, borrowReferral: SuiObjectArg, amount: number | SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    borrowEntry: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => void;
+    borrowEntry: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
     repay: (obligation: SuiObjectArg, coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
     borrowFlashLoan: (amount: number | SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     repayFlashLoan: (coin: SuiObjectArg, loan: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;