@scallop-io/sui-scallop-sdk 2.3.0-lst-x-oracle-alpha.8 → 2.3.0-lst-x-oracle-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.0-lst-x-oracle-alpha.8",
+  "version": "2.3.0-lst-x-oracle-alpha.9",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -146,6 +146,8 @@
   "scripts": {
     "clean": "rm -rf tsconfig.tsbuildinfo ./dist",
     "build": "pnpm run clean && pnpm run build:tsup",
+    "build-sourcemap": "pnpm run clean && pnpm run build:sourcemap",
+    "build:sourcemap": "tsup ./src/index.ts --format esm,cjs --dts --sourcemap",
     "build:tsup": "tsup ./src/index.ts --format esm,cjs --dts --splitting --minify --treeshake",
     "watch": "pnpm run clean & pnpm run watch:types & pnpm run watch:tsup",
     "test": "pnpm test:typecheck && pnpm test:unit",

package/src/builders/oracles/error.ts

@@ -8,13 +8,6 @@ class UnsupportedOracleError extends Error {
   }
 }
 
-class UnsupportedLstUpdateError extends Error {
-  constructor(lst: string) {
-    super(`Unsupported LST update for: ${lst}`);
-    this.name = 'UnsupportedLstUpdateError';
-  }
-}
-
 class UnsupportedLstOracleError extends Error {
   constructor(lst: string, oracle: string) {
     super(`Unsupported LST oracle update for: ${lst} with oracle: ${oracle}`);
@@ -22,8 +15,4 @@ class UnsupportedLstOracleError extends Error {
   }
 }
 
-export {
-  UnsupportedOracleError,
-  UnsupportedLstUpdateError,
-  UnsupportedLstOracleError,
-};
+export { UnsupportedOracleError, UnsupportedLstOracleError };

package/src/builders/oracles/oraclePackageRegistry.ts

@@ -3,27 +3,29 @@ import { ScallopUtils } from 'src/models';
 import {
   AddressStringPath,
   BasePackage,
-  OracleLst,
-  OracleLstConfig,
+  PythOracleLstConfig,
   SupportOracleLst,
 } from 'src/types/address';
 import { UnsupportedOracleError } from './error';
 import { SupportedOracleSuiLst, SupportOracleType } from 'src/types/constant';
+import { SUPPORT_SUI_LST } from 'src/constants';
 
 export type XOraclePackages = {
   xOraclePackageId: string;
   xOracleId: TransactionArgument | string;
 };
 
-type LstPackages<
-  T extends SupportOracleLst,
-  U extends SupportedOracleSuiLst = SupportedOracleSuiLst,
-> = {
-  [K in U]: OracleLst<T, U>[K] & BasePackage;
-};
+type RecordValueType<T> = T extends Record<any, infer V> ? V : never;
+
+export type PythLstPackages<T extends SupportedOracleSuiLst> = RecordValueType<
+  PythOracleLstConfig<T>
+> &
+  BasePackage;
 
 type MaybeWithLstPackage<T, U> = T extends SupportOracleLst
-  ? U & { lst: LstPackages<T> }
+  ? T extends 'pyth'
+    ? U & { lst: PythLstPackages<SupportedOracleSuiLst> }
+    : never
   : U;
 
 type PythStaticPackages = {
@@ -62,18 +64,24 @@ export type SupraPackages = {
   supraRegistryId: TransactionArgument | string;
 };
 
-export type OraclePackages<T extends SupportOracleType> = T extends 'pyth'
-  ? PythPackages
-  : T extends 'switchboard'
-    ? SwitchboardPackages
-    : T extends 'supra'
-      ? SupraPackages
-      : never;
-
-type getLstPackagesReturnType<T> = T extends SupportOracleLst
-  ? LstPackages<T, SupportedOracleSuiLst>
-  : never;
+export type OraclePackages<T extends SupportOracleType = SupportOracleType> =
+  T extends 'pyth'
+    ? PythPackages
+    : T extends 'switchboard'
+      ? SwitchboardPackages
+      : T extends 'supra'
+        ? SupraPackages
+        : never;
+
+type getLstPackagesReturnType<
+  T extends SupportOracleType,
+  U extends SupportedOracleSuiLst = SupportedOracleSuiLst,
+> = T extends 'pyth' ? PythLstPackages<U> : never;
 
+const PYTH_LST_PATHS: Record<SupportedOracleSuiLst, AddressStringPath> = {
+  afsui: 'core.oracles.pyth.lst.afsui',
+  hasui: 'core.oracles.pyth.lst.hasui',
+};
 export interface IOraclePackageRegistry<
   T extends SupportOracleType = SupportOracleType,
 > {
@@ -160,10 +168,10 @@ class PythPackageRegistry
   }
 
   private getLstOracleConfigPackages(coinName: SupportedOracleSuiLst) {
-    const oracleLstConfig = this.xOraclePackageRegistry.getAddressPath(
-      `core.oracles.pyth.lst.${coinName}`
-    ) as OracleLstConfig<typeof coinName>[typeof coinName];
-    return oracleLstConfig;
+    const path = PYTH_LST_PATHS[coinName];
+    if (path) {
+      return this.xOraclePackageRegistry.getAddressPath(path);
+    }
   }
 
   getLstPackages(coinName: SupportedOracleSuiLst) {
@@ -172,22 +180,28 @@ class PythPackageRegistry
     ) as BasePackage;
 
     // get the oracle config for the coin
-    const oracleLstConfig = this.getLstOracleConfigPackages(coinName);
+    const oracleLstConfig = this.getLstOracleConfigPackages(coinName) ?? {};
+
     return {
-      [coinName]: {
-        ...lstPackages,
-        ...oracleLstConfig,
-      },
+      ...lstPackages,
+      ...oracleLstConfig,
     };
   }
 
-  getPackages(coinName: string): OraclePackages<'pyth'> {
+  private resolvePythFeedForSuiLst(coinName: string) {
+    if (SUPPORT_SUI_LST.includes(coinName as any)) {
+      return 'sui';
+    }
+    return coinName;
+  }
+
+  getPackages(coinName: string) {
     const lstPackages = this.getLstPackages(coinName as SupportedOracleSuiLst);
 
     return {
       ...this.getStaticPackages,
       pythFeedObjectId: this.xOraclePackageRegistry.getAddressPath(
-        `core.coins.${coinName}.oracle.pyth.feedObject`
+        `core.coins.${this.resolvePythFeedForSuiLst(coinName)}.oracle.pyth.feedObject`
       ),
       lst: lstPackages,
     };
@@ -218,7 +232,7 @@ class SupraPackageRegistry extends BasePackageRegistry {
       supraHolderId: this.xOraclePackageRegistry.getAddressPath(
         'core.oracles.supra.holder'
       ),
-    } as OraclePackages<typeof this.oracleName>;
+    };
   }
 }
 

