zo-sdk 0.1.55 → 0.1.57

package/src/implementations/ZLPDataAPI.ts

@@ -13,6 +13,7 @@ import type { Network } from '../consts'
 import { LPToken, SECONDS_PER_EIGHT_HOUR, ZLP_TOKEN_DECIMALS } from '../consts'
 import type {
   IBaseHistoryResponse,
+  IBaseOrderType,
   IBaseStaked,
   IZLPCredential,
   IZLPDataAPI,
@@ -1042,7 +1043,19 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     // Extract tokens from dataType
     const dataType = content.type
 
-    const orderType = content.fields.value.type.includes('OpenPositionOrder') ? 'OPEN_POSITION' : 'DECREASE_POSITION'
+    let orderType: IBaseOrderType
+    if (content.fields.value.type.includes('OpenPositionOrder')) {
+      orderType = 'OPEN_POSITION'
+    }
+    else if (content.fields.value.type.includes('OpenMarketOrder')) {
+      orderType = 'OPEN_MARKET'
+    }
+    else if (content.fields.value.type.includes('DecreasePositionOrder')) {
+      orderType = 'DECREASE_POSITION'
+    }
+    else {
+      orderType = 'DECREASE_MARKET'
+    }
 
     const ret: IZLPOrderInfo = {
       id: content.fields.id.id,
@@ -1052,23 +1065,53 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
       collateralToken: suiSymbolToSymbol(dataType.split('<')[2].split(',')[0].trim(), this.consts),
       indexToken: suiSymbolToSymbol(dataType.split(',')[1].trim(), this.consts),
       feeToken: suiSymbolToSymbol(dataType.split(',')[3].split('>')[0].trim(), this.consts),
-      indexPrice: parseValue(fields.limited_index_price.fields.price || fields.limited_index_price),
+      // Use index_price for open orders, limited_index_price for decrease orders
+      indexPrice: (orderType === 'OPEN_POSITION' || orderType === 'OPEN_MARKET')
+        ? parseValue(fields.index_price)
+        : parseValue(fields.limited_index_price?.fields?.price || fields.limited_index_price),
       collateralPriceThreshold: parseValue(fields.collateral_price_threshold),
+      // New index price threshold
+      indexPriceThreshold: fields.index_price_threshold !== undefined ? parseValue(fields.index_price_threshold) : undefined,
       feeAmount: BigInt(fields.fee),
       long: dataType.includes('::market::LONG'),
       orderType,
       createdAt: parseValue(fields.created_at),
-      v11Order: !fields.limited_index_price.fields.price,
+      v11Order: !fields.limited_index_price?.fields?.price,
+      // New: referrer and scard fields
+      referrer: fields.referrer,
+      scardId: (
+        fields.scard_id?.fields?.some?.fields?.id
+        || fields.scard_id?.fields?.value?.fields?.id
+        || fields.scard_id?.fields?.id
+        || fields.scard_id?.id
+      ),
+      scardRebateRate: (() => {
+        const inner = fields.scard_rebate_rate?.fields?.some ?? fields.scard_rebate_rate?.fields?.value
+        return inner ? parseValue(inner) : undefined
+      })(),
     }
 
-    if (orderType === 'OPEN_POSITION') {
+    if (orderType === 'OPEN_POSITION' || orderType === 'OPEN_MARKET') {
       ret.openOrder = {
         reserveAmount: BigInt(fields.reserve_amount),
         collateralAmount: BigInt(fields.collateral),
         openAmount: BigInt(fields.open_amount),
+        // New: position_config from OpenMarketOrder
+        positionConfig: fields.position_config?.fields
+          ? {
+              decreaseFeeBps: parseValue(fields.position_config.fields.decrease_fee_bps),
+              liquidationBonus: parseValue(fields.position_config.fields.liquidation_bonus),
+              liquidationThreshold: parseValue(fields.position_config.fields.liquidation_threshold),
+              maxLeverage: parseValue(fields.position_config.fields.max_leverage),
+              minHoldingDuration: parseValue(fields.position_config.fields.min_holding_duration),
+              openFeeBps: parseValue(fields.position_config.fields.open_fee_bps),
+              maxReservedMultiplier: parseValue(fields.position_config.fields.max_reserved_multiplier),
+              minCollateralValue: parseValue(fields.position_config.fields.min_collateral_value),
+            }
+          : undefined,
       }
     }
-    else {
+    else if (orderType === 'DECREASE_POSITION' || orderType === 'DECREASE_MARKET') {
       ret.decreaseOrder = {
         decreaseAmount: BigInt(fields.decrease_amount),
         takeProfit: fields.take_profit,

package/src/interfaces/base.ts

@@ -101,6 +101,7 @@ export interface IBasePositionInfo {
   openTimestamp: number
 }
 
+export type IBaseOrderType = 'OPEN_POSITION' | 'DECREASE_POSITION' | 'OPEN_MARKET' | 'DECREASE_MARKET'
 export interface IBaseOrderInfo {
   id: string
   capId: string
@@ -113,16 +114,23 @@ export interface IBaseOrderInfo {
   feeAmount: bigint
   long: boolean
   indexPrice: number
+  // New optional fields for upgraded Move structs
+  indexPriceThreshold?: number
+  referrer?: string
+  scardId?: string
+  scardRebateRate?: number
   openOrder?: {
     reserveAmount: bigint
     collateralAmount: bigint
     openAmount: bigint
+    // PositionConfig from OpenMarketOrder
+    positionConfig?: IBasePositionConfig
   }
   decreaseOrder?: {
     decreaseAmount: bigint
     takeProfit: boolean
   }
-  orderType: 'OPEN_POSITION' | 'DECREASE_POSITION'
+  orderType: IBaseOrderType
   createdAt: number
   v11Order?: boolean
   orderVersion?: string
@@ -391,6 +399,90 @@ export interface IBaseAPI {
     suiCoinObjectsForPythUpdate?: string[],
   ) => Promise<Transaction>
 
+  openPositionV2?: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    collateralAmount: bigint,
+    coinObjects: string[],
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
+  // Trading operations
+  openPositionWithCoinV2?: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    coinObj: TransactionObjectArgument,
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
+  decreasePositionV2?: (
+    pcpId: string,
+    collateralToken: string,
+    indexToken: string,
+    amount: bigint,
+    long: boolean,
+    indexPrice: number,
+    collateralPrice: number,
+    isTriggerOrder?: boolean,
+    isTakeProfitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
+  decreaseMultiPositionsV2?: (
+    positions: Array<{
+      pcpId: string
+      collateralToken: string
+      indexToken: string
+      amount: bigint
+      long: boolean
+      indexPrice: number
+      collateralPrice: number
+      isTriggerOrder?: boolean
+      isTakeProfitOrder?: boolean
+      isIocOrder?: boolean
+      pricesSlippage?: number
+      collateralSlippage?: number
+      relayerFee?: bigint
+      coinObjects?: string[]
+    }>,
+    tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
   pledgeInPosition: (
     pcpId: string,
     collateralToken: string,
@@ -459,6 +551,24 @@ export interface IBaseAPI {
     isV11Order?: boolean
   ) => void
 
+  clearOpenMarketOrder?: (
+    orderCapId: string,
+    collateralToken: string,
+    indexToken: string,
+    long: boolean,
+    tx: Transaction,
+    isV11Order?: boolean
+  ) => void
+
+  clearDecreaseMarketOrder?: (
+    orderCapId: string,
+    collateralToken: string,
+    indexToken: string,
+    long: boolean,
+    tx: Transaction,
+    isV11Order?: boolean
+  ) => void
+
   // S Card operations
   openPositionWithSCard: (
     collateralToken: string,
@@ -556,6 +666,102 @@ export interface IBaseAPI {
     suiCoinObjectsForPythUpdate?: string[],
   ) => Promise<Transaction>
 
+  openPositionWithSCardV2?: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    collateralAmount: bigint,
+    coinObjects: string[],
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
+  // S Card operations
+  openPositionWithCoinAndSCardV2?: (
+    collateralToken: string,
+    indexToken: string,
+    size: bigint,
+    coinObj: TransactionObjectArgument,
+    long: boolean,
+    reserveAmount: bigint,
+    indexPrice: number,
+    collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    isLimitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    referralAddress?: string,
+    sender?: string,
+    tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
+  decreasePositionWithSCardV2?: (
+    pcpId: string,
+    collateralToken: string,
+    indexToken: string,
+    amount: bigint,
+    long: boolean,
+    indexPrice: number,
+    collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    isTriggerOrder?: boolean,
+    isTakeProfitOrder?: boolean,
+    isIocOrder?: boolean,
+    pricesSlippage?: number,
+    collateralSlippage?: number,
+    relayerFee?: bigint,
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
+  decreaseMultiPositionsWithSCardV2?: (
+    positions: Array<{
+      pcpId: string
+      collateralToken: string
+      indexToken: string
+      amount: bigint
+      long: boolean
+      indexPrice: number
+      collateralPrice: number
+      isTriggerOrder?: boolean
+      isTakeProfitOrder?: boolean
+      isIocOrder?: boolean
+      pricesSlippage?: number
+      collateralSlippage?: number
+      relayerFee?: bigint
+      coinObjects?: string[]
+    }>,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
+    tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
+  ) => Promise<Transaction>
+
   claimTokenFromSCard: (
     token: string,
     coinObjects: string[],