@scallop-io/sui-scallop-sdk 1.3.3-alpha.2 → 1.3.4-alpha.1

package/dist/models/scallopIndexer.d.ts

@@ -80,4 +80,10 @@ export declare class ScallopIndexer {
         borrowValueChangeRatio: number;
         supplyValueChangeRatio: number;
     }>;
+    /**
+     * Get coin price index data.
+     *
+     * @return price data.
+     */
+    getCoinPrice(poolCoinName: SupportPoolCoins): Promise<number>;
 }

package/dist/models/scallopQuery.d.ts

@@ -179,9 +179,9 @@ export declare class ScallopQuery {
     getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean): Promise<{
         susdc?: import("../types").Spool | undefined;
         sweth?: import("../types").Spool | undefined;
-        ssui?: import("../types").Spool | undefined;
         swusdc?: import("../types").Spool | undefined;
         swusdt?: import("../types").Spool | undefined;
+        ssui?: import("../types").Spool | undefined;
         scetus?: import("../types").Spool | undefined;
         safsui?: import("../types").Spool | undefined;
         shasui?: import("../types").Spool | undefined;
@@ -223,9 +223,9 @@ export declare class ScallopQuery {
     getStakePools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
         susdc?: import("../types").StakePool | undefined;
         sweth?: import("../types").StakePool | undefined;
-        ssui?: import("../types").StakePool | undefined;
         swusdc?: import("../types").StakePool | undefined;
         swusdt?: import("../types").StakePool | undefined;
+        ssui?: import("../types").StakePool | undefined;
         scetus?: import("../types").StakePool | undefined;
         safsui?: import("../types").StakePool | undefined;
         shasui?: import("../types").StakePool | undefined;
@@ -255,9 +255,9 @@ export declare class ScallopQuery {
     getStakeRewardPools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
         susdc?: import("../types").StakeRewardPool | undefined;
         sweth?: import("../types").StakeRewardPool | undefined;
-        ssui?: import("../types").StakeRewardPool | undefined;
         swusdc?: import("../types").StakeRewardPool | undefined;
         swusdt?: import("../types").StakeRewardPool | undefined;
+        ssui?: import("../types").StakeRewardPool | undefined;
         scetus?: import("../types").StakeRewardPool | undefined;
         safsui?: import("../types").StakeRewardPool | undefined;
         shasui?: import("../types").StakeRewardPool | undefined;
@@ -437,7 +437,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" | "sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssbeth" | "ssca" | "swsol" | "swbtc", number>>>;
+    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -465,4 +465,10 @@ export declare class ScallopQuery {
      * Check if asset is an isolated asset
      */
     isIsolatedAsset(assetCoinName: SupportAssetCoins): Promise<boolean>;
+    /**
+     * Get pool coin price from indexer
+     * @param coinName
+     * @returns price data
+     */
+    getCoinPriceByIndexer(poolName: SupportPoolCoins): Promise<number>;
 }

package/dist/models/scallopUtils.d.ts

@@ -1,7 +1,7 @@
 import { SuiKit } from '@scallop-io/sui-kit';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopCache } from './scallopCache';
-import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
+import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins, PoolAddressInfo } from '../types';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
 /**
  * @description
@@ -214,4 +214,9 @@ export declare class ScallopUtils {
      * @return New unlock at in seconds timestamp.
      */
     getUnlockAt(extendLockPeriodInDay?: number, unlockAtInMillisTimestamp?: number): number;
+    /**
+     * Get detailed contract address and price id information for supported pool in Scallop
+     * @returns Supported pool informations
+     */
+    getSupportedPoolAddresses(): PoolAddressInfo[];
 }

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" | "sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssbeth" | "ssca" | "swsol" | "swbtc", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/dist/queries/spoolQuery.d.ts

@@ -11,9 +11,9 @@ import type { MarketPool, Spool, StakePool, StakeRewardPool, StakeAccounts, Supp
 export declare const getSpools: (query: ScallopQuery, stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean) => Promise<{
     susdc?: Spool | undefined;
     sweth?: Spool | undefined;
-    ssui?: Spool | undefined;
     swusdc?: Spool | undefined;
     swusdt?: Spool | undefined;
+    ssui?: Spool | undefined;
     scetus?: Spool | undefined;
     safsui?: Spool | undefined;
     shasui?: Spool | undefined;

package/dist/queries/vescaQuery.d.ts

@@ -18,7 +18,7 @@ export declare const getVescaKeys: (utils: ScallopUtils, ownerAddress?: string)
  */
 export declare const getVeScas: ({ utils, }: {
     utils: ScallopUtils;
-}, ownerAddress?: string, excludeEmpty?: boolean) => Promise<Vesca[]>;
+}, ownerAddress: string, excludeEmpty?: boolean) => Promise<Vesca[]>;
 /**
  * Get veSca data.
  *
@@ -27,7 +27,7 @@ export declare const getVeScas: ({ utils, }: {
  * @param ownerAddress - The owner address.
  * @returns Vesca data.
  */
-export declare const getVeSca: (utils: ScallopUtils, veScaKey?: string | SuiObjectData, ownerAddress?: string) => Promise<Vesca | undefined>;
+export declare const getVeSca: (utils: ScallopUtils, veScaKey: string | SuiObjectData) => Promise<Vesca | undefined>;
 /**
  * Get veSCA treasury informations
  * @param query

package/dist/types/query/portfolio.d.ts

@@ -6,7 +6,7 @@ type OptionalKeys<T> = {
 };
 export type Lendings = OptionalKeys<Record<SupportPoolCoins, Lending>>;
 export type ObligationAccounts = OptionalKeys<Record<string, ObligationAccount>>;
-export type Lending = Required<Pick<MarketPool, 'coinName' | 'symbol' | 'coinType' | 'marketCoinType' | 'coinDecimal' | 'coinPrice' | 'conversionRate' | 'isIsolated'> & Pick<Spool, 'marketCoinPrice'>> & {
+export type Lending = Required<Pick<MarketPool, 'coinName' | 'symbol' | 'coinType' | 'marketCoinType' | 'sCoinType' | 'coinDecimal' | 'coinPrice' | 'conversionRate' | 'isIsolated'> & Pick<Spool, 'marketCoinPrice'>> & {
     supplyApr: number;
     supplyApy: number;
     rewardApr: number;

package/dist/types/query/spool.d.ts

@@ -9,6 +9,7 @@ export type Spool = {
     coinType: string;
     marketCoinType: string;
     rewardCoinType: string;
+    sCoinType: string;
     coinDecimal: number;
     rewardCoinDecimal: number;
     coinPrice: number;

package/dist/types/query/vesca.d.ts

@@ -3,7 +3,7 @@ export type Vesca = {
     id: string;
     keyId: string;
     keyObject?: SuiObjectRef;
-    object?: SuiObjectRef;
+    object: SuiObjectRef;
     lockedScaAmount: string;
     lockedScaCoin: number;
     currentVeScaBalance: number;

package/dist/types/utils.d.ts

@@ -7,3 +7,15 @@ export type PriceMap = Map<SupportAssetCoins, {
     price: number;
     publishTime: number;
 }>;
+export type PoolAddressInfo = {
+    name: string;
+    coingeckoId: string;
+    decimal: number;
+    pythFeedId: string;
+    lendingPoolAddress: string;
+    collateralPoolAddress: string;
+    sCoinAddress: string | undefined;
+    marketCoinAddress: string;
+    coinAddress: string;
+    sCoinName: string | undefined;
+};

package/dist/utils/util.d.ts

@@ -1,7 +1,7 @@
 import type { PriceFeed } from '@pythnetwork/pyth-sui-js';
 import type { ScallopAddress } from '../models';
-import type { SupportAssetCoins, SupportCoins, SupportMarketCoins, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
-export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins;
+import type { SupportAssetCoins, SupportCoins, SupportMarketCoins, SupportSCoin, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
+export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins | SupportSCoin;
 export declare const isSuiBridgeAsset: (coinName: any) => coinName is SupportSuiBridgeCoins;
 export declare const isWormholeAsset: (coinName: any) => coinName is SupportWormholeCoins;
 export declare const parseAssetSymbol: (coinName: SupportCoins) => string;

package/package.json

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

package/src/builders/borrowIncentiveBuilder.ts

@@ -255,13 +255,14 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
           const bindedVeScaKey =
             await builder.query.getBindedVeScaKey(obligationArg);
 
-          if ((veScaKey && veScaKey !== bindedVeScaKey) || !bindedVeScaKey) {
+          const _veScaKey = bindedVeScaKey ?? veScaKey;
+          if (!_veScaKey) {
             txBlock.stakeObligation(obligationArg, obligationKeyArg);
           } else {
             txBlock.stakeObligationWithVesca(
               obligationArg,
               obligationKeyArg,
-              bindedVeScaKey
+              _veScaKey
             );
           }
         }

package/src/constants/coinGecko.ts

@@ -0,0 +1,18 @@
+import { SupportPoolCoins } from 'src/types/constant/common';
+
+export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
+  usdc: 'usdc-coin',
+  sbeth: 'ethereum',
+  weth: 'ethereum',
+  wbtc: 'bitcoin',
+  wusdc: 'usdc-coin',
+  wusdt: 'tether',
+  sui: 'sui',
+  wapt: 'aptos',
+  wsol: 'solana',
+  cetus: 'cetus-protocol',
+  afsui: 'sui',
+  hasui: 'sui',
+  vsui: 'sui',
+  sca: 'scallop-2',
+};

package/src/constants/index.ts

@@ -1,6 +1,12 @@
+export * from './cache';
+export * from './coinGecko';
 export * from './common';
 export * from './enum';
 export * from './flashloan';
+export * from './poolAddress';
+export * from './pyth';
 export * from './queryKeys';
+export * from './testAddress';
+export * from './tokenBucket';
 export * from './vesca';
 export * from './testAddress';

package/src/constants/poolAddress.ts

@@ -0,0 +1,94 @@
+import { SupportPoolCoins } from 'src/types';
+
+export const POOL_ADDRESSES: Record<
+  SupportPoolCoins,
+  {
+    lendingPoolAddress: string;
+    collateralPoolAddress: string;
+  }
+> = {
+  usdc: {
+    lendingPoolAddress:
+      '0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f',
+    collateralPoolAddress:
+      '0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af',
+  },
+  sbeth: {
+    lendingPoolAddress:
+      '0x5f08c4f71d56dd3342c452cc70ffc47f2f4180146d821941b0b9c04761bb42e7',
+    collateralPoolAddress:
+      '0xce0549a1cbe952e734f56646988e6b02bbae14667889a60e24d0d03540a6119f',
+  },
+  weth: {
+    lendingPoolAddress:
+      '0xc8fcdff48efc265740ae0b74aae3faccae9ec00034039a113f3339798035108c',
+    collateralPoolAddress:
+      '0xad7ced91ed6e7f2b81805561eee27fa6f3e72fdae561077334c7248583db4dbf',
+  },
+  wbtc: {
+    lendingPoolAddress:
+      '0x65cc08a5aca0a0b8d72e1993ded8d145f06dd102fd0d8f285b92934faed564ab',
+    collateralPoolAddress:
+      '0x1aa4e5cf743cd797b4eb8bf1e614f80ae2cf556ced426cddaaf190ffcd0e59c3',
+  },
+  wusdc: {
+    lendingPoolAddress:
+      '0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8',
+    collateralPoolAddress:
+      '0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb',
+  },
+  wusdt: {
+    lendingPoolAddress:
+      '0xfbc056f126dd35adc1f8fe985e2cedc8010e687e8e851e1c5b99fdf63cd1c879',
+    collateralPoolAddress:
+      '0x2260cb5b24929dd20a1742f37a61ff3ce4fde5cdb023e2d3ce2e0ce2d90719e3',
+  },
+  sui: {
+    lendingPoolAddress:
+      '0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8',
+    collateralPoolAddress:
+      '0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb',
+  },
+  wapt: {
+    lendingPoolAddress:
+      '0xca8c14a24e0c32b198eaf479a3317461e3cc339097ce88eaf296a15df8dcfdf5',
+    collateralPoolAddress:
+      '0xde33f9ac5bb0ed34598da4e64b4983832716ced65f172fbf267bcfe859c4ad9c',
+  },
+  wsol: {
+    lendingPoolAddress:
+      '0x985682c42984cdfb03f9ff7d8923344c2fe096b1ae4b82ea17721af19d22a21f',
+    collateralPoolAddress:
+      '0xdc1cc2c371a043ae8e3c3fe2d013c35f1346960b7dbb4c072982c5b794ed144f',
+  },
+  cetus: {
+    lendingPoolAddress:
+      '0xc09858f60e74a1b671635bec4e8a2c84a0ff313eb87f525fba3258e88c6b6282',
+    collateralPoolAddress:
+      '0xe363967e29b7b9c1245d6d46d63e719de8f90b37e3358c545b55d945ea0b676a',
+  },
+  afsui: {
+    lendingPoolAddress:
+      '0x9b942a24ce390b7f5016d34a0217057bf9487b92aa6d7cc9894271dbbe62471a',
+    collateralPoolAddress:
+      '0xe5e56f5c0e3072760b21f9d49a5cc793f37d736c412a9065c16e1265c74e6341',
+  },
+  hasui: {
+    lendingPoolAddress:
+      '0x7ebc607f6bdeb659fb6506cb91c5cc1d47bb365cfd5d2e637ea765346ec84ed4',
+    collateralPoolAddress:
+      '0xad9ed40d6486e4c26cec7370dffce8dc4821eb79178250b5938a34ccafd61e6d',
+  },
+  vsui: {
+    lendingPoolAddress:
+      '0xda9257c0731d8822e8a438ebced13415850d705b779c79958dcf2aeb21fcb43d',
+    collateralPoolAddress:
+      '0x4435e8b8ec2a04094d863aa52deb6ab6f8f47ed8778f4d9f1b27afc4a6e85f1e',
+  },
+  sca: {
+    lendingPoolAddress:
+      '0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7',
+    collateralPoolAddress:
+      '0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31',
+  },
+};

package/src/constants/pyth.ts

@@ -1,6 +1,25 @@
+import { SupportPoolCoins } from 'src/types';
+
 export const PYTH_ENDPOINTS: {
   [k in 'mainnet' | 'testnet']: string[];
 } = {
   testnet: ['https://hermes-beta.pyth.network'],
   mainnet: ['https://hermes.pyth.network', 'https://scallop.rpc.p2p.world'],
 };
+
+export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
+  usdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+  sbeth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
+  weth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
+  wbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
+  wusdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+  wusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
+  sui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+  wapt: '03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5',
+  wsol: 'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
+  cetus: 'e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef',
+  afsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+  hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+  vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+  sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
+};

package/src/models/scallopClient.ts

@@ -518,7 +518,7 @@ export class ScallopClient {
     );
     txBlock.transferObjects([coin], sender);
     if (sign && availableStake) {
-      await txBlock.stakeObligationQuick(obligationId, obligationKey);
+      await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKey);
     }
 
     if (sign) {
@@ -560,7 +560,7 @@ export class ScallopClient {
     }
     await txBlock.repayQuick(amount, poolCoinName, obligationId);
     if (sign && availableStake) {
-      await txBlock.stakeObligationQuick(obligationId, obligationKey);
+      await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKey);
     }
 
     if (sign) {
@@ -902,7 +902,7 @@ export class ScallopClient {
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
-    await txBlock.stakeObligationQuick(obligationId, obligationKeyId);
+    await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKeyId);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(

package/src/models/scallopIndexer.ts

@@ -264,4 +264,13 @@ export class ScallopIndexer {
       throw Error('Failed to getTotalValueLocked.');
     }
   }
+
+  /**
+   * Get coin price index data.
+   *
+   * @return price data.
+   */
+  public async getCoinPrice(poolCoinName: SupportPoolCoins): Promise<number> {
+    return (await this.getMarketPool(poolCoinName))?.coinPrice ?? 0;
+  }
 }

