zo-sdk 0.1.62 → 0.1.63

package/src/implementations/USDZDataAPI.ts

@@ -13,6 +13,7 @@ import type { Network } from '../consts'
 import { LPToken, SECONDS_PER_EIGHT_HOUR, USDZ_TOKEN_DECIMALS } from '../consts'
 import type {
   IBaseHistoryResponse,
+  IBaseOrderType,
   IBaseStaked,
   IUSDZCredential,
   IUSDZDataAPI,
@@ -1023,9 +1024,21 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
     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'
+    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: IUSDZOrderInfo = {
       id: content.fields.id.id,
@@ -1035,23 +1048,53 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
       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),
-      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,
       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/implementations/ZLPAPI.ts

@@ -1178,7 +1178,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     }
 
     let tx = new Transaction()
-    const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
     const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
     const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -1388,7 +1387,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         relayerFee = BigInt(0.5),
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
-      const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
       const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
       const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -2004,8 +2002,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       itemId: scard,
     })
 
-    const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-
     const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
     const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
     const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage)
@@ -2269,7 +2265,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         coinObjects = [],
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
-      const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
       const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
       const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -2572,7 +2567,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     indexToken: string,
     long: boolean,
     tx: Transaction,
-    isV11Order?: boolean,
+    _isV11Order?: boolean,
   ): void {
     const funcName = 'clear_open_market_order'
     tx.moveCall({
@@ -2616,7 +2611,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     indexToken: string,
     long: boolean,
     tx: Transaction,
-    isV11Order?: boolean,
+    _isV11Order?: boolean,
   ): void {
     const funcName = 'clear_decrease_market_order'
     tx.moveCall({