@scallop-io/sui-scallop-sdk 0.44.0 → 0.44.2

package/dist/models/scallopQuery.d.ts

@@ -51,6 +51,9 @@ export declare class ScallopQuery {
         apt?: import("../types").MarketPool | undefined;
         sol?: import("../types").MarketPool | undefined;
         cetus?: import("../types").MarketPool | undefined;
+        afsui?: import("../types").MarketPool | undefined;
+        hasui?: import("../types").MarketPool | undefined;
+        vsui?: import("../types").MarketPool | undefined;
     }>;
     /**
      * Get  market pool
@@ -78,6 +81,9 @@ export declare class ScallopQuery {
         apt?: import("../types").MarketCollateral | undefined;
         sol?: import("../types").MarketCollateral | undefined;
         cetus?: import("../types").MarketCollateral | undefined;
+        afsui?: import("../types").MarketCollateral | undefined;
+        hasui?: import("../types").MarketCollateral | undefined;
+        vsui?: import("../types").MarketCollateral | undefined;
     }>;
     /**
      * Get market collateral
@@ -116,6 +122,9 @@ export declare class ScallopQuery {
         apt?: number | undefined;
         sol?: number | undefined;
         cetus?: number | undefined;
+        afsui?: number | undefined;
+        hasui?: number | undefined;
+        vsui?: number | undefined;
     }>;
     /**
      * Get asset coin amount.
@@ -141,6 +150,9 @@ export declare class ScallopQuery {
         sapt?: number | undefined;
         ssol?: number | undefined;
         scetus?: number | undefined;
+        safsui?: number | undefined;
+        shasui?: number | undefined;
+        svsui?: number | undefined;
     }>;
     /**
      * Get market coin amount.
@@ -258,6 +270,9 @@ export declare class ScallopQuery {
         apt?: import("../types").Lending | undefined;
         sol?: import("../types").Lending | undefined;
         cetus?: import("../types").Lending | undefined;
+        afsui?: import("../types").Lending | undefined;
+        hasui?: import("../types").Lending | undefined;
+        vsui?: import("../types").Lending | undefined;
     }>;
     /**
      * Get user lending and spool information for specific pool.

package/dist/models/scallopUtils.d.ts

@@ -140,6 +140,9 @@ export declare class ScallopUtils {
         apt?: number | undefined;
         sol?: number | undefined;
         cetus?: number | undefined;
+        afsui?: number | undefined;
+        hasui?: number | undefined;
+        vsui?: number | undefined;
     }>;
     /**
      * Convert apr to apy.

package/dist/queries/coreQuery.d.ts

@@ -33,6 +33,9 @@ export declare const getMarketPools: (query: ScallopQuery, poolCoinNames?: Suppo
     apt?: MarketPool | undefined;
     sol?: MarketPool | undefined;
     cetus?: MarketPool | undefined;
+    afsui?: MarketPool | undefined;
+    hasui?: MarketPool | undefined;
+    vsui?: MarketPool | undefined;
 }>;
 /**
  * Get market pool data.
@@ -64,6 +67,9 @@ export declare const getMarketCollaterals: (query: ScallopQuery, collateralCoinN
     apt?: MarketCollateral | undefined;
     sol?: MarketCollateral | undefined;
     cetus?: MarketCollateral | undefined;
+    afsui?: MarketCollateral | undefined;
+    hasui?: MarketCollateral | undefined;
+    vsui?: MarketCollateral | undefined;
 }>;
 /**
  * Get market collateral data.
@@ -111,6 +117,9 @@ export declare const getCoinAmounts: (query: ScallopQuery, assetCoinNames?: Supp
     apt?: number | undefined;
     sol?: number | undefined;
     cetus?: number | undefined;
+    afsui?: number | undefined;
+    hasui?: number | undefined;
+    vsui?: number | undefined;
 }>;
 /**
  * Query owned coin amount.
@@ -138,6 +147,9 @@ export declare const getMarketCoinAmounts: (query: ScallopQuery, marketCoinNames
     sapt?: number | undefined;
     ssol?: number | undefined;
     scetus?: number | undefined;
+    safsui?: number | undefined;
+    shasui?: number | undefined;
+    svsui?: number | undefined;
 }>;
 /**
  * Query owned market coin (sCoin) amount.

package/dist/queries/portfolioQuery.d.ts

@@ -17,6 +17,9 @@ export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportP
     apt?: Lending | undefined;
     sol?: Lending | undefined;
     cetus?: Lending | undefined;
+    afsui?: Lending | undefined;
+    hasui?: Lending | undefined;
+    vsui?: Lending | undefined;
 }>;
 /**
  * Get user lending infomation for specific pool.

package/dist/types/address.d.ts

@@ -1,5 +1,5 @@
 import { SUPPORT_ORACLES } from '../constants';
-import type { SupportCoins, SupportOracleType, SupportPackageType, SupportStakeMarketCoins } from './constant';
+import type { SupportAssetCoins, SupportOracleType, SupportPackageType, SupportStakeMarketCoins } from './constant';
 export interface AddressesInterface {
     core: {
         version: string;
@@ -7,7 +7,7 @@ export interface AddressesInterface {
         market: string;
         adminCap: string;
         coinDecimalsRegistry: string;
-        coins: Partial<Record<SupportCoins, {
+        coins: Partial<Record<SupportAssetCoins, {
             id: string;
             treasury: string;
             metaData: string;

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

@@ -21,4 +21,7 @@ type PickFromUnion<T, K extends string> = K extends T ? K : never;
 export type WormholeCoinIds = {
     [key in PickFromUnion<SupportAssetCoins, 'eth' | 'btc' | 'usdc' | 'usdt' | 'apt' | 'sol'>]: string;
 };
+export type VoloCoinIds = {
+    [key in PickFromUnion<SupportAssetCoins, 'vsui'>]: string;
+};
 export {};

package/dist/utils/util.d.ts

@@ -1,2 +1,3 @@
-import type { SupportCoins, SupportMarketCoins } from '../types';
+import type { SupportAssetCoins, SupportCoins, SupportMarketCoins } from '../types';
 export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins;
+export declare const parseAssetSymbol: (coinName: SupportAssetCoins) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.44.0",
+  "version": "0.44.2",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -42,24 +42,24 @@
     "@mysten/sui.js": "^0.44.0",
     "@noble/curves": "^1.2.0",
     "@noble/hashes": "^1.3.2",
-    "@pythnetwork/price-service-client": "^1.8.1",
-    "@pythnetwork/pyth-sui-js": "^1.2.3",
+    "@pythnetwork/price-service-client": "^1.8.2",
+    "@pythnetwork/pyth-sui-js": "^1.2.4",
     "@scallop-io/sui-kit": "^0.44.0",
     "@scure/bip39": "^1.2.1",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "bignumber.js": "^9.1.2",
     "superstruct": "^1.0.3",
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.0.0",
-    "@commitlint/config-conventional": "^18.0.0",
-    "@commitlint/prompt-cli": "^18.0.0",
-    "@types/node": "^20.8.7",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
+    "@commitlint/cli": "^18.2.0",
+    "@commitlint/config-conventional": "^18.1.0",
+    "@commitlint/prompt-cli": "^18.2.0",
+    "@types/node": "^20.8.10",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.1",
     "husky": "^8.0.3",
@@ -68,7 +68,7 @@
     "standard-version": "^9.5.0",
     "tsconfig-paths": "^4.2.0",
     "tsup": "^7.2.0",
-    "typedoc": "^0.25.2",
+    "typedoc": "^0.25.3",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6"
   },

package/src/constants/common.ts

@@ -14,6 +14,9 @@ export const SUPPORT_POOLS = [
   'apt',
   'sol',
   'cetus',
+  'afsui',
+  'hasui',
+  'vsui',
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
@@ -25,6 +28,9 @@ export const SUPPORT_COLLATERALS = [
   'apt',
   'sol',
   'cetus',
+  'afsui',
+  'hasui',
+  'vsui',
 ] as const;
 
 export const SUPPORT_SPOOLS = ['ssui', 'susdc', 'susdt'] as const;

package/src/constants/enum.ts

@@ -6,6 +6,7 @@ import type {
   RewardCoins,
   AssetCoinIds,
   WormholeCoinIds,
+  VoloCoinIds,
 } from '../types';
 
 export const coinDecimals: SupportCoinDecimals = {
@@ -17,6 +18,9 @@ export const coinDecimals: SupportCoinDecimals = {
   apt: 8,
   sol: 8,
   cetus: 9,
+  afsui: 9,
+  hasui: 9,
+  vsui: 9,
   seth: 8,
   sbtc: 8,
   susdc: 6,
@@ -25,6 +29,9 @@ export const coinDecimals: SupportCoinDecimals = {
   sapt: 8,
   ssol: 8,
   scetus: 9,
+  safsui: 9,
+  shasui: 9,
+  svsui: 9,
 };
 
 export const assetCoins: AssetCoins = {
@@ -36,6 +43,9 @@ export const assetCoins: AssetCoins = {
   apt: 'apt',
   sol: 'sol',
   cetus: 'cetus',
+  afsui: 'afsui',
+  hasui: 'hasui',
+  vsui: 'vsui',
 };
 
 export const marketCoins: MarketCoins = {
@@ -47,6 +57,9 @@ export const marketCoins: MarketCoins = {
   sapt: 'sapt',
   ssol: 'ssol',
   scetus: 'scetus',
+  safsui: 'safsui',
+  shasui: 'shasui',
+  svsui: 'svsui',
 };
 
 export const stakeMarketCoins: StakeMarketCoins = {
@@ -70,6 +83,9 @@ export const coinIds: AssetCoinIds = {
   apt: '0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37',
   sol: '0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8',
   cetus: '0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b',
+  afsui: '0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc',
+  hasui: '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d',
+  vsui: '0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55',
 };
 
 export const wormholeCoinIds: WormholeCoinIds = {
@@ -80,3 +96,7 @@ export const wormholeCoinIds: WormholeCoinIds = {
   apt: '0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37',
   sol: '0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8',
 };
+
+export const voloCoinIds: VoloCoinIds = {
+  vsui: '0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55',
+};

package/src/models/scallopAddress.ts

@@ -80,6 +80,45 @@ const EMPTY_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      afsui: {
+        id: '',
+        metaData: '',
+        treasury: '',
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '',
+            feedObject: '',
+          },
+        },
+      },
+      hasui: {
+        id: '',
+        metaData: '',
+        treasury: '',
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '',
+            feedObject: '',
+          },
+        },
+      },
+      vsui: {
+        id: '',
+        metaData: '',
+        treasury: '',
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '',
+            feedObject: '',
+          },
+        },
+      },
     },
     oracles: {
       xOracle: '',

package/src/models/scallopUtils.ts

@@ -11,10 +11,15 @@ import {
   rewardCoins,
   coinDecimals,
   wormholeCoinIds,
+  voloCoinIds,
   coinIds,
 } from '../constants';
 import { queryObligation } from '../queries';
-import { parseDataFromPythPriceFeed, isMarketCoin } from '../utils';
+import {
+  parseDataFromPythPriceFeed,
+  isMarketCoin,
+  parseAssetSymbol,
+} from '../utils';
 import type {
   ScallopUtilsParams,
   ScallopInstanceParams,
@@ -91,9 +96,14 @@ export class ScallopUtils {
    */
   public parseSymbol(coinName: SupportCoins) {
     if (isMarketCoin(coinName)) {
-      return coinName.slice(0, 1) + coinName.slice(1).toUpperCase();
+      const assetCoinName = coinName
+        .slice(1)
+        .toLowerCase() as SupportAssetCoins;
+      return (
+        coinName.slice(0, 1).toLowerCase() + parseAssetSymbol(assetCoinName)
+      );
     } else {
-      return coinName.toUpperCase();
+      return parseAssetSymbol(coinName);
     }
   }
 
