@zofai/zo-sdk 0.2.26 → 0.2.27

package/src/implementations/SLPDataAPI.ts

@@ -38,7 +38,9 @@ import type {
   ISLPVaultInfo,
   ISwapFeeBreakdown,
 } from '../interfaces'
+import type { OracleInputs } from '../oraclePro'
 import type { DynamicFieldInfo, SuiClient } from '../suiClient'
+import { valuateSymbolsV3, valuateVaultsV3 } from '../oraclePro'
 import { joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
 
 export interface GetCumulativeAprResponse {
@@ -210,6 +212,46 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
     return { vaultsValuation, symbolsValuation }
   }
 
+  /** Creates vaults valuation using valuate_vault_v3 (Pyth Pro + Stork, sudo-core). */
+  public valuateVaultsV3(tx: Transaction, oracle: OracleInputs) {
+    if (!this.consts.sudoCore) {
+      throw new Error('Sudo Core configuration not found. Make sure you are using LPToken.SLP')
+    }
+    return valuateVaultsV3({
+      tx,
+      upgradedPackage: this.consts.sudoCore.upgradedPackage,
+      lpType: `${this.consts.sudoCore.package}::slp::SLP`,
+      market: this.consts.sudoCore.market,
+      vaults: this.consts.sudoCore.vaults,
+      coinModules: this.consts.coins,
+      oracle,
+    })
+  }
+
+  /** Creates symbols valuation using valuate_symbol_v3 (Pyth Pro + Stork, sudo-core). */
+  public valuateSymbolsV3(tx: Transaction, oracle: OracleInputs) {
+    if (!this.consts.sudoCore) {
+      throw new Error('Sudo Core configuration not found. Make sure you are using LPToken.SLP')
+    }
+    return valuateSymbolsV3({
+      tx,
+      upgradedPackage: this.consts.sudoCore.upgradedPackage,
+      marketPackage: this.consts.sudoCore.package,
+      lpType: `${this.consts.sudoCore.package}::slp::SLP`,
+      market: this.consts.sudoCore.market,
+      symbols: this.consts.sudoCore.symbols,
+      coinModules: this.consts.coins,
+      oracle,
+    })
+  }
+
+  /** Creates both vaults and symbols valuation (Pyth Pro + Stork, sudo-core). */
+  public valuateV3(tx: Transaction, oracle: OracleInputs) {
+    const vaultsValuation = this.valuateVaultsV3(tx, oracle)
+    const symbolsValuation = this.valuateSymbolsV3(tx, oracle)
+    return { vaultsValuation, symbolsValuation }
+  }
+
   /**
    * Valuates the SLP market using Sudo SDK's approach
    */

package/src/interfaces/slp.ts

@@ -6,6 +6,7 @@
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
 import type { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions'
 
+import type { OracleInputs } from '../oraclePro'
 import type {
   IBaseAPI,
   IBaseCredential,
@@ -217,6 +218,12 @@ export interface ISLPDataAPI extends IBaseDataAPI {
   getSymbolConfig: (indexToken: string, long: boolean) => Promise<ISLPSymbolConfig | null>
   getPriceImpactConfig: (indexToken: string) => Promise<ISLPPriceImpactConfig | null>
   calculateSwapFeeBreakdown: (fromToken: string, toToken: string, fromAmount: number) => Promise<ISwapFeeBreakdown>
+  valuateVaultsV3: (tx: Transaction, oracle: OracleInputs) => TransactionObjectArgument
+  valuateSymbolsV3: (tx: Transaction, oracle: OracleInputs) => TransactionObjectArgument
+  valuateV3: (tx: Transaction, oracle: OracleInputs) => {
+    vaultsValuation: TransactionObjectArgument
+    symbolsValuation: TransactionObjectArgument
+  }
 }
 
 // SLP-specific API interface
@@ -286,4 +293,167 @@ export interface ISLPAPI extends IBaseAPI {
     minAmountOut?: number,
     tx?: Transaction,
   ) => Promise<TransactionObjectArgument>
+
+  swapV4: (
+    fromToken: string,
+    toToken: string,
+    fromAmount: bigint,
+    fromCoinObjects: string[],
+    pythProUpdateBytes: Uint8Array | number[],
+    minAmountOut?: number,
+    tx?: Transaction,
+  ) => Promise<Transaction>
+
+  swapV4Ptb: (
+    fromToken: string,
+    toToken: string,
+    fromAmount: bigint,
+    fromCoinObjects: string[],
+    pythProUpdateBytes: Uint8Array | number[],
+    minAmountOut?: number,
+    tx?: Transaction,
+  ) => Promise<TransactionObjectArgument>
+
+  openPositionV3: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    collateralAmount: bigint,
+    coinObjects: string[],
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    pythProUpdateBytes: Uint8Array | number[],
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    sponsoredTx?: boolean,
+  ) => Promise<Transaction>
+
+  openPositionWithSCardV3: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    collateralAmount: bigint,
+    coinObjects: string[],
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    pythProUpdateBytes: Uint8Array | number[],
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    sponsoredTx?: boolean,
+  ) => Promise<Transaction>
+
+  openPositionWithCoinV3: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    coinObj: TransactionObjectArgument,
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    pythProUpdateBytes: Uint8Array | number[],
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    tx?: Transaction,
+    sponsoredTx?: boolean,
+  ) => Promise<Transaction>
+
+  openPositionWithCoinAndSCardV3: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    coinObj: TransactionObjectArgument,
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    pythProUpdateBytes: Uint8Array | number[],
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    tx?: Transaction,
+    sponsoredTx?: boolean,
+  ) => Promise<Transaction>
+
+  decreasePositionV3: (
+    pcpId: string,
+    collateralToken: string,
+    indexToken: string,
+    amount: bigint,
+    long: boolean,
+    indexPrice: number,
+    collateralPrice: number,
+    pythProUpdateBytes: Uint8Array | number[],
+    isTriggerOrder?: boolean,
+    isTakeProfitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    sender?: string,
+  ) => Promise<Transaction>
+
+  decreasePositionWithSCardV3: (
+    pcpId: string,
+    collateralToken: string,
+    indexToken: string,
+    amount: bigint,
+    long: boolean,
+    indexPrice: number,
+    collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    pythProUpdateBytes: Uint8Array | number[],
+    isTriggerOrder?: boolean,
+    isTakeProfitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    sender?: string,
+  ) => Promise<Transaction>
+
+  redeemFromPositionV3: (
+    pcpId: string,
+    collateralToken: string,
+    indexToken: string,
+    amount: number,
+    long: boolean,
+    pythProUpdateBytes: Uint8Array | number[],
+    tx?: Transaction,
+  ) => Promise<Transaction>
 }

