@zofai/zo-sdk 0.2.9 → 0.2.10

package/src/implementations/SLPDataAPI.ts

@@ -272,7 +272,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
    * Valuates market using simulation (Sudo SDK specific)
    */
   public async simValuate(sender: string): Promise<number> {
-    const tx = await this.initOracleTxb(
+    const { tx } = await this.initOracleTxb(
       Object.keys(this.consts.pythFeeder.feeder),
     )
     this.valuate(tx)
@@ -316,7 +316,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
    * Valuates only vaults (Sudo SDK specific)
    */
   public async simValuateVaults(sender: string): Promise<number> {
-    const tx = await this.initOracleTxb(
+    const { tx } = await this.initOracleTxb(
       Object.keys(this.consts.sudoCore.vaults),
     )
     this.valuateVaults(tx)

package/src/implementations/USDZAPI.ts

@@ -150,7 +150,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -180,11 +179,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -256,7 +259,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -288,11 +290,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -355,7 +361,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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`)
@@ -390,11 +396,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -466,7 +476,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     scard: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -475,11 +485,20 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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({
@@ -593,7 +612,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -624,11 +642,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -701,7 +723,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -734,11 +755,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -801,7 +826,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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`)
@@ -835,11 +860,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -910,17 +939,24 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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')
@@ -1015,7 +1051,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -1029,12 +1064,16 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
 
     // 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)
@@ -1055,7 +1094,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     }
 
     // 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)],
@@ -1093,7 +1132,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<TransactionObjectArgument> {
     if (!tx) {
       tx = new Transaction()
@@ -1109,12 +1147,16 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
 
     // 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)
@@ -1135,7 +1177,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     }
 
     // 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)],
@@ -1171,7 +1213,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     amount: number,
     minAmountOut = 0,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -1179,11 +1221,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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 usdzCoinObject = this.processCoins(tx, 'usdz', lpCoinObjects, false)
     const [withdrawObject] = tx.splitCoins(usdzCoinObject, [tx.pure.u64(amount)])
@@ -1223,7 +1269,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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({
@@ -1450,7 +1496,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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)
@@ -1491,7 +1537,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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),
@@ -1537,7 +1583,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -1556,11 +1601,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -1623,7 +1672,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -1643,11 +1691,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -1710,7 +1762,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -1731,11 +1782,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -1791,7 +1846,6 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -1813,11 +1867,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -1871,7 +1929,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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`)
@@ -1893,11 +1951,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -1958,7 +2020,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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`)
@@ -1981,11 +2043,15 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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
@@ -2041,7 +2107,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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()
     }
@@ -2049,11 +2115,20 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     // 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) {
@@ -2141,15 +2216,22 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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')
@@ -2225,17 +2307,21 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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
@@ -2268,17 +2354,21 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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)
 
@@ -2429,7 +2519,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     collateralToken: string,
     indexToken: string,
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    const { tx } = await this.initOracleTxb([collateralToken, indexToken])
     return tx
   }