@@ -111,15 +121,15 @@ export class ScallopUtils {
   public parseCoinType(coinName: SupportCoins) {
     coinName = isMarketCoin(coinName) ? this.parseCoinName(coinName) : coinName;
     const coinPackageId =
-      this._address.get(`core.coins.${coinName}.id`) ??
-      coinIds[coinName] ??
+      this._address.get(`core.coins.${coinName}.id`) ||
+      coinIds[coinName] ||
       undefined;
     if (!coinPackageId) {
       throw Error(`Coin ${coinName} is not supported`);
     }
     if (coinName === 'sui')
       return normalizeStructTag(`${coinPackageId}::sui::SUI`);
-    const wormHoleCoinIds = [
+    const wormHolePckageIds = [
       this._address.get('core.coins.usdc.id') ?? wormholeCoinIds.usdc,
       this._address.get('core.coins.usdt.id') ?? wormholeCoinIds.usdt,
       this._address.get('core.coins.eth.id') ?? wormholeCoinIds.eth,
@@ -127,8 +137,13 @@ export class ScallopUtils {
       this._address.get('core.coins.sol.id') ?? wormholeCoinIds.sol,
       this._address.get('core.coins.apt.id') ?? wormholeCoinIds.apt,
     ];
-    if (wormHoleCoinIds.includes(coinPackageId)) {
+    const voloPckageIds = [
+      this._address.get('core.coins.vsui.id') ?? voloCoinIds.vsui,
+    ];
+    if (wormHolePckageIds.includes(coinPackageId)) {
       return `${coinPackageId}::coin::COIN`;
+    } else if (voloPckageIds.includes(coinPackageId)) {
+      return `${coinPackageId}::cert::CERT`;
     } else {
       return `${coinPackageId}::${coinName}::${coinName.toUpperCase()}`;
     }
@@ -192,9 +207,15 @@ export class ScallopUtils {
         this._address.get('core.coins.apt.id') ?? wormholeCoinIds.apt
       }::coin::COIN`]: 'apt',
     };
+    const voloCoinTypeMap: Record<string, SupportAssetCoins> = {
+      [`${
+        this._address.get('core.coins.vsui.id') ?? voloCoinIds.vsui
+      }::cert::CERT`]: 'vsui',
+    };
 
     const assetCoinName =
       wormHoleCoinTypeMap[coinType] ||
+      voloCoinTypeMap[coinType] ||
       (coinType.split('::')[2].toLowerCase() as SupportAssetCoins);
 
     return isMarketCoinType
@@ -363,13 +384,14 @@ export class ScallopUtils {
       try {
         const priceFeeds =
           (await pythConnection.getLatestPriceFeeds(priceIds)) || [];
-        for (const feed of priceFeeds) {
+        for (const [index, feed] of priceFeeds.entries()) {
           const data = parseDataFromPythPriceFeed(feed, this._address);
-          this._priceMap.set(data.coinName, {
+          const coinName = lackPricesCoinNames[index];
+          this._priceMap.set(coinName, {
             price: data.price,
             publishTime: data.publishTime,
           });
-          coinPrices[data.coinName] = data.price;
+          coinPrices[coinName] = data.price;
         }
       } catch (_e) {
         for (const coinName of lackPricesCoinNames) {

package/src/types/address.ts

@@ -1,6 +1,6 @@
 import { SUPPORT_ORACLES } from '../constants';
 import type {
-  SupportCoins,
+  SupportAssetCoins,
   SupportOracleType,
   SupportPackageType,
   SupportStakeMarketCoins,
@@ -15,7 +15,7 @@ export interface AddressesInterface {
     coinDecimalsRegistry: string;
     coins: Partial<
       Record<
-        SupportCoins,
+        SupportAssetCoins,
         {
           id: string;
           treasury: string;

package/src/types/constant/enum.ts

@@ -38,3 +38,7 @@ export type WormholeCoinIds = {
     'eth' | 'btc' | 'usdc' | 'usdt' | 'apt' | 'sol'
   >]: string;
 };
+
+export type VoloCoinIds = {
+  [key in PickFromUnion<SupportAssetCoins, 'vsui'>]: string;
+};

package/src/utils/util.ts

@@ -12,12 +12,28 @@ import type {
 export const isMarketCoin = (
   coinName: SupportCoins
 ): coinName is SupportMarketCoins => {
-  const assetCoinName = coinName.slice(1) as SupportAssetCoins;
-  return [
-    ...new Set([
-      ...SUPPORT_POOLS,
-      ...SUPPORT_COLLATERALS,
-      ...SUPPORT_REWARD_POOLS,
-    ]),
-  ].includes(assetCoinName);
+  const assetCoinName = coinName.slice(1).toLowerCase() as SupportAssetCoins;
+  return (
+    coinName.charAt(0).toLowerCase() === 's' &&
+    [
+      ...new Set([
+        ...SUPPORT_POOLS,
+        ...SUPPORT_COLLATERALS,
+        ...SUPPORT_REWARD_POOLS,
+      ]),
+    ].includes(assetCoinName)
+  );
+};
+
+export const parseAssetSymbol = (coinName: SupportAssetCoins): string => {
+  switch (coinName) {
+    case 'afsui':
+      return 'afSUI';
+    case 'hasui':
+      return 'haSUI';
+    case 'vsui':
+      return 'vSUI';
+    default:
+      return coinName.toUpperCase();
+  }
 };