@scallop-io/sui-scallop-sdk 1.3.5-alpha.3 → 1.3.5-rc.1

package/dist/models/scallopQuery.d.ts

@@ -69,6 +69,8 @@ export declare class ScallopQuery {
         hasui?: MarketPool | undefined;
         vsui?: MarketPool | undefined;
         sca?: MarketPool | undefined;
+        fud?: MarketPool | undefined;
+        deep?: MarketPool | undefined;
     }>;
     /**
      * Get  market pool
@@ -351,6 +353,8 @@ 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.
@@ -453,7 +457,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", 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", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -468,7 +472,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", number>>;
+    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"usdc" | "sbeth" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep", number>>;
     /**
      * Get supply limit of lending pool
      */
@@ -512,6 +516,8 @@ export declare class ScallopQuery {
         shasui?: number | undefined;
         svsui?: number | undefined;
         ssca?: number | undefined;
+        sfud?: number | undefined;
+        sdeep?: number | undefined;
         usdc?: number | undefined;
         sbeth?: number | undefined;
         weth?: number | undefined;
@@ -526,6 +532,8 @@ export declare class ScallopQuery {
         hasui?: number | undefined;
         vsui?: number | undefined;
         sca?: number | undefined;
+        fud?: number | undefined;
+        deep?: number | undefined;
         swapt?: number | undefined;
     }>;
 }

package/dist/models/scallopUtils.d.ts

