@zofai/zo-sdk 0.2.8 → 0.2.10

package/src/implementations/SLPAPI.ts

@@ -53,7 +53,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -67,12 +66,16 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
 
     // 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)
@@ -96,7 +99,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     }
 
     // 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)],
@@ -134,7 +137,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<TransactionObjectArgument> {
     if (!tx) {
       tx = new Transaction()
@@ -150,12 +152,16 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
 
     // 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)
@@ -176,7 +182,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     }
 
     // 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)],
@@ -214,7 +220,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -230,8 +235,12 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
 
     // 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)
 
@@ -254,7 +263,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     }
 
     // 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)
 
@@ -285,7 +294,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     amount: number,
     minAmountOut = 0,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -293,11 +302,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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 slpCoinObject = this.processCoins(tx, 'slp', lpCoinObjects, false)
@@ -338,7 +351,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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({
@@ -366,7 +379,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     minAmountOut = 0,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<TransactionObjectArgument> {
     if (!tx) {
       tx = new Transaction()
@@ -376,11 +389,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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 slpCoinObject = this.processCoins(tx, 'slp', lpCoinObjects, false)
@@ -412,9 +429,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     fromCoinObjects: string[],
     minAmountOut?: number,
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb(
-      Object.keys(this.consts.sudoCore.vaults),
-    )
+    const { tx } = await this.initOracleTxb(Object.keys(this.consts.sudoCore.vaults))
     const fromCoinObject = this.processCoins(tx, fromToken, fromCoinObjects)
     const [fromDepositObject] = tx.splitCoins(fromCoinObject, [
       tx.pure.u64(fromAmount),
@@ -457,10 +472,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     if (!tx) {
       tx = new Transaction()
     }
-    tx = await this.initOracleTxb(
-      Object.keys(this.consts.sudoCore.vaults),
-      tx,
-    )
+    tx = (await this.initOracleTxb(Object.keys(this.consts.sudoCore.vaults), tx)).tx
     const fromCoinObject = this.processCoins(tx, fromToken, fromCoinObjects)
     const [fromDepositObject] = tx.splitCoins(fromCoinObject, [
       tx.pure.u64(fromAmount),
@@ -707,7 +719,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -725,11 +736,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -794,7 +809,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -814,11 +828,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -876,7 +894,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -896,11 +913,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -963,7 +984,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -985,11 +1005,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -1043,7 +1067,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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`)
@@ -1052,11 +1076,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     let tx = new Transaction()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
-    const adjustPrice = this.processSlippage(
-      indexPrice,
-      !long,
-      isTriggerOrder ? 0 : pricesSlippage,
-    )
+    const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
     const adjustCollateralPrice = this.processSlippage(
       collateralPrice,
       false,
@@ -1073,11 +1093,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
 
     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
     }
 
     // Handle oracle initialization and coin processing
@@ -1140,7 +1164,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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`)
@@ -1163,11 +1187,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -1227,7 +1255,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     }>,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -1236,11 +1264,20 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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) {
@@ -1330,15 +1367,22 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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')
@@ -1410,18 +1454,22 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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
@@ -1458,17 +1506,21 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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)
 
@@ -1732,7 +1784,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -1762,11 +1813,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -1840,7 +1895,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -1872,11 +1926,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -1943,7 +2001,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -1974,11 +2031,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -2051,7 +2112,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -2084,11 +2144,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -2151,7 +2215,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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`)
@@ -2160,11 +2224,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     let tx = new Transaction()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
-    const adjustPrice = this.processSlippage(
-      indexPrice,
-      !long,
-      isTriggerOrder ? 0 : pricesSlippage,
-    )
+    const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
     const adjustCollateralPrice = this.processSlippage(
       collateralPrice,
       false,
@@ -2193,11 +2253,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -2268,7 +2332,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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`)
@@ -2302,11 +2366,15 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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
@@ -2377,7 +2445,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     scard: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -2386,11 +2454,20 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     // 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({
@@ -2507,17 +2584,24 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     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')
@@ -2621,7 +2705,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     collateralToken: string,
     indexToken: string,
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    const { tx } = await this.initOracleTxb([collateralToken, indexToken])
     return tx
   }