zo-sdk 0.1.7 → 0.1.9

package/src/implementations/ZLPAPI.ts

@@ -165,7 +165,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
-    isDepositingSui?: boolean,
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -183,7 +182,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
 
       // Process deposit coins
-      const depositObject = isDepositingSui
+      const depositObject = coin === 'sui'
         ? tx.splitCoins(suiCoinObject, [tx.pure.u64(amount)])[0]
         : tx.splitCoins(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
 
@@ -326,17 +325,13 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     relayerFee = BigInt(0.5),
     referralAddress?: string,
     sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
       tx = await this.addReferral(referralAddress, tx)
     }
-    tx = await this.initOracleTxb([collateralToken, indexToken], tx)
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-    const [depositObject, feeObject] = tx.splitCoins(coinObject, [
-      tx.pure.u64(collateralAmount),
-      tx.pure.u64(relayerFee),
-    ])
 
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage)
@@ -347,6 +342,26 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       allowTrade = isIocOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE
     }
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [depositObject, feeObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(collateralAmount), tx.pure.u64(relayerFee)],
+      sponsoredTx,
+      suiCoinObject,
+    )
+
     tx.moveCall({
       target: `${this.consts.zoCore.package}::market::open_position`,
       typeArguments: [
@@ -373,6 +388,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         tx.pure.u256(adjustPrice),
       ],
     })
+
     return tx
   }
 
@@ -394,14 +410,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
     coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!coinObjects) {
       throw new Error(`${this.constructor.name}: coinObjects is required`)
     }
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+
+    let tx = new Transaction()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects || [])
-    const feeObject = tx.splitCoins(coinObject, [tx.pure.u64(relayerFee)])
 
     const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
     const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -414,6 +431,26 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       isTakeProfitOrder = true
     }
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [feeObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(relayerFee)],
+      sponsoredTx,
+      suiCoinObject,
+    )
+
     tx.moveCall({
       target: `${this.consts.zoCore.package}::market::decrease_position`,
       typeArguments: [
@@ -458,11 +495,20 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralSlippage?: number
     relayerFee?: bigint
     coinObjects?: string[]
-  }>, tx?: Transaction): Promise<Transaction> {
+  }>, tx?: Transaction, sponsoredTx?: boolean, suiCoinObjectsForPythUpdate?: string[]): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
     }
-    tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+    }
 
     for (const position of positions) {
       const {
@@ -483,8 +529,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
       const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-      const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-      const feeObject = tx.splitCoins(coinObject, [tx.pure.u64(relayerFee)])
 
       const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
       const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -497,6 +541,16 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         innerIsTakeProfitOrder = true
       }
 
+      // Process coin splitting
+      const [feeObject] = this.processCoinSplitting(
+        tx,
+        collateralToken,
+        coinObjects,
+        [tx.pure.u64(relayerFee)],
+        sponsoredTx,
+        suiCoinObject,
+      )
+
       tx.moveCall({
         target: `${this.consts.zoCore.package}::market::decrease_position`,
         typeArguments: [
@@ -546,17 +600,13 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     relayerFee = BigInt(0.5),
     referralAddress?: string,
     sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
       tx = await this.addReferral(referralAddress, tx)
     }
-    tx = await this.initOracleTxb([collateralToken, indexToken], tx)
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-    const [depositObject, feeObject] = tx.splitCoins(coinObject, [
-      tx.pure.u64(collateralAmount),
-      tx.pure.u64(relayerFee),
-    ])
 
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage)
@@ -578,6 +628,26 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       itemId: scard,
     })
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [depositObject, feeObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(collateralAmount), tx.pure.u64(relayerFee)],
+      sponsoredTx,
+      suiCoinObject,
+    )
+
     tx.moveCall({
       target: `${this.consts.zoCore.package}::market::open_position_with_scard`,
       typeArguments: [
@@ -613,6 +683,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         promise,
       })
       .finalize()
+
     return tx
   }
 
