@scallop-io/sui-scallop-sdk 1.3.4-isolated-asset.2 → 1.3.5-alpha.1

package/dist/models/scallopQuery.d.ts

@@ -69,8 +69,6 @@ export declare class ScallopQuery {
         hasui?: MarketPool | undefined;
         vsui?: MarketPool | undefined;
         sca?: MarketPool | undefined;
-        fud?: MarketPool | undefined;
-        deep?: MarketPool | undefined;
     }>;
     /**
      * Get  market pool
@@ -297,7 +295,8 @@ export declare class ScallopQuery {
      * @return Borrow incentive pools data.
      */
     getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, args?: {
-        coinPrices: CoinPrices;
+        marketPools?: MarketPools;
+        coinPrices?: CoinPrices;
     }): Promise<{
         usdc?: import("../types").BorrowIncentivePool | undefined;
         sbeth?: import("../types").BorrowIncentivePool | undefined;
@@ -352,8 +351,6 @@ export declare class ScallopQuery {
         hasui?: import("../types").Lending | undefined;
         vsui?: import("../types").Lending | undefined;
         sca?: import("../types").Lending | undefined;
-        fud?: import("../types").Lending | undefined;
-        deep?: import("../types").Lending | undefined;
     }>;
     /**
      * Get user lending and spool information for specific pool.
@@ -471,7 +468,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", number>>;
     /**
      * Get supply limit of lending pool
      */
@@ -494,4 +491,41 @@ export declare class ScallopQuery {
      * @returns price data
      */
     getCoinPriceByIndexer(poolName: SupportPoolCoins): Promise<number>;
+    /**
+     * Get all coin prices, including sCoin
+     * @returns prices data
+     */
+    getAllCoinPrices(args?: {
+        marketPools?: MarketPools;
+        coinPrices?: CoinPrices;
+    }): Promise<{
+        susdc?: number | undefined;
+        ssbeth?: number | undefined;
+        sweth?: number | undefined;
+        swbtc?: number | undefined;
+        swusdc?: number | undefined;
+        swusdt?: number | undefined;
+        ssui?: number | undefined;
+        swsol?: number | undefined;
+        scetus?: number | undefined;
+        safsui?: number | undefined;
+        shasui?: number | undefined;
+        svsui?: number | undefined;
+        ssca?: number | undefined;
+        usdc?: number | undefined;
+        sbeth?: number | undefined;
+        weth?: number | undefined;
+        wbtc?: number | undefined;
+        wusdc?: number | undefined;
+        wusdt?: number | undefined;
+        sui?: number | undefined;
+        wapt?: number | undefined;
+        wsol?: number | undefined;
+        cetus?: number | undefined;
+        afsui?: number | undefined;
+        hasui?: number | undefined;
+        vsui?: number | undefined;
+        sca?: number | undefined;
+        swapt?: number | undefined;
+    }>;
 }

package/dist/models/scallopUtils.d.ts

@@ -58,6 +58,13 @@ export declare class ScallopUtils {
      * @return sCoin name.
      */
     parseSCoinName<T extends SupportSCoin>(coinName: SupportCoins | SupportMarketCoins): T | undefined;
+    /**
+     * Convert sCoin name to coin name.
+     * This function will parse new sCoin name `scallop_...` to its old market coin name which is shorter
+     * e.g: `scallop_sui -> ssui
+     * @return sCoin name
+     */
+    parseCoinNameFromSCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca";
     /**
      * Convert sCoin name into sCoin type
      * @param sCoinName
@@ -130,7 +137,7 @@ export declare class ScallopUtils {
      * @param borrowIncentiveCoinName - Support borrow incentive coin.
      * @return Borrow incentive reward coin name.
      */
-    getBorrowIncentiveRewardCoinName: (borrowIncentiveCoinName: SupportBorrowIncentiveCoins) => ("sui" | "sca")[];
+    getBorrowIncentiveRewardCoinName: (borrowIncentiveCoinName: SupportBorrowIncentiveCoins) => ("usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca")[];
     /**
      * Get coin decimal.
      *
@@ -188,7 +195,7 @@ export declare class ScallopUtils {
      * @param assetCoinNames - Specific an array of support asset coin name.
      * @return  Asset coin price.
      */
-    getCoinPrices(_?: SupportAssetCoins[]): Promise<import("../types").OptionalKeys<Record<SupportAssetCoins, number>>>;
+    getCoinPrices(_?: SupportAssetCoins[]): Promise<import("../types").OptionalKeys<Record<SupportCoins, number>>>;
     /**
      * Convert apr to apy.
      *

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -1,5 +1,5 @@
 import type { ScallopAddress, ScallopQuery, ScallopUtils } from '../models';
-import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool, CoinPrices } from '../types';
+import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool, CoinPrices, MarketPools } from '../types';
 /**
  * Query borrow incentive pools data using moveCall
  * @param address
@@ -14,7 +14,7 @@ export declare const queryBorrowIncentivePools: (address: ScallopAddress) => Pro
  * @param indexer - Whether to use indexer.
  * @return Borrow incentive pools data.
  */
-export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, coinPrices?: CoinPrices) => Promise<{
+export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
     usdc?: BorrowIncentivePool | undefined;
     sbeth?: BorrowIncentivePool | undefined;
     weth?: BorrowIncentivePool | undefined;

package/dist/queries/coreQuery.d.ts

@@ -40,8 +40,6 @@ export declare const getMarketPools: (query: ScallopQuery, poolCoinNames?: Suppo
     hasui?: MarketPool | undefined;
     vsui?: MarketPool | undefined;
     sca?: MarketPool | undefined;
-    fud?: MarketPool | undefined;
-    deep?: MarketPool | undefined;
 }>;
 /**
  * Get market pool data.

package/dist/queries/portfolioQuery.d.ts

@@ -24,8 +24,6 @@ export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportP
     hasui?: Lending | undefined;
     vsui?: Lending | undefined;
     sca?: Lending | undefined;
-    fud?: Lending | undefined;
-    deep?: Lending | undefined;
 }>;
 /**
  * Get user lending infomation for specific pool.

package/dist/queries/priceQuery.d.ts

@@ -1,6 +1,6 @@
 import { SuiObjectData } from '@mysten/sui/client';
-import type { ScallopAddress } from '../models';
-import type { SupportAssetCoins } from '../types';
+import type { ScallopAddress, ScallopQuery } from '../models';
+import type { CoinPrices, MarketPools, SupportAssetCoins } from '../types';
 /**
  * Get price from pyth fee object.
  *
@@ -14,3 +14,33 @@ export declare const getPythPrice: ({ address, }: {
 export declare const getPythPrices: ({ address, }: {
     address: ScallopAddress;
 }, assetCoinNames: SupportAssetCoins[]) => Promise<Record<SupportAssetCoins, number>>;
+export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
+    susdc?: number | undefined;
+    ssbeth?: number | undefined;
+    sweth?: number | undefined;
+    swbtc?: number | undefined;
+    swusdc?: number | undefined;
+    swusdt?: number | undefined;
+    ssui?: number | undefined;
+    swsol?: number | undefined;
+    scetus?: number | undefined;
+    safsui?: number | undefined;
+    shasui?: number | undefined;
+    svsui?: number | undefined;
+    ssca?: number | undefined;
+    usdc?: number | undefined;
+    sbeth?: number | undefined;
+    weth?: number | undefined;
+    wbtc?: number | undefined;
+    wusdc?: number | undefined;
+    wusdt?: number | undefined;
+    sui?: number | undefined;
+    wapt?: number | undefined;
+    wsol?: number | undefined;
+    cetus?: number | undefined;
+    afsui?: number | undefined;
+    hasui?: number | undefined;
+    vsui?: number | undefined;
+    sca?: number | undefined;
+    swapt?: number | undefined;
+}>;

package/dist/types/constant/common.d.ts

@@ -2,7 +2,7 @@ import { SUPPORT_POOLS, SUPPORT_COLLATERALS, SUPPORT_ORACLES, SUPPORT_PACKAGES,
 type ParseMarketCoins<T extends string> = `s${T}`;
 type ParseCoins<T extends string> = T extends `s${infer R}` ? R : never;
 export type SupportCoins = SupportAssetCoins | SupportMarketCoins | SupportStakeMarketCoins | SupportSCoin;
-export type SupportAssetCoins = SupportPoolCoins | SupportCollateralCoins | SupportStakeRewardCoins | SupportBorrowIncentiveRewardCoins;
+export type SupportAssetCoins = SupportPoolCoins | SupportCollateralCoins | SupportStakeRewardCoins;
 export type SupportPoolCoins = (typeof SUPPORT_POOLS)[number];
 export type SupportCollateralCoins = (typeof SUPPORT_COLLATERALS)[number];
 export type SupportMarketCoins = ParseMarketCoins<SupportPoolCoins> | SupportStakeMarketCoins;

package/dist/types/utils.d.ts

@@ -1,12 +1,8 @@
-import type { SupportAssetCoins } from './constant';
+import type { SupportCoins } from './constant';
 export type OptionalKeys<T> = {
     [K in keyof T]?: T[K];
 };
-export type CoinPrices = OptionalKeys<Record<SupportAssetCoins, number>>;
-export type PriceMap = Map<SupportAssetCoins, {
-    price: number;
-    publishTime: number;
-}>;
+export type CoinPrices = OptionalKeys<Record<SupportCoins, number>>;
 export type PoolAddressInfo = {
     name: string;
     coingeckoId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.3.4-isolated-asset.2",
+  "version": "1.3.5-alpha.1",
   "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',
-  deep: 'deepbook',
-  fud: 'fud-the-pug',
+  // TODO: enable for production
+  // deep: 'deepbook',
+  // fud: 'fud-the-pug',
 };

package/src/constants/common.ts

@@ -7,7 +7,8 @@ export const USE_TEST_ADDRESS: boolean = false;
 export const ADDRESSES_ID =
   IS_VE_SCA_TEST || USE_TEST_ADDRESS
     ? ('65fb07c39c845425d71d7b18' as const)
-    : ('66f8e7ed9bb9e07fdfb86bbb' as const);
+    : ('675c65cd301dd817ea262e76' as const);
+// : ('66f8e7ed9bb9e07fdfb86bbb' as const);
 // : ('664dfe22898c36c159e28bc8' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
@@ -44,8 +45,9 @@ export const SUPPORT_POOLS = [
   'hasui',
   'vsui',
   'sca',
-  'fud',
-  'deep',
+  // TODO: enable for production
+  // 'fud',
+  // 'deep',
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
@@ -91,6 +93,9 @@ export const SUPPORT_SCOIN = [
   'scetus',
   'swsol',
   'swbtc',
+  // TODO: enable for production
+  // 'sdeep',
+  // 'sfud',
 ] as const;
 
 export const SUPPORT_SUI_BRIDGE = ['sbeth'] as const;
@@ -118,7 +123,10 @@ export const SUPPORT_BORROW_INCENTIVE_POOLS = [
   'usdc',
 ] as const;
 
-export const SUPPORT_BORROW_INCENTIVE_REWARDS = ['sui', 'sca'] as const;
+export const SUPPORT_BORROW_INCENTIVE_REWARDS = [
+  ...SUPPORT_POOLS,
+  ...SUPPORT_SCOIN,
+] as const;
 export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
 
 export const SUPPORT_PACKAGES = [

package/src/constants/enum.ts

@@ -16,8 +16,9 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
-  deep: 6,
-  fud: 5,
+  // TODO: enable for production
+  // deep: 6,
+  // fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -32,8 +33,9 @@ export const coinDecimals: types.SupportCoinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
-  sdeep: 6,
-  sfud: 5,
+  // TODO: enable for production
+  // sdeep: 6,
+  // sfud: 5,
 };
 
 export const assetCoins: types.AssetCoins = {
@@ -51,8 +53,9 @@ export const assetCoins: types.AssetCoins = {
   hasui: 'hasui',
   vsui: 'vsui',
   sca: 'sca',
-  deep: 'deep',
-  fud: 'fud',
+  // TODO: enable for production
+  // deep: 'deep',
+  // fud: 'fud',
 };
 
 export const marketCoins: types.MarketCoins = {
@@ -70,8 +73,9 @@ export const marketCoins: types.MarketCoins = {
   shasui: 'shasui',
   svsui: 'svsui',
   ssca: 'ssca',
-  sdeep: 'sdeep',
-  sfud: 'sfud',
+  // TODO: enable for production
+  // sdeep: 'sdeep',
+  // sfud: 'sfud',
 };
 
 export const sCoins: types.SCoins = {
@@ -88,6 +92,9 @@ export const sCoins: types.SCoins = {
   ssca: 'ssca',
   swsol: 'swsol',
   swbtc: 'swbtc',
+  // TODO: enable for production
+  // sfud: 'sfud',
+  // sdeep: 'sdeep',
 };
 
 export const stakeMarketCoins: types.StakeMarketCoins = {
@@ -119,16 +126,16 @@ export const suiBridgeCoins: types.SuiBridgeCoins = {
 };
 
 export const borrowIncentiveRewardCoins: types.BorrowIncentiveRewardCoins = {
-  usdc: ['sui', 'sca'],
-  sui: ['sui', 'sca'],
-  wusdc: ['sui', 'sca'],
-  wusdt: ['sui', 'sca'],
-  sca: ['sui', 'sca'],
-  afsui: ['sui'],
-  hasui: ['sui'],
-  vsui: ['sui'],
-  weth: ['sui'],
-  sbeth: ['sui'],
+  usdc: ['ssui', 'ssca'],
+  sui: ['ssui', 'ssca'],
+  wusdc: ['ssui', 'ssca'],
+  wusdt: ['ssui', 'ssca'],
+  sca: ['ssui', 'ssca'],
+  afsui: ['ssui'],
+  hasui: ['ssui'],
+  vsui: ['ssui'],
+  weth: ['ssui'],
+  sbeth: ['ssui'],
 };
 
 export const coinIds: types.AssetCoinIds = {
@@ -149,8 +156,8 @@ export const coinIds: types.AssetCoinIds = {
     ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
     : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
   // isolated assets
-  deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP',
-  fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD',
+  // deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
+  // fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
 };
 
 export const wormholeCoinIds: types.WormholeCoinIds = {
@@ -172,24 +179,24 @@ export const sCoinIds: types.SCoinIds = {
     '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
   ssbeth:
     '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
-  ssui:
-    // TODO: use prod value
-    // '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
-    '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',
-  scetus:
-    '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
-  ssca:
-    // TODO: use prod value
-    // '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-    '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
-  swusdc:
-    // TODO: use prod value
-    // '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-    '0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  // prod values
+  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  // swusdc:
+  //   '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  // swusdt:
+  //   '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  // ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
+
+  // test values
+  ssui: '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',
   swusdt:
-    // TODO: use prod value
-    // '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
     '0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  swusdc:
+    '0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  ssca: '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
+
+  scetus:
+    '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
   sweth:
     '0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
   safsui:
@@ -202,6 +209,9 @@ export const sCoinIds: types.SCoinIds = {
     '0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL',
   swbtc:
     '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
+  // sdeep:
+  //   '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
+  // sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
 } as const;
 
 export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
@@ -212,23 +222,20 @@ export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
   {} as Record<string, types.SupportSCoin>
 );
 
+export const sCoinRawNameToName = Object.entries(sCoinIds).reduce(
+  (acc, [coinName, coinType]) => {
+    acc[coinType.split('::')[2].toLowerCase()] = coinName as types.SupportSCoin;
+    return acc;
+  },
+  {} as Record<string, types.SupportSCoin>
+);
+
 // TEST VERSION
 // export const sCoinIds: types.SCoinIds = {
-//   ssui: '0xfac769100bccc0caebcf4f4e2d00ac2f8883f07f724be28940df90605f5e7e9a::scallop_sui::SCALLOP_SUI',
-//   scetus:
-//     '0x8b71e6d323ed78515af2bead13bf3d0da1562ba4a99234eb7c4f14fd39ef0427::scallop_cetus::SCALLOP_CETUS',
-//   ssca: '0x0a9d3c6c9af9f6e8def82921541bcbd17f73ed31bed3adcb684f2a4c267e42f0::scallop_sca::SCALLOP_SCA',
-//   swusdc:
-//     '0xaedc3ab75db8680b81a755015fa90124d217be93457b893c05bac033817defaf::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-//   swusdt:
-//     '0xbf02fc87ddc104b342ad8414c85ceadf5b0c823c055a06fb0ed776272c01a52a::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
-//   sweth: '0x27d54f43e3eda701be56b82e5756e41c84467cd202f5cf713d5f9e45a9f1b6bc::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
-//   safsui:
-//     '0xb75b46d975d8d80670b53a6bee90baaa8ce2e0b7d397f079447d641eef6b44ad::scallop_af_sui::SCALLOP_AF_SUI',
-//   shasui:
-//     '0xd973a723874e2c7cde196602a79155a1343a933f8cf87d9b1bb7408bc1acbc58::scallop_ha_sui::SCALLOP_HA_SUI',
-//   svsui:
-//     '0x97023a317320c4498cc4cd239dd02fd30c28246e5e8f81325d63f2bd8d70f6b3::scallop_v_sui::SCALLOP_V_SUI',
+// ssui: '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',
+// swusdt: '0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+// swusdc: '0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+// ssca: '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
 // } as const;
 
 // export const sCoinTreasuryCaps: types.SCoinTreasuryCaps = {

package/src/constants/poolAddress.ts

@@ -4,7 +4,7 @@ export const POOL_ADDRESSES: Record<
   SupportPoolCoins,
   {
     lendingPoolAddress: string;
-    collateralPoolAddress?: string;
+    collateralPoolAddress?: string; // not all pool has collateral
   }
 > = {
   usdc: {
@@ -91,10 +91,13 @@ export const POOL_ADDRESSES: Record<
     collateralPoolAddress:
       '0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31',
   },
-  fud: {
-    lendingPoolAddress: '',
-  },
-  deep: {
-    lendingPoolAddress: '',
-  },
+  // TODO: enable for production
+  // fud: {
+  //   lendingPoolAddress:
+  //     '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
+  // },
+  // deep: {
+  //   lendingPoolAddress:
+  //     '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
+  // },
 };

package/src/constants/pyth.ts

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

package/src/constants/tokenBucket.ts

@@ -1,2 +1,2 @@
-export const DEFAULT_TOKENS_PER_INTERVAL = 10;
+export const DEFAULT_TOKENS_PER_INTERVAL = 50;
 export const DEFAULT_INTERVAL_IN_MS = 300;

package/src/models/scallopQuery.ts

@@ -47,6 +47,7 @@ import {
   getSCoinAmounts,
   getSCoinSwapRate,
   getSCoinTotalSupply,
+  getAllCoinPrices,
 } from '../queries';
 import {
   ScallopQueryParams,
@@ -537,12 +538,13 @@ export class ScallopQuery {
   public async getBorrowIncentivePools(
     coinNames?: SupportBorrowIncentiveCoins[],
     indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
+    args?: { marketPools?: MarketPools; coinPrices?: CoinPrices }
   ) {
     return await getBorrowIncentivePools(
       this,
       coinNames,
       indexer,
+      args?.marketPools,
       args?.coinPrices
     );
   }
@@ -817,4 +819,15 @@ export class ScallopQuery {
   public async getCoinPriceByIndexer(poolName: SupportPoolCoins) {
     return this.indexer.getCoinPrice(poolName);
   }
+
+  /**
+   * Get all coin prices, including sCoin
+   * @returns prices data
+   */
+  public async getAllCoinPrices(args?: {
+    marketPools?: MarketPools;
+    coinPrices?: CoinPrices;
+  }) {
+    return getAllCoinPrices(this, args?.marketPools, args?.coinPrices);
+  }
 }

package/src/models/scallopUtils.ts

@@ -21,6 +21,7 @@ import {
   COIN_GECKGO_IDS,
   POOL_ADDRESSES,
   sCoinTypeToName,
+  sCoinRawNameToName,
 } from '../constants';
 import { getPythPrices, queryObligation } from '../queries';
 import {
@@ -225,6 +226,16 @@ export class ScallopUtils {
     }
   }
 
+  /**
+   * Convert sCoin name to coin name.
+   * This function will parse new sCoin name `scallop_...` to its old market coin name which is shorter
+   * e.g: `scallop_sui -> ssui
+   * @return sCoin name
+   */
+  public parseCoinNameFromSCoinName(coinName: string) {
+    return sCoinRawNameToName[coinName];
+  }
+
   /**
    * Convert sCoin name into sCoin type
    * @param sCoinName
@@ -297,12 +308,13 @@ export class ScallopUtils {
   ): T extends SupportCoins ? T : SupportCoins;
   public parseCoinNameFromType(coinType: string) {
     coinType = normalizeStructTag(coinType);
+
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes('reserve::MarketCoin');
     coinType = coinTypeMatch?.[1] ?? coinType;
 
-    const wormHoleCoinTypeMap: Record<string, SupportAssetCoins> = {
+    const wormholeCoinTypeMap: Record<string, SupportAssetCoins> = {
       [`${
         this.address.get('core.coins.wusdc.id') ?? wormholeCoinIds.wusdc
       }::coin::COIN`]: 'wusdc',
@@ -339,7 +351,7 @@ export class ScallopUtils {
     );
 
     const assetCoinName =
-      wormHoleCoinTypeMap[coinType] ||
+      wormholeCoinTypeMap[coinType] ||
       voloCoinTypeMap[coinType] ||
       suiBridgeTypeMap[coinType] ||
       (coinType.split('::')[2].toLowerCase() as SupportAssetCoins);