@@ -50,7 +50,7 @@ export declare class ScallopUtils {
      * @param coinName - Specific support coin name.
      * @return Coin type.
      */
-    parseCoinType(coinName: SupportCoins): string;
+    parseCoinType(coinName: SupportCoins, useOldMarketCoin?: boolean): string;
     /**
      * Convert coin name to sCoin name.
      *
@@ -64,7 +64,7 @@ export declare class ScallopUtils {
      * e.g: `scallop_sui -> ssui
      * @return sCoin name
      */
-    parseCoinNameFromSCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca";
+    parseCoinNameFromSCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
     /**
      * Convert sCoin name into sCoin type
      * @param sCoinName
@@ -76,7 +76,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";
+    parseSCoinNameFromType(sCoinType: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
     /**
      * Convert sCoin name into its underlying coin type
      * @param sCoinName

package/dist/queries/coreQuery.d.ts

@@ -40,6 +40,8 @@ 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,6 +24,8 @@ 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

@@ -28,6 +28,8 @@ export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: Marke
     shasui?: number | undefined;
     svsui?: number | undefined;
     ssca?: number | undefined;
+    sfud?: number | undefined;
+    sdeep?: number | undefined;
     usdc?: number | undefined;
     sbeth?: number | undefined;
     weth?: number | undefined;
@@ -42,5 +44,7 @@ export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: Marke
     hasui?: number | undefined;
     vsui?: number | undefined;
     sca?: number | undefined;
+    fud?: number | undefined;
+    deep?: 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", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/package.json

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

package/src/constants/coinGecko.ts

@@ -15,7 +15,6 @@ export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
   hasui: 'sui',
   vsui: 'sui',
   sca: 'scallop-2',
-  // TODO: enable for production
-  // deep: 'deepbook',
-  // fud: 'fud-the-pug',
+  deep: 'deepbook',
+  fud: 'fud-the-pug',
 };

package/src/constants/common.ts

@@ -9,7 +9,6 @@ export const ADDRESSES_ID =
     ? ('65fb07c39c845425d71d7b18' as const)
     : ('675c65cd301dd817ea262e76' as const);
 // : ('66f8e7ed9bb9e07fdfb86bbb' as const);
-// : ('664dfe22898c36c159e28bc8' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
   ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
@@ -45,9 +44,8 @@ export const SUPPORT_POOLS = [
   'hasui',
   'vsui',
   'sca',
-  // TODO: enable for production
-  // 'fud',
-  // 'deep',
+  'fud',
+  'deep',
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
@@ -93,9 +91,8 @@ export const SUPPORT_SCOIN = [
   'scetus',
   'swsol',
   'swbtc',
-  // TODO: enable for production
-  // 'sdeep',
-  // 'sfud',
+  'sdeep',
+  'sfud',
 ] as const;
 
 export const SUPPORT_SUI_BRIDGE = ['sbeth'] as const;

package/src/constants/enum.ts

@@ -16,9 +16,8 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
-  // TODO: enable for production
-  // deep: 6,
-  // fud: 5,
+  deep: 6,
+  fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -33,9 +32,8 @@ export const coinDecimals: types.SupportCoinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
-  // TODO: enable for production
-  // sdeep: 6,
-  // sfud: 5,
+  sdeep: 6,
+  sfud: 5,
 };
 
 export const assetCoins: types.AssetCoins = {
@@ -53,9 +51,8 @@ export const assetCoins: types.AssetCoins = {
   hasui: 'hasui',
   vsui: 'vsui',
   sca: 'sca',
-  // TODO: enable for production
-  // deep: 'deep',
-  // fud: 'fud',
+  deep: 'deep',
+  fud: 'fud',
 };
 
 export const marketCoins: types.MarketCoins = {
@@ -73,9 +70,8 @@ export const marketCoins: types.MarketCoins = {
   shasui: 'shasui',
   svsui: 'svsui',
   ssca: 'ssca',
-  // TODO: enable for production
-  // sdeep: 'sdeep',
-  // sfud: 'sfud',
+  sdeep: 'sdeep',
+  sfud: 'sfud',
 };
 
 export const sCoins: types.SCoins = {
@@ -92,9 +88,8 @@ export const sCoins: types.SCoins = {
   ssca: 'ssca',
   swsol: 'swsol',
   swbtc: 'swbtc',
-  // TODO: enable for production
-  // sfud: 'sfud',
-  // sdeep: 'sdeep',
+  sfud: 'sfud',
+  sdeep: 'sdeep',
 };
 
 export const stakeMarketCoins: types.StakeMarketCoins = {
@@ -143,8 +138,8 @@ export const coinIds: types.AssetCoinIds = {
     ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
     : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
   // isolated assets
-  // deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
-  // fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
+  deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
+  fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
 };
 
 export const wormholeCoinIds: types.WormholeCoinIds = {
@@ -166,22 +161,12 @@ export const sCoinIds: types.SCoinIds = {
     '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
   ssbeth:
     '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
-  // 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:
-    '0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
   swusdc:
-    '0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-  ssca: '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
-
+    '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  swusdt:
+    '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
   sweth:
@@ -196,9 +181,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',
+  sdeep:
+    '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
+  sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
 } as const;
 
 export const sCoinTypeToName = Object.entries(sCoinIds).reduce(

package/src/constants/poolAddress.ts

@@ -91,13 +91,12 @@ export const POOL_ADDRESSES: Record<
     collateralPoolAddress:
       '0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31',
   },
-  // TODO: enable for production
-  // fud: {
-  //   lendingPoolAddress:
-  //     '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
-  // },
-  // deep: {
-  //   lendingPoolAddress:
-  //     '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
-  // },
+  fud: {
+    lendingPoolAddress:
+      '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
+  },
+  deep: {
+    lendingPoolAddress:
+      '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
+  },
 };

package/src/constants/pyth.ts

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

package/src/models/scallopUtils.ts

@@ -156,9 +156,12 @@ export class ScallopUtils {
    * @param coinName - Specific support coin name.
    * @return Coin type.
    */
-  public parseCoinType(coinName: SupportCoins) {
+  public parseCoinType(
+    coinName: SupportCoins,
+    useOldMarketCoin: boolean = false
+  ) {
     // try parse scoin first
-    if (sCoinIds[coinName as SupportSCoin]) {
+    if (sCoinIds[coinName as SupportSCoin] && !useOldMarketCoin) {
       return sCoinIds[coinName as SupportSCoin];
     }
     coinName = isMarketCoin(coinName) ? this.parseCoinName(coinName) : coinName;
@@ -285,7 +288,7 @@ export class ScallopUtils {
   public parseMarketCoinType(coinName: SupportCoins) {
     const protocolObjectId =
       this.address.get('core.object') ?? PROTOCOL_OBJECT_ID;
-    const coinType = this.parseCoinType(coinName);
+    const coinType = this.parseCoinType(coinName, true);
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
 

package/src/queries/borrowLimitQuery.ts

@@ -17,9 +17,8 @@ const borrowLimitZod = zod.object({
   }),
 });
 
-// TODO: enable for production
-// const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
-const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
+const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
+// const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils

package/src/queries/isolatedAssetQuery.ts

@@ -18,9 +18,8 @@ const isolatedAssetZod = zod.object({
   }),
 });
 
-// TODO: enable for production
-// const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
-const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
+const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
+// const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
 
 /**
  * Return list of isolated assets coin types

package/src/queries/supplyLimitQuery.ts

@@ -17,9 +17,8 @@ const supplyLimitZod = zod.object({
   }),
 });
 
-// TODO: enable for production
-// const supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`; // prod
-const supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
+const supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`; // prod
+// const supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils