@zofai/zo-sdk 0.2.8 → 0.2.10

package/src/implementations/ZBTCVCAPI.ts

@@ -105,7 +105,6 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -135,11 +134,15 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     // 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
@@ -209,7 +212,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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`)
@@ -244,11 +247,15 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     // 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
@@ -320,7 +327,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     scard: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
@@ -329,11 +336,20 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     // 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({
@@ -437,7 +453,6 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -451,12 +466,16 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
 
     // 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)
@@ -477,7 +496,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     }
 
     // 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)],
@@ -515,7 +534,6 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     sender?: string,
     tx?: Transaction,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<any> {
     if (!tx) {
       tx = new Transaction()
@@ -531,12 +549,16 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
 
     // 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)
@@ -557,7 +579,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     }
 
     // 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)],
@@ -593,7 +615,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     amount: number,
     minAmountOut = 0,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
+    sender?: string,
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -601,11 +623,15 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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 zbtcvcCoinObject = this.processCoins(tx, 'zbtcvc', lpCoinObjects, false)
     const [withdrawObject] = tx.splitCoins(zbtcvcCoinObject, [tx.pure.u64(amount)])
@@ -740,7 +766,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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)
@@ -784,7 +810,6 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     referralAddress?: string,
     sender?: string,
     sponsoredTx?: boolean,
-    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -803,11 +828,15 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     // 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
@@ -868,7 +897,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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`)
@@ -890,11 +919,15 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     // 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
@@ -951,7 +984,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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()
     }
@@ -959,11 +992,20 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     // 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) {
@@ -1047,17 +1089,21 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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
@@ -1090,17 +1136,21 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     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)
 
@@ -1235,7 +1285,7 @@ export class ZBTCVCAPI extends BaseAPI implements IZBTCVCAPI {
     collateralToken: string,
     indexToken: string,
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    const { tx } = await this.initOracleTxb([collateralToken, indexToken])
     return tx
   }