zo-sdk 0.1.89 → 0.1.91

package/src/implementations/ZLPAPI.ts

@@ -1356,26 +1356,25 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralSlippage?: number
     relayerFee?: bigint
     coinObjects?: string[]
-  }>, tx?: Transaction, sponsoredTx?: boolean, suiCoinObjectsForPythUpdate?: string[]): Promise<Transaction> {
-    if (!tx) {
-      tx = new Transaction()
-    }
+  }>, tx?: Transaction, sponsoredTx?: boolean, suiCoinObjectsForPythUpdate?: string[], feeObjects?: TransactionObjectArgument[]): Promise<Transaction> {
+    const transaction = tx ?? new Transaction()
 
     // 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 tokens = positions.flatMap(position => [position.collateralToken, position.indexToken])
+    const suiCoinObject = sponsoredTx
+      ? this.processCoins(transaction, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      : undefined
+    await this.initOracleTxb(tokens, transaction, !!sponsoredTx, suiCoinObject)
+
+    if (!feeObjects || feeObjects.length !== positions.length) {
+      throw new Error('feeObjects must be provided (pre-processed via buildFeeCoinObjects) and match positions length')
     }
 
-    for (const position of positions) {
+    for (const [i, position] of positions.entries()) {
+      const feeObject = feeObjects[i]
       const {
         pcpId,
         collateralToken,
-        coinObjects = [],
         indexToken,
         amount,
         long,
@@ -1386,7 +1385,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         isIocOrder = false,
         pricesSlippage = 0.003,
         collateralSlippage = 0.5,
-        relayerFee = BigInt(0.5),
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
 
@@ -1402,17 +1400,7 @@ 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({
+      transaction.moveCall({
         target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_v2`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
@@ -1422,22 +1410,22 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
           this.consts.coins[collateralToken].module,
         ],
         arguments: [
-          tx.object(SUI_CLOCK_OBJECT_ID),
-          tx.object(this.consts.zoCore.market),
-          tx.object(pcpId),
-          tx.object(this.consts.pythFeeder.feeder[collateralToken]),
-          tx.object(this.consts.pythFeeder.feeder[indexToken]),
+          transaction.object(SUI_CLOCK_OBJECT_ID),
+          transaction.object(this.consts.zoCore.market),
+          transaction.object(pcpId),
+          transaction.object(this.consts.pythFeeder.feeder[collateralToken]),
+          transaction.object(this.consts.pythFeeder.feeder[indexToken]),
           feeObject,
-          tx.pure.u8(allowTrade),
-          tx.pure.bool(innerIsTakeProfitOrder),
-          tx.pure.u64(amount),
-          tx.pure.u256(adjustCollateralPrice),
-          tx.pure.u256(adjustPrice),
-          tx.pure.u256(indexPriceThreshold),
+          transaction.pure.u8(allowTrade),
+          transaction.pure.bool(innerIsTakeProfitOrder),
+          transaction.pure.u64(amount),
+          transaction.pure.u256(adjustCollateralPrice),
+          transaction.pure.u256(adjustPrice),
+          transaction.pure.u256(indexPriceThreshold),
         ],
       })
     }
-    return tx
+    return transaction
   }
 
   public async openPositionWithSCard(
@@ -2223,23 +2211,23 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     tx?: Transaction,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
+    feeObjects?: TransactionObjectArgument[],
   ): Promise<Transaction> {
-    if (!tx) {
-      tx = new Transaction()
-    }
+    const transaction = tx ?? new Transaction()
 
     // 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 tokens = positions.flatMap(position => [position.collateralToken, position.indexToken])
+    const suiCoinObject = sponsoredTx
+      ? this.processCoins(transaction, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      : undefined
+    await this.initOracleTxb(tokens, transaction, !!sponsoredTx, suiCoinObject)
+
+    if (!feeObjects || feeObjects.length !== positions.length) {
+      throw new Error('feeObjects must be provided (pre-processed via buildFeeCoinObjects) and match positions length')
     }
 
     const kioskTx = new KioskTransaction({
-      transaction: tx,
+      transaction,
       kioskClient,
       cap: kioskCap,
     })
@@ -2249,7 +2237,8 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       itemId: scard,
     })
 
-    for (const position of positions) {
+    for (const [i, position] of positions.entries()) {
+      const feeObject = feeObjects[i]
       const {
         pcpId,
         collateralToken,
@@ -2263,8 +2252,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         isIocOrder = false,
         pricesSlippage = 0.003,
         collateralSlippage = 0.5,
-        relayerFee = BigInt(0.5),
-        coinObjects = [],
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
 
@@ -2280,17 +2267,7 @@ 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({
+      transaction.moveCall({
         target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard_v2`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
@@ -2300,18 +2277,18 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
           this.consts.coins[collateralToken].module,
         ],
         arguments: [
-          tx.object(SUI_CLOCK_OBJECT_ID),
-          tx.object(this.consts.zoCore.market),
-          tx.object(pcpId),
-          tx.object(this.consts.pythFeeder.feeder[collateralToken]),
-          tx.object(this.consts.pythFeeder.feeder[indexToken]),
+          transaction.object(SUI_CLOCK_OBJECT_ID),
+          transaction.object(this.consts.zoCore.market),
+          transaction.object(pcpId),
+          transaction.object(this.consts.pythFeeder.feeder[collateralToken]),
+          transaction.object(this.consts.pythFeeder.feeder[indexToken]),
           feeObject,
-          tx.pure.u8(allowTrade),
-          tx.pure.bool(innerIsTakeProfitOrder),
-          tx.pure.u64(amount),
-          tx.pure.u256(adjustCollateralPrice),
-          tx.pure.u256(adjustPrice),
-          tx.pure.u256(indexPriceThreshold),
+          transaction.pure.u8(allowTrade),
+          transaction.pure.bool(innerIsTakeProfitOrder),
+          transaction.pure.u64(amount),
+          transaction.pure.u256(adjustCollateralPrice),
+          transaction.pure.u256(adjustPrice),
+          transaction.pure.u256(indexPriceThreshold),
           sudoCard,
         ],
       })
@@ -2324,7 +2301,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         promise,
       })
       .finalize()
-    return tx
+    return transaction
   }
 
   /**

package/src/interfaces/base.ts

@@ -483,6 +483,7 @@ export interface IBaseAPI {
     tx?: Transaction,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
+    feeObjects?: TransactionObjectArgument[],
   ) => Promise<Transaction>
 
   pledgeInPosition: (
@@ -762,6 +763,7 @@ export interface IBaseAPI {
     tx?: Transaction,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
+    feeObjects?: TransactionObjectArgument[],
   ) => Promise<Transaction>
 
   claimTokenFromSCard: (