package/src/oraclePro.ts

@@ -60,6 +60,44 @@ export function requireOracleProConfig(network: Network): IOracleProConfig {
   return buildOracleProConfig(getZoOracleConfig(network))
 }
 
+/**
+ * LST SUI vault tokens priced on-chain via Pyth Lazer RR feed × SUI/USD.
+ * Numeric ids are Pyth Lazer `priceFeedIds` (not Hermes price ids).
+ */
+export const LST_SUI_PYTH_LAZER_RR_FEED_IDS: Record<string, number> = {
+  afSui: 3245,
+  stSui: 736,
+  vSui: 2349,
+  haSui: 3244,
+}
+
+const LST_SUI_TOKENS = new Set(Object.keys(LST_SUI_PYTH_LAZER_RR_FEED_IDS))
+
+function lookupLazerFeedIdForToken(
+  token: string,
+  zoOracle: IZoOracleConfig,
+  coins: Record<string, { module: string }>,
+  network: Network,
+  coinModuleMap: Map<string, number>,
+  legacyFeeders?: Record<string, string>,
+): number | undefined {
+  const module = coins[token]?.module
+  if (!module) {
+    return undefined
+  }
+
+  let lazerId = coinModuleMap.get(normalizeCoinType(module))
+
+  if (lazerId === undefined && legacyFeeders?.[token]) {
+    const priceId = getPythFeederToPriceId(network)[legacyFeeders[token]]
+    if (priceId) {
+      lazerId = zoOracle.pythLazer.feedIds[priceId]
+    }
+  }
+
+  return lazerId
+}
+
 /**
  * Build coin module -> Lazer feed id using zo_oracle symbol configs + Hermes price id map.
  */
