@zofai/zo-sdk 0.2.9 → 0.2.10

package/src/implementations/ZLPAPI.ts

@@ -53,7 +53,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -67,12 +66,16 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
 
     // Handle sponsored transaction case
     if (sponsoredTx) {
-      const suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
-      tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
+      const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: coin === 'sui' ? BigInt(amount) : 0n,
+      })
+      tx = oracle.tx
+      const { suiCoinObject } = oracle
 
       // Process deposit coins
       const depositObject = coin === 'sui'
-        ? tx.splitCoins(suiCoinObject, [tx.pure.u64(amount)])[0]
+        ? tx.splitCoins(suiCoinObject!, [tx.pure.u64(amount)])[0]
         : tx.splitCoins(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
@@ -93,7 +96,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     }
 
     // Handle non-sponsored transaction case
-    tx = await this.initOracleTxb(pythFeederKeys, tx)
+    tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     const depositObject = tx.splitCoins(
       this.processCoins(tx, coin, coinObjects, false),
       [tx.pure.u64(amount)],
@@ -131,7 +134,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<TransactionObjectArgument> {
     if (!tx) {
       tx = new Transaction()
@@ -147,12 +149,16 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
 
     // Handle sponsored transaction case
     if (sponsoredTx) {
-      const suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
-      tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
+      const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: coin === 'sui' ? BigInt(amount) : 0n,
+      })
+      tx = oracle.tx
+      const { suiCoinObject } = oracle
 
       // Process deposit coins
       const depositObject = coin === 'sui'
-        ? tx.splitCoins(suiCoinObject, [tx.pure.u64(amount)])[0]
+        ? tx.splitCoins(suiCoinObject!, [tx.pure.u64(amount)])[0]
         : tx.splitCoins(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
@@ -173,7 +179,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     }
 
     // Handle non-sponsored transaction case
-    tx = await this.initOracleTxb(pythFeederKeys, tx)
+    tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     const depositObject = tx.splitCoins(
       this.processCoins(tx, coin, coinObjects, false),
       [tx.pure.u64(amount)],
@@ -208,7 +214,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -224,8 +229,12 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
 
     // Handle sponsored transaction case
     if (sponsoredTx) {
-      const suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
-      tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
+      const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: 0n,
+      })
+      tx = oracle.tx
+      const { suiCoinObject } = oracle
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -245,7 +254,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     }
 
     // Handle non-sponsored transaction case
-    tx = await this.initOracleTxb(pythFeederKeys, tx)
+    tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
 
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -276,7 +285,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     amount: number,
     minAmountOut = 0,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -284,11 +293,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder)
 
     if (sponsoredTx) {
-      const suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
-      tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
+      const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: 0n,
+      })
+      tx = oracle.tx
+      const { suiCoinObject } = oracle
     }
     else {
-      tx = await this.initOracleTxb(pythFeederKeys, tx)
+      tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     }
     const zlpCoinObject = this.processCoins(tx, 'zlp', lpCoinObjects, false)
     const [withdrawObject] = tx.splitCoins(zlpCoinObject, [tx.pure.u64(amount)])
@@ -327,7 +340,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // Initialize oracle transaction
     const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder)
 
-    tx = await this.initOracleTxb(pythFeederKeys, tx)
+    tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
     tx.moveCall({
@@ -355,7 +368,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     minAmountOut = 0,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<TransactionObjectArgument> {
     if (!tx) {
       tx = new Transaction()
@@ -365,11 +378,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder)
 
     if (sponsoredTx) {
-      const suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
-      tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
+      const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: 0n,
+      })
+      tx = oracle.tx
+      const { suiCoinObject } = oracle
     }
     else {
-      tx = await this.initOracleTxb(pythFeederKeys, tx)
+      tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     }
     const zlpCoinObject = this.processCoins(tx, 'zlp', lpCoinObjects, false)
     const [withdrawObject] = tx.splitCoins(zlpCoinObject, [tx.pure.u64(amount)])
@@ -599,7 +616,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     fromCoinObjects: string[],
     minAmountOut?: number,
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb(Object.keys(this.consts.zoCore.vaults))
+    const { tx } = await this.initOracleTxb(Object.keys(this.consts.zoCore.vaults))
     const fromCoinObject = this.processCoins(tx, fromToken, fromCoinObjects)
     const [fromDepositObject] = tx.splitCoins(fromCoinObject, [tx.pure.u64(fromAmount)])
     const vaultsValuation = this.dataAPI.valuateVaults(tx)
@@ -640,7 +657,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     if (!tx) {
       tx = new Transaction()
     }
-    tx = await this.initOracleTxb(Object.keys(this.consts.zoCore.vaults), tx)
+    tx = (await this.initOracleTxb(Object.keys(this.consts.zoCore.vaults), tx)).tx
     const fromCoinObject = this.processCoins(tx, fromToken, fromCoinObjects)
     const [fromDepositObject] = tx.splitCoins(fromCoinObject, [
       tx.pure.u64(fromAmount),
@@ -688,7 +705,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -707,11 +723,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? collateralAmount + relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -775,7 +795,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -795,11 +814,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? collateralAmount + relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -862,7 +885,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -883,11 +905,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -944,7 +970,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -966,11 +991,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1024,7 +1053,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     relayerFee = BigInt(0.5),
     coinObjects?: string[],
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!coinObjects) {
       throw new Error(`${this.constructor.name}: coinObjects is required`)
@@ -1047,11 +1076,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1064,7 +1097,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       suiCoinObject,
     )
 
-
     tx.moveCall({
       target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position`,
       typeArguments: [
@@ -1113,7 +1145,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     relayerFee = BigInt(0.5),
     coinObjects?: string[],
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!coinObjects) {
       throw new Error(`${this.constructor.name}: coinObjects is required`)
@@ -1136,11 +1168,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1153,7 +1189,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       suiCoinObject,
     )
 
-
     tx.moveCall({
       target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_v2`,
       typeArguments: [
@@ -1197,7 +1232,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralSlippage?: number
     relayerFee?: bigint
     coinObjects?: string[]
-  }>, tx?: Transaction, sponsoredTx?: boolean, suiCoinObjectsForPythUpdate?: string[]): Promise<Transaction> {
+  }>, tx?: Transaction, sponsoredTx?: boolean, sender?: string): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
     }
@@ -1205,11 +1240,20 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb(
+        positions.flatMap(position => [position.collateralToken, position.indexToken]),
+        tx,
+        true,
+        { sender: this.requireSenderForSponsored(sender) },
+      )
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+      tx = (await this.initOracleTxb(
+        positions.flatMap(position => [position.collateralToken, position.indexToken]),
+        tx,
+      )).tx
     }
 
     for (const position of positions) {
@@ -1253,7 +1297,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         suiCoinObject,
       )
 