package/src/models/scallopQuery.ts

@@ -755,4 +755,13 @@ export class ScallopQuery {
   public async isIsolatedAsset(assetCoinName: SupportAssetCoins) {
     return isIsolatedAsset(this.utils, assetCoinName);
   }
+
+  /**
+   * Get pool coin price from indexer
+   * @param coinName
+   * @returns price data
+   */
+  public async getCoinPriceByIndexer(poolName: SupportPoolCoins) {
+    return this.indexer.getCoinPrice(poolName);
+  }
 }

package/src/models/scallopUtils.ts

@@ -18,6 +18,8 @@ import {
   SUPPORT_SCOIN,
   sCoinIds,
   suiBridgeCoins,
+  COIN_GECKGO_IDS,
+  POOL_ADDRESSES,
 } from '../constants';
 import { getPythPrice, queryObligation } from '../queries';
 import {
@@ -28,7 +30,7 @@ import {
   isSuiBridgeAsset,
   isWormholeAsset,
 } from '../utils';
-import { PYTH_ENDPOINTS } from 'src/constants/pyth';
+import { PYTH_ENDPOINTS, PYTH_FEED_IDS } from 'src/constants/pyth';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import type {
@@ -45,6 +47,7 @@ import type {
   ScallopUtilsInstanceParams,
   SupportSuiBridgeCoins,
   SupportWormholeCoins,
+  PoolAddressInfo,
 } from '../types';
 import { queryKeys } from 'src/constants';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
@@ -681,4 +684,25 @@ export class ScallopUtils {
     }
     return findClosestUnlockRound(newUnlockAtInSecondTimestamp);
   }
+
+  /**
+   * Get detailed contract address and price id information for supported pool in Scallop
+   * @returns Supported pool informations
+   */
+  public getSupportedPoolAddresses(): PoolAddressInfo[] {
+    return SUPPORT_POOLS.map((poolName) => {
+      const sCoinName = this.parseSCoinName(poolName)!;
+      return {
+        name: this.parseSymbol(poolName),
+        coingeckoId: COIN_GECKGO_IDS[poolName],
+        decimal: coinDecimals[poolName],
+        pythFeedId: PYTH_FEED_IDS[poolName],
+        ...POOL_ADDRESSES[poolName],
+        sCoinAddress: sCoinIds[sCoinName],
+        marketCoinAddress: this.parseMarketCoinType(poolName),
+        coinAddress: this.parseCoinType(poolName),
+        sCoinName: sCoinName ? this.parseSymbol(sCoinName) : undefined,
+      };
+    });
+  }
 }