@@ -93,9 +131,7 @@ export function resolveLazerFeedIds(
   network: Network,
   legacyFeeders?: Record<string, string>,
 ): number[] {
-  const { pythLazer } = zoOracle
-  const coinModuleMap = buildCoinModuleToLazerFeedId(pythLazer, zoOracle, network)
-  const feederToPriceId = getPythFeederToPriceId(network)
+  const coinModuleMap = buildCoinModuleToLazerFeedId(zoOracle.pythLazer, zoOracle, network)
 
   const ids = new Set<number>()
   for (const token of tokens) {
@@ -104,15 +140,32 @@ export function resolveLazerFeedIds(
       throw new Error(`Unknown token: ${token}`)
     }
 
-    let lazerId = coinModuleMap.get(normalizeCoinType(module))
-
-    if (lazerId === undefined && legacyFeeders?.[token]) {
-      const priceId = feederToPriceId[legacyFeeders[token]]
-      if (priceId) {
-        lazerId = pythLazer.feedIds[priceId]
+    if (LST_SUI_TOKENS.has(token)) {
+      ids.add(LST_SUI_PYTH_LAZER_RR_FEED_IDS[token])
+      const suiLazerId = lookupLazerFeedIdForToken(
+        'sui',
+        zoOracle,
+        coins,
+        network,
+        coinModuleMap,
+        legacyFeeders,
+      )
+      if (suiLazerId === undefined) {
+        throw new Error(`No Pyth Lazer feed id for SUI (required for LST token "${token}")`)
       }
+      ids.add(suiLazerId)
+      continue
     }
 
+    const lazerId = lookupLazerFeedIdForToken(
+      token,
+      zoOracle,
+      coins,
+      network,
+      coinModuleMap,
+      legacyFeeders,
+    )
+
     if (lazerId === undefined) {
       throw new Error(`No Pyth Lazer feed id for token "${token}" (${module})`)
     }
@@ -212,6 +265,11 @@ export function oracleArgsAlt(oracle: OracleInputsAlt): TransactionObjectArgumen
   return [oracle.oracleRegistry, oracle.storkState, oracle.pythProUpdate]
 }
 
+/** Sudo-core valuation/swap order: `[oracleRegistry, pythProUpdate, storkState, clock]`. */
+export function oracleArgsRegistryFirst(oracle: OracleInputs): TransactionObjectArgument[] {
+  return [oracle.oracleRegistry, oracle.pythProUpdate, oracle.storkState, oracle.clock]
+}
+
 export function buildOracleInputsAlt(oracle: OracleInputs): OracleInputsAlt {
   return {
     oracleRegistry: oracle.oracleRegistry,
@@ -312,3 +370,83 @@ export function valuateSymbolsV2(params: IValuateSymbolsV2Params): TransactionOb
 
   return symbolsValuation
 }
+
+export interface IValuateVaultsV3Params {
+  tx: Transaction
+  upgradedPackage: string
+  lpType: string
+  market: string
+  vaults: Record<string, { reservingFeeModel: string }>
+  coinModules: Record<string, { module: string }>
+  oracle: OracleInputs
+}
+
+/** create_vaults_valuation + valuate_vault_v3 for each vault (sudo-core). */
+export function valuateVaultsV3(params: IValuateVaultsV3Params): TransactionObjectArgument {
+  const { tx, upgradedPackage, lpType, market, vaults, coinModules, oracle } = params
+
+  const vaultsValuation = tx.moveCall({
+    target: `${upgradedPackage}::market::create_vaults_valuation`,
+    typeArguments: [lpType],
+    arguments: [oracle.clock, tx.object(market)],
+  })
+
+  for (const key of Object.keys(vaults)) {
+    const vault = vaults[key]
+    tx.moveCall({
+      target: `${upgradedPackage}::market::valuate_vault_v3`,
+      typeArguments: [lpType, coinModules[key].module],
+      arguments: [
+        tx.object(market),
+        tx.object(vault.reservingFeeModel),
+        ...oracleArgsRegistryFirst(oracle),
+        vaultsValuation,
+      ],
+    })
+  }
+
+  return vaultsValuation
+}
+
+export interface IValuateSymbolsV3Params {
+  tx: Transaction
+  upgradedPackage: string
+  marketPackage: string
+  lpType: string
+  market: string
+  symbols: Record<string, { fundingFeeModel: string }>
+  coinModules: Record<string, { module: string }>
+  oracle: OracleInputs
+}
+
+/** create_symbols_valuation + valuate_symbol_v3 for each symbol (sudo-core). */
+export function valuateSymbolsV3(params: IValuateSymbolsV3Params): TransactionObjectArgument {
+  const { tx, upgradedPackage, marketPackage, lpType, market, symbols, coinModules, oracle } = params
+
+  const symbolsValuation = tx.moveCall({
+    target: `${upgradedPackage}::market::create_symbols_valuation`,
+    typeArguments: [lpType],
+    arguments: [oracle.clock, tx.object(market)],
+  })
+
+  for (const key of Object.keys(symbols)) {
+    const [direction, token] = parseSymbolKey(key)
+    const symbol = symbols[key]
+    tx.moveCall({
+      target: `${upgradedPackage}::market::valuate_symbol_v3`,
+      typeArguments: [
+        lpType,
+        coinModules[token].module,
+        `${marketPackage}::market::${direction.toUpperCase()}`,
+      ],
+      arguments: [
+        tx.object(market),
+        tx.object(symbol.fundingFeeModel),
+        ...oracleArgsRegistryFirst(oracle),
+        symbolsValuation,
+      ],
+    })
+  }
+
+  return symbolsValuation
+}