-
       tx.moveCall({
         target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position`,
         typeArguments: [
@@ -1298,15 +1341,22 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralSlippage?: number
     relayerFee?: bigint
     coinObjects?: string[]
-  }>, tx?: Transaction, sponsoredTx?: boolean, suiCoinObjectsForPythUpdate?: string[], feeObjects?: TransactionObjectArgument[]): Promise<Transaction> {
-    const transaction = tx ?? new Transaction()
+  }>, tx?: Transaction, sponsoredTx?: boolean, sender?: string, feeObjects?: TransactionObjectArgument[]): Promise<Transaction> {
+    let transaction = tx ?? new Transaction()
 
     // Handle oracle initialization and coin processing
     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)
+    let suiCoinObject
+    if (sponsoredTx) {
+      const oracle = await this.initOracleTxb(tokens, transaction, true, {
+        sender: this.requireSenderForSponsored(sender),
+      })
+      transaction = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
+    }
+    else {
+      transaction = (await this.initOracleTxb(tokens, transaction, false)).tx
+    }
 
     if (!feeObjects || feeObjects.length !== positions.length) {
       throw new Error('feeObjects must be provided (pre-processed via buildFeeCoinObjects) and match positions length')
@@ -1342,7 +1392,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         innerIsTakeProfitOrder = true
       }
 
-
       transaction.moveCall({
         target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_v2`,
         typeArguments: [
@@ -1392,7 +1441,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -1422,11 +1470,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1499,7 +1551,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -1530,11 +1581,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1606,7 +1661,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -1638,11 +1692,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1708,7 +1766,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -1741,11 +1798,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1808,7 +1869,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     relayerFee = BigInt(0.5),
     coinObjects?: string[],
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!coinObjects) {
       throw new Error(`${this.constructor.name}: coinObjects is required`)
@@ -1843,11 +1904,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1860,7 +1925,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       suiCoinObject,
     )
 
-
     tx.moveCall({
       target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard`,
       typeArguments: [
@@ -1917,7 +1981,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     relayerFee = BigInt(0.5),
     coinObjects?: string[],
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!coinObjects) {
       throw new Error(`${this.constructor.name}: coinObjects is required`)
@@ -1951,11 +2015,15 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? relayerFee : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -1968,7 +2036,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       suiCoinObject,
     )
 
-
     tx.moveCall({
       target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard_v2`,
       typeArguments: [
@@ -2027,7 +2094,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     scard: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -2036,11 +2103,20 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // 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)
+      const oracle = await this.initOracleTxb(
+        positions.flatMap(position => [position.collateralToken, position.indexToken]),
+        tx,
+        true,
+        { sender: this.requireSenderForSponsored(sender) },
+      )
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+      tx = (await this.initOracleTxb(
+        positions.flatMap(position => [position.collateralToken, position.indexToken]),
+        tx,
+      )).tx
     }
 
     const kioskTx = new KioskTransaction({
@@ -2095,7 +2171,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         suiCoinObject,
       )
 
-
       tx.moveCall({
         target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard`,
         typeArguments: [
@@ -2156,17 +2231,24 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     scard: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
     feeObjects?: TransactionObjectArgument[],
   ): Promise<Transaction> {
-    const transaction = tx ?? new Transaction()
+    let transaction = tx ?? new Transaction()
 
     // Handle oracle initialization and coin processing
     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)
+    let suiCoinObject
+    if (sponsoredTx) {
+      const oracle = await this.initOracleTxb(tokens, transaction, true, {
+        sender: this.requireSenderForSponsored(sender),
+      })
+      transaction = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
+    }
+    else {
+      transaction = (await this.initOracleTxb(tokens, transaction, false)).tx
+    }
 
     if (!feeObjects || feeObjects.length !== positions.length) {
       throw new Error('feeObjects must be provided (pre-processed via buildFeeCoinObjects) and match positions length')
@@ -2213,7 +2295,6 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         innerIsTakeProfitOrder = true
       }
 
-
       transaction.moveCall({
         target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard_v2`,
         typeArguments: [
@@ -2262,17 +2343,21 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     coinObjects: string[],
     long: boolean,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: collateralToken === 'sui' ? BigInt(amount) : 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
     // Process coin splitting
@@ -2305,17 +2390,21 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     amount: number,
     long: boolean,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     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)
+      const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
+        sender: this.requireSenderForSponsored(sender),
+        additionalSuiAmount: 0n,
+      })
+      tx = oracle.tx
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
-      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+      tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
@@ -2573,7 +2662,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     collateralToken: string,
     indexToken: string,
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    const { tx } = await this.initOracleTxb([collateralToken, indexToken])
     return tx
   }