zo-sdk 0.1.62 → 0.1.64

package/src/implementations/SLPDataAPI.ts

@@ -16,6 +16,7 @@ import type { Network } from '../consts'
 import { LPToken, SLP_TOKEN_DECIMALS } from '../consts'
 import type {
   IBaseHistoryResponse,
+  IBaseOrderType,
   ISLPCredential,
   ISLPDataAPI,
   ISLPFundingFeeModel,
@@ -36,7 +37,7 @@ import type {
   ISLPSymbolInfo,
   ISLPVaultInfo,
 } from '../interfaces'
-import { decimalToObject, joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
+import { joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
 
 export interface GetCumulativeAprResponse {
   generatedAt?: string
@@ -1327,12 +1328,22 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
     const { fields } = content.fields.value
 
     // Extract tokens from dataType
-    const dataType = content.type
+    const dataType = content?.type
 
-    const orderType = content.fields.value.type.includes('OpenPositionOrder')
-      ? 'OPEN_POSITION'
-      : 'DECREASE_POSITION'
-    const orderVersion = content.fields.value.type.includes('V2')
+    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 orderVersion = content.fields.value?.type.includes('V2')
       ? 'V2'
       : 'V1_1'
 
@@ -1350,23 +1361,54 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
         dataType.split(',')[3].split('>')[0].trim(),
         this.consts,
       ),
-      indexPrice: decimalToObject(fields.limited_index_price.fields),
-      collateralPriceThreshold: parseValue(fields.collateral_price_threshold),
+      // Use index_price for open orders, limited_index_price for decrease orders
+      indexPrice: orderType === 'OPEN_MARKET'
+        ? parseValue(fields.index_price)
+        : parseValue(fields.limited_index_price?.fields?.price || fields.limited_index_price),
+      collateralPriceThreshold: fields.collateral_price_threshold ? parseValue(fields.collateral_price_threshold) : 0,
+      // New index price threshold
+      indexPriceThreshold: fields.index_price_threshold ? parseValue(fields.index_price_threshold) : undefined,
       feeAmount: BigInt(fields.fee),
       long: dataType.includes('::market::LONG'),
       orderType,
       orderVersion,
       createdAt: parseValue(fields.created_at),
+      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,