@@ -634,11 +705,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
     coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!coinObjects) {
       throw new Error(`${this.constructor.name}: coinObjects is required`)
     }
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+
+    let tx = new Transaction()
 
     const kioskTx = new KioskTransaction({
       transaction: tx,
@@ -652,8 +726,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     })
 
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects || [])
-    const feeObject = tx.splitCoins(coinObject, [tx.pure.u64(relayerFee)])
 
     const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
     const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -666,6 +738,26 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       isTakeProfitOrder = true
     }
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [feeObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(relayerFee)],
+      sponsoredTx,
+      suiCoinObject,
+    )
+
     tx.moveCall({
       target: `${this.consts.zoCore.package}::market::decrease_position_with_scard`,
       typeArguments: [
@@ -724,11 +816,22 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     kioskCap: KioskOwnerCap,
     scard: string,
     tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
     }
-    tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+    }
 
     const kioskTx = new KioskTransaction({
       transaction: tx,
@@ -760,8 +863,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
       const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-      const coinObject = this.processCoins(tx, collateralToken, coinObjects || [])
-      const feeObject = tx.splitCoins(coinObject, [tx.pure.u64(relayerFee || BigInt(0.5))])
 
       const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
       const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -774,6 +875,16 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         innerIsTakeProfitOrder = true
       }
 
+      // Process coin splitting
+      const [feeObject] = this.processCoinSplitting(
+        tx,
+        collateralToken,
+        coinObjects,
+        [tx.pure.u64(relayerFee)],
+        sponsoredTx,
+        suiCoinObject,
+      )
+
       tx.moveCall({
         target: `${this.consts.zoCore.package}::market::decrease_position_with_scard`,
         typeArguments: [
@@ -822,10 +933,29 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     amount: number,
     coinObjects: string[],
     long: boolean,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-    const [depositObject] = tx.splitCoins(coinObject, [tx.pure.u64(amount)])
+    let tx = new Transaction()
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [depositObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(amount)],
+      sponsoredTx,
+      suiCoinObject,
+    )
 
     tx.moveCall({
       target: `${this.consts.zoCore.package}::market::pledge_in_position`,
@@ -846,8 +976,19 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     indexToken: string,
     amount: number,
     long: boolean,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    let tx = new Transaction()
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
     tx.moveCall({

package/src/implementations/ZLPDataAPI.ts

@@ -688,6 +688,7 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
   }
 
   private async parseSymbolInfo(raw: any, long: boolean): Promise<IZLPSymbolInfo> {
+    const { objectId } = raw.data
     const { fields } = raw.data.content.fields.value
     const fundingFeeModelAddr = fields.funding_fee_model
     const fundingFeeModelRaw = await this.provider.getObject({
@@ -699,6 +700,7 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     const fundingFeeModel = ZLPDataAPI.parseFundingFeeModel(fundingFeeModelRaw)
 
     return {
+      objectId,
       openingSize: parseValue(fields.opening_size),
       openingAmount: parseValue(fields.opening_amount),
       accFundingRate: parseValue(fields.acc_funding_rate),

package/src/interfaces/base.ts

@@ -62,6 +62,7 @@ export interface IBaseRebaseFeeModel {
 }
 
 export interface IBaseSymbolInfo {
+  objectId: string
   openingSize: number
   openingAmount: number
   accFundingRate: number
@@ -271,7 +272,6 @@ export interface IBaseAPI {
     sender?: string,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
-    isDepositingSui?: boolean,
   ) => Promise<Transaction>
 
   withdraw: (
@@ -322,7 +322,9 @@ export interface IBaseAPI {
     collateralSlippage?: number,
     relayerFee?: bigint,
     referralAddress?: string,
-    sender?: string
+    sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ) => Promise<Transaction>
 
   decreasePosition: (
@@ -339,7 +341,9 @@ export interface IBaseAPI {
     pricesSlippage?: number,
     collateralSlippage?: number,
     relayerFee?: bigint,
-    coinObjects?: string[]
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ) => Promise<Transaction>
 
   decreaseMultiPositions: (
@@ -447,6 +451,8 @@ export interface IBaseAPI {
     relayerFee?: bigint,
     referralAddress?: string,
     sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ) => Promise<Transaction>
 
   decreasePositionWithSCard: (