package/src/builders/oracles/xOracleUpdateStrategy.ts

@@ -3,12 +3,11 @@ import {
   SuiTxBlock,
   TransactionArgument,
 } from '@scallop-io/sui-kit';
-import { IOraclePackageRegistry } from './oraclePackageRegistry';
 import {
-  SupportedOracleSuiLst,
-  SupportOracleType,
-  xOracleRuleType,
-} from 'src/types/constant';
+  IOraclePackageRegistry,
+  PythLstPackages,
+} from './oraclePackageRegistry';
+import { SupportOracleType, xOracleRuleType } from 'src/types/constant';
 import { UnsupportedLstOracleError } from './error';
 
 export interface IXOracleUpdateStrategy<
@@ -83,9 +82,10 @@ export class PythDefaultUpdateStrategy extends BaseUpdateStrategy<'pyth'> {
     );
   }
 }
-export class PythSuiLstUpdateStrategy extends BaseUpdateStrategy<
+
+export class PythAfSuiUpdateStrategy extends BaseUpdateStrategy<
   'pyth',
-  SupportedOracleSuiLst
+  'afsui'
 > {
   readonly oracleType = 'pyth';
   constructor(protected readonly registry: IOraclePackageRegistry<'pyth'>) {
@@ -95,15 +95,18 @@ export class PythSuiLstUpdateStrategy extends BaseUpdateStrategy<
   updatePrice(
     tx: SuiTxBlock,
     request: TransactionArgument,
-    coinName: SupportedOracleSuiLst,
+    coinName: 'afsui',
     rule: xOracleRuleType
   ): void {
     const { lst, pythFeedObjectId, pythStateId } =
       this.registry.getPackages(coinName);
-    if (!lst[coinName]) {
+    if (!lst) {
       throw new UnsupportedLstOracleError(coinName, this.oracleType);
     }
-    const { id, configId, stakedSuiVaultId, safeId } = lst[coinName];
+    const { id, configId, stakedSuiVaultId, safeId } = lst as PythLstPackages<
+      typeof coinName
+    >;
+
     tx.moveCall(`${id}::rule::set_price_as_${rule}`, [
       request,
       pythStateId,
@@ -116,6 +119,39 @@ export class PythSuiLstUpdateStrategy extends BaseUpdateStrategy<
   }
 }
 
+export class PythHaSuiUpdateStrategy extends BaseUpdateStrategy<
+  'pyth',
+  'hasui'
+> {
+  readonly oracleType = 'pyth';
+  constructor(protected readonly registry: IOraclePackageRegistry<'pyth'>) {
+    super(registry);
+  }
+
+  updatePrice(
+    tx: SuiTxBlock,
+    request: TransactionArgument,
+    coinName: 'hasui',
+    rule: xOracleRuleType
+  ): void {
+    const { lst, pythFeedObjectId, pythStateId } =
+      this.registry.getPackages(coinName);
+    if (!lst) {
+      throw new UnsupportedLstOracleError(coinName, this.oracleType);
+    }
+    const { id, staking, configId } = lst as PythLstPackages<typeof coinName>;
+
+    tx.moveCall(`${id}::rule::set_price_as_${rule}`, [
+      request,
+      pythStateId,
+      pythFeedObjectId,
+      configId,
+      staking,
+      tx.sharedObjectRef(this.clockObject),
+    ]);
+  }
+}
+
 export class SupraDefaultUpdateStrategy extends BaseUpdateStrategy<'supra'> {
   readonly oracleType = 'supra';
   constructor(protected readonly registry: IOraclePackageRegistry<'supra'>) {

package/src/builders/oracles/xOracleUpdater.ts

@@ -4,12 +4,13 @@ import { SUPPORT_SUI_LST } from 'src/constants/xoracle';
 import { IOraclePackageRegistry } from './oraclePackageRegistry';
 import {
   IXOracleUpdateStrategy,
+  PythAfSuiUpdateStrategy,
   PythDefaultUpdateStrategy,
-  PythSuiLstUpdateStrategy,
+  PythHaSuiUpdateStrategy,
   SupraDefaultUpdateStrategy,
   SwitchboardDefaultUpdateStrategy,
 } from './xOracleUpdateStrategy';
-import { UnsupportedLstOracleError } from './error';
+import { UnsupportedOracleError } from './error';
 
 export interface IXOracleUpdater<
   T extends SupportOracleType = SupportOracleType,
@@ -53,7 +54,8 @@ class PythXOracleUpdater extends BaseXOracleUpdater<'pyth'> {
   constructor(tx: SuiTxBlock, registry: IOraclePackageRegistry<'pyth'>) {
     super(tx, registry, {
       default: new PythDefaultUpdateStrategy(registry),
-      sui_lst: new PythSuiLstUpdateStrategy(registry),
+      afsui: new PythAfSuiUpdateStrategy(registry),
+      hasui: new PythHaSuiUpdateStrategy(registry),
     });
   }
 
@@ -61,23 +63,8 @@ class PythXOracleUpdater extends BaseXOracleUpdater<'pyth'> {
     coinName: string
   ): IXOracleUpdateStrategy<typeof this.oracleName> {
     // decide which key to look up in this.strategies
-    let key: string;
-
-    if (this.SUPPORT_SUI_LST_SET.has(coinName)) {
-      key = 'sui_lst';
-    }
-    // else if (this.WALRUS_LST_SET.has(coinName)) {
-    //   key = 'walrus_lst';
-    // }
-    else {
-      key = 'default';
-    }
-
-    const strat = this.strategies.get(key);
-    if (!strat) {
-      // guard if you forgot to register default or list strategies
-      throw new UnsupportedLstOracleError(coinName, this.oracleName);
-    }
+    const strat =
+      this.strategies.get(coinName) ?? this.strategies.get('default');
 
     return strat as IXOracleUpdateStrategy<typeof this.oracleName>;
   }
@@ -107,7 +94,10 @@ class SupraXOracleUpdater extends BaseXOracleUpdater<'supra'> {
     request: TransactionArgument
   ): void {
     const stragtegy = this.strategies.get('default');
-    stragtegy?.updatePrice(this.tx, request, coinName, rule);
+    if (!stragtegy) {
+      throw new UnsupportedOracleError(this.oracleName);
+    }
+    stragtegy.updatePrice(this.tx, request, coinName, rule);
   }
 }
 
@@ -126,7 +116,10 @@ class SwitchboardXOracleUpdater extends BaseXOracleUpdater<'switchboard'> {
     request: TransactionArgument
   ): void {
     const stragtegy = this.strategies.get('default');
-    stragtegy?.updatePrice(this.tx, request, coinName, rule);
+    if (!stragtegy) {
+      throw new UnsupportedOracleError(this.oracleName);
+    }
+    stragtegy.updatePrice(this.tx, request, coinName, rule);
   }
 }
 

package/src/builders/sCoinBuilder.ts

@@ -36,10 +36,6 @@ const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({
       const sCoinType = builder.utils.parseSCoinType(sCoinName);
       if (!sCoinType) throw new Error(`Invalid sCoin name: ${sCoinName}`);
 
-      console.log({
-        sCoinName,
-        treasury: builder.utils.getSCoinTreasury(sCoinName),
-      });
       return builder.moveCall(
         txBlock,
         `${sCoinPkgIds.pkgId}::s_coin_converter::burn_s_coin`,

package/src/constants/testAddress.ts

@@ -75,6 +75,25 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      hasui: {
+        id: '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d',
+        metaData:
+          '0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24',
+        treasury: '',
+        coinType:
+          '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI',
+        symbol: 'haSUI',
+        decimals: 9,
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '6120ffcf96395c70aa77e72dcb900bf9d40dccab228efca59a17b90ce423d5e8',
+            feedObject:
+              '0x4c1d831576b60fec657e0c310943eff8c1f28197c552e57d1fefdc55edddb263',
+          },
+        },
+      },
       sca: {
         id: '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
         metaData:
@@ -179,6 +198,12 @@ export const TEST_ADDRESSES: AddressesInterface = {
             configId:
               '0x67103edaadcd38b76f5df76d99adcad989260a5f16bfd411a67efbf858b2f7a2',
           },
+          hasui: {
+            configId:
+              '0x5d14712cfd47fcb9e414c15a14273f9d2188dbb918239db75ee2769b5136f821',
+            staking:
+              '0x47b224762220393057ebf4f70501b6e657c3e56684737568439a04f80849b2ca',
+          },
         },
       },
     },
@@ -234,6 +259,11 @@ export const TEST_ADDRESSES: AddressesInterface = {
             object:
               '0xd45b20f4bbc7ab4b2b3874a4fa38aa440505d8010bba052df914892537e6b418',
           },
+          hasui: {
+            id: '0xac62b68b386dab503a6ef64c97e55dffac34c8f908373025751a111b72b767dc',
+            object:
+              '0xac62b68b386dab503a6ef64c97e55dffac34c8f908373025751a111b72b767dc',
+          },
         },
       },
       switchboard: {
@@ -418,6 +448,15 @@ export const TEST_ADDRESSES: AddressesInterface = {
           '0x42179b69f82ea26e3763345ee0fb1cea8b1bd355168b3241ceb727ec82bb0688',
         symbol: 'safSUI',
       },
+      shasui: {
+        coinType:
+          '0xbd01338d893255e7e53a41b1c021438d31f348c074809027fcad259e348529b5::scallop_ha_sui::SCALLOP_HA_SUI',
+        treasury:
+          '0xb987e7a4cd3c16247f422599882093375201487c46ece80f980a30227a385e75',
+        metaData:
+          '0x94a1bb23c6272d01f03bb5dec2a1915a41f154d14548157a099d5630197ce30d',
+        symbol: 'shaSUI',
+      },
       susdc: {
         coinType:
           '0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC',
@@ -464,7 +503,7 @@ export const TEST_WHITELIST = {
     // 'wsol',
     // 'cetus',
     'afsui',
-    // 'hasui',
+    'hasui',
     // 'vsui',
     'sca',
     'fud',
@@ -490,7 +529,7 @@ export const TEST_WHITELIST = {
     // 'wsol',
     // 'cetus',
     'afsui',
-    // 'hasui',
+    'hasui',
     // 'vsui',
     'sca',
     // 'fdusd',
@@ -512,7 +551,7 @@ export const TEST_WHITELIST = {
     // 'wsol',
     // 'cetus',
     'afsui',
-    // 'hasui',
+    'hasui',
     // 'vsui',
     'sca',
     'fud',
@@ -558,7 +597,7 @@ export const TEST_WHITELIST = {
     // 'swusdc',
     // 'swusdt',
     'safsui',
-    // 'shasui',
+    'shasui',
     // 'svsui',
     // 'sweth',
     'ssca',
@@ -837,4 +876,49 @@ export const TEST_POOL_ADDRESSES = {
     flashloanFeeObject:
       '0xac87fde83d434554ec300c1334c9a622aa5b59e82a04334dc99e1cc1f75d4eae',
   },
+  hasui: {
+    coinName: 'hasui',
+    symbol: 'haSUI',
+    lendingPoolAddress:
+      '0x7a7ca5e75f453de923284a54764819f27486bd7f6fd45147116bfc239ba8fb4d',
+    collateralPoolAddress:
+      '0xe1ad830b29eab6b72f11d7016ff87db4f3996f68a81ea621ec37f0b7df9a7ce5',
+    borrowDynamic:
+      '0x3545546a7fa2100bca3bab8739c11890a6ccce2cb2584c204a064e35005314b5',
+    interestModel:
+      '0xa280d2976e3475bebebb65e433f1998867916d1b51139bf90312c4434e8d9875',
+    riskModel:
+      '0x5b35d4a369961ff5de98ca1830d92b66d91b3651421ba9202e95329dc80493d6',
+    borrowFeeKey:
+      '0xef885c382d461c4fb14d1f3b3758c380c78a1a4b2a3d2fafe6e8649a60fdd7ab',
+    supplyLimitKey:
+      '0xc7385b1703693cbbc9c97227fe3fd5c91d7afda00e0da69d942c3260d78e45e0',
+    borrowLimitKey:
+      '0x65333e606eead786a999c8267bc9886b0fdbc298a8a8635a48a9c9b8838d9395',
+    isolatedAssetKey: '',
+    isIsolated: false,
+    spool: '0xa6148bc1b623e936d39a952ceb5bea79e8b37228a8f595067bf1852efd3c34aa',
+    spoolReward:
+      '0x6f3563644d3e2ef13176dbf9d865bd93479df60ccbe07b7e66db57f6309f5a66',
+    sCoinType:
+      '0xbd01338d893255e7e53a41b1c021438d31f348c074809027fcad259e348529b5::scallop_ha_sui::SCALLOP_HA_SUI',
+    sCoinTreasury:
+      '0xb987e7a4cd3c16247f422599882093375201487c46ece80f980a30227a385e75',
+    sCoinMetadataId:
+      '0x94a1bb23c6272d01f03bb5dec2a1915a41f154d14548157a099d5630197ce30d',
+    sCoinSymbol: 'shaSUI',
+    sCoinName: 'shasui',
+    coinMetadataId:
+      '0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24',
+    coinType:
+      '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI',
+    spoolName: 'shasui',
+    decimals: 9,
+    pythFeed:
+      '6120ffcf96395c70aa77e72dcb900bf9d40dccab228efca59a17b90ce423d5e8',
+    pythFeedObjectId:
+      '0x4c1d831576b60fec657e0c310943eff8c1f28197c552e57d1fefdc55edddb263',
+    flashloanFeeObject:
+      '0xb9f505d532de1d6c9f3a8522a2d16f2958b75c0ed939d4f80b96f584a2a8ed5e',
+  },
 };

package/src/constants/xoracle.ts

@@ -1,7 +1,7 @@
 export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
 export const X_ORACLE_RULES = ['primary', 'secondary'] as const;
 export const SUPPORT_ORACLE_LST = ['pyth'] as const;
-export const SUPPORT_SUI_LST = ['afsui'] as const;
+export const SUPPORT_SUI_LST = ['afsui', 'hasui'] as const;
 
 export const X_ORACLE_LIST: Record<
   string,

package/src/models/scallopAddress.ts

@@ -249,6 +249,10 @@ const EMPTY_ADDRESSES: AddressesInterface = {
             stakedSuiVaultId: '',
             configId: '',
           },
+          hasui: {
+            configId: '',
+            staking: '',
+          },
         },
       },
     },
@@ -293,6 +297,10 @@ const EMPTY_ADDRESSES: AddressesInterface = {
             id: '',
             object: '',
           },
+          hasui: {
+            id: '',
+            object: '',
+          },
         },
       },
       switchboard: {

package/src/types/address.ts

@@ -28,21 +28,34 @@ type Packages<
 
 export type SupportOracleLst = (typeof SUPPORT_ORACLE_LST)[number];
 
-export type OracleLstConfig<T extends SupportedOracleSuiLst> = T extends 'afsui'
-  ? Record<
-      T,
+type PythOracleLstConfigItem<T extends SupportedOracleSuiLst, U> = Record<
+  T,
+  { configId: string } & U
+>;
+
+export type PythOracleLstConfig<
+  T extends SupportedOracleSuiLst = SupportedOracleSuiLst,
+> = T extends 'afsui'
+  ? PythOracleLstConfigItem<
+      'afsui',
       {
         stakedSuiVaultId: string;
         safeId: string;
         configId: string;
       }
     >
-  : never;
+  : T extends 'hasui'
+    ? PythOracleLstConfigItem<
+        'hasui',
+        {
+          staking: string;
+        }
+      >
+    : never;
 
-export type OracleLst<
-  T extends SupportOracleLst,
-  U extends SupportedOracleSuiLst = SupportedOracleSuiLst,
-> = T extends 'pyth' ? OracleLstConfig<U> : undefined;
+export type OracleLst<T extends SupportOracleLst> = T extends 'pyth'
+  ? PythOracleLstConfig
+  : never;
 
 type MaybeWithOracleLst<T, U> = T extends SupportOracleLst
   ? U & {