package/src/queries/coreQuery.ts

@@ -741,6 +741,9 @@ export const getObligations = async (
         filter: {
           StructType: `${protocolObjectId}::obligation::ObligationKey`,
         },
+        options: {
+          showContent: true,
+        },
         cursor: nextCursor,
         limit: 10,
       });
@@ -759,17 +762,15 @@ export const getObligations = async (
     }
   } while (hasNextPage);
 
-  const keyObjectIds: string[] = keyObjectsResponse
-    .map((ref: any) => ref?.data?.objectId)
-    .filter((id: any) => id !== undefined);
-  const keyObjects = await address.cache.queryGetObjects(keyObjectIds);
+  const keyObjects = keyObjectsResponse.filter((ref) => !!ref.data);
 
   const obligations: Obligation[] = [];
   await Promise.allSettled(
-    keyObjects.map(async (keyObject) => {
-      const keyId = keyObject.objectId;
-      if (keyObject.content && 'fields' in keyObject.content) {
-        const fields = keyObject.content.fields as any;
+    keyObjects.map(async ({ data }) => {
+      const keyId = data?.objectId;
+      const content = data?.content;
+      if (keyId && content && 'fields' in content) {
+        const fields = content.fields as any;
         const obligationId = String(fields.ownership.fields.of);
         const locked = await getObligationLocked(address.cache, obligationId);
         obligations.push({ id: obligationId, keyId, locked });

package/src/queries/portfolioQuery.ts

@@ -239,6 +239,7 @@ export const getLending = async (
     symbol: query.utils.parseSymbol(poolCoinName),
     coinType: query.utils.parseCoinType(poolCoinName),
     marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
+    sCoinType: marketPool?.sCoinType ?? '',
     coinDecimal: coinDecimal,
     coinPrice: coinPrice ?? 0,
     conversionRate: marketPool?.conversionRate ?? 1,

package/src/queries/spoolQuery.ts

@@ -210,6 +210,7 @@ export const getSpool = async (
         rewardCoinType: isMarketCoin(rewardCoinName)
           ? query.utils.parseMarketCoinType(rewardCoinName)
           : query.utils.parseCoinType(rewardCoinName),
+        sCoinType: marketPool.sCoinType,
         coinDecimal: query.utils.getCoinDecimal(coinName),
         rewardCoinDecimal: query.utils.getCoinDecimal(rewardCoinName),
         coinPrice: coinPrices?.[coinName] ?? 0,

package/src/queries/vescaQuery.ts

@@ -72,7 +72,7 @@ export const getVeScas = async (
   }: {
     utils: ScallopUtils;
   },
-  ownerAddress?: string,
+  ownerAddress: string,
   excludeEmpty?: boolean
 ) => {
   const keyObjectDatas = await getVescaKeys(utils, ownerAddress);
@@ -88,7 +88,7 @@ export const getVeScas = async (
 
   const result = veScas
     .filter(Boolean)
-    .sort((a, b) => b!.currentVeScaBalance - a!.currentVeScaBalance);
+    .sort((a, b) => b.currentVeScaBalance - a.currentVeScaBalance);
 
   if (excludeEmpty) {
     return result.filter((v) => v.lockedScaAmount !== '0');
@@ -113,11 +113,9 @@ type SuiObjectRefType = zod.infer<typeof SuiObjectRefZod>;
  */
 export const getVeSca = async (
   utils: ScallopUtils,
-  veScaKey?: string | SuiObjectData,
-  ownerAddress?: string
+  veScaKey: string | SuiObjectData
 ) => {
   const tableId = utils.address.get(`vesca.tableId`);
-  veScaKey = veScaKey || (await getVescaKeys(utils, ownerAddress))[0];
 
   if (!veScaKey) return undefined;
   if (typeof veScaKey === 'object') {
@@ -168,7 +166,7 @@ export const getVeSca = async (
       lockedScaCoin,
       currentVeScaBalance,
       unlockAt: BigNumber(dynamicFields.unlock_at * 1000).toNumber(),
-    } as Vesca;
+    };
   }
 
   return vesca;

package/src/types/query/portfolio.ts

@@ -22,6 +22,7 @@ export type Lending = Required<
     | 'symbol'
     | 'coinType'
     | 'marketCoinType'
+    | 'sCoinType'
     | 'coinDecimal'
     | 'coinPrice'
     | 'conversionRate'

package/src/types/query/spool.ts

@@ -12,6 +12,7 @@ export type Spool = {
   coinType: string;
   marketCoinType: string;
   rewardCoinType: string;
+  sCoinType: string;
   coinDecimal: number;
   rewardCoinDecimal: number;
   coinPrice: number;

package/src/types/query/vesca.ts

@@ -4,7 +4,7 @@ export type Vesca = {
   id: string;
   keyId: string;
   keyObject?: SuiObjectRef;
-  object?: SuiObjectRef;
+  object: SuiObjectRef;
   lockedScaAmount: string;
   lockedScaCoin: number;
   currentVeScaBalance: number;

package/src/types/utils.ts

@@ -13,3 +13,16 @@ export type PriceMap = Map<
     publishTime: number;
   }
 >;
+
+export type PoolAddressInfo = {
+  name: string;
+  coingeckoId: string;
+  decimal: number;
+  pythFeedId: string;
+  lendingPoolAddress: string;
+  collateralPoolAddress: string;
+  sCoinAddress: string | undefined;
+  marketCoinAddress: string;
+  coinAddress: string;
+  sCoinName: string | undefined;
+};

package/src/utils/util.ts

@@ -14,6 +14,7 @@ import type {
   SupportAssetCoins,
   SupportCoins,
   SupportMarketCoins,
+  SupportSCoin,
   SupportSuiBridgeCoins,
   SupportWormholeCoins,
 } from '../types';
@@ -30,7 +31,7 @@ const COIN_SET = Array.from(
 
 export const isMarketCoin = (
   coinName: SupportCoins
-): coinName is SupportMarketCoins => {
+): coinName is SupportMarketCoins | SupportSCoin => {
   const assetCoinName = coinName.slice(1).toLowerCase() as SupportAssetCoins;
   return (
     coinName.charAt(0).toLowerCase() === 's' && COIN_SET.includes(assetCoinName)