@zofai/zo-sdk 0.2.11 → 0.2.13

package/src/implementations/USDZAPI.ts

@@ -828,8 +828,8 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -871,14 +871,14 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({
@@ -1069,12 +1069,14 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
         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(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
+      const depositObject = await this.resolveSplitCoinObject(
+        tx,
+        coin,
+        BigInt(amount),
+        coinObjects,
+        { sponsoredTx: true, suiCoinObject: oracle.suiCoinObject, sender },
+      )
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -1095,10 +1097,13 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
 
     // Handle non-sponsored transaction case
     tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
-    const depositObject = tx.splitCoins(
-      this.processCoins(tx, coin, coinObjects, false),
-      [tx.pure.u64(amount)],
-    )[0]
+    const depositObject = await this.resolveSplitCoinObject(
+      tx,
+      coin,
+      BigInt(amount),
+      coinObjects,
+      { sender },
+    )
 
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -1152,12 +1157,14 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
         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(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
+      const depositObject = await this.resolveSplitCoinObject(
+        tx,
+        coin,
+        BigInt(amount),
+        coinObjects,
+        { sponsoredTx: true, suiCoinObject: oracle.suiCoinObject, sender },
+      )
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -1178,10 +1185,13 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
 
     // Handle non-sponsored transaction case
     tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
-    const depositObject = tx.splitCoins(
-      this.processCoins(tx, coin, coinObjects, false),
-      [tx.pure.u64(amount)],
-    )[0]
+    const depositObject = await this.resolveSplitCoinObject(
+      tx,
+      coin,
+      BigInt(amount),
+      coinObjects,
+      { sender },
+    )
 
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -1215,24 +1225,35 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
+    if (!lpCoinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: lpCoinObjects or sender is required`)
+    }
+
     let tx = new Transaction()
 
     // Initialize oracle transaction
     const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder)
 
+    let suiCoinObject
     if (sponsoredTx) {
       const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
         sender: this.requireSenderForSponsored(sender),
         additionalSuiAmount: 0n,
       })
       tx = oracle.tx
-      const { suiCoinObject } = oracle
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
       tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     }
-    const usdzCoinObject = this.processCoins(tx, 'usdz', lpCoinObjects, false)
-    const [withdrawObject] = tx.splitCoins(usdzCoinObject, [tx.pure.u64(amount)])
+
+    const withdrawObject = await this.resolveSplitCoinObject(
+      tx,
+      'usdz',
+      BigInt(amount),
+      lpCoinObjects,
+      { sponsoredTx, suiCoinObject, sender },
+    )
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
     tx.moveCall({
@@ -2022,8 +2043,8 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -2054,14 +2075,14 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({

package/src/implementations/ZLPAPI.ts

@@ -71,12 +71,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         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(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
+      const depositObject = await this.resolveSplitCoinObject(
+        tx,
+        coin,
+        BigInt(amount),
+        coinObjects,
+        { sponsoredTx: true, suiCoinObject: oracle.suiCoinObject, sender },
+      )
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -97,10 +99,13 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
 
     // Handle non-sponsored transaction case
     tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
-    const depositObject = tx.splitCoins(
-      this.processCoins(tx, coin, coinObjects, false),
-      [tx.pure.u64(amount)],
-    )[0]
+    const depositObject = await this.resolveSplitCoinObject(
+      tx,
+      coin,
+      BigInt(amount),
+      coinObjects,
+      { sender },
+    )
 
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -154,12 +159,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
         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(this.processCoins(tx, coin, coinObjects, true), [tx.pure.u64(amount)])[0]
+      const depositObject = await this.resolveSplitCoinObject(
+        tx,
+        coin,
+        BigInt(amount),
+        coinObjects,
+        { sponsoredTx: true, suiCoinObject: oracle.suiCoinObject, sender },
+      )
 
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -180,10 +187,13 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
 
     // Handle non-sponsored transaction case
     tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
-    const depositObject = tx.splitCoins(
-      this.processCoins(tx, coin, coinObjects, false),
-      [tx.pure.u64(amount)],
-    )[0]
+    const depositObject = await this.resolveSplitCoinObject(
+      tx,
+      coin,
+      BigInt(amount),
+      coinObjects,
+      { sender },
+    )
 
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
@@ -287,24 +297,35 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
+    if (!lpCoinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: lpCoinObjects or sender is required`)
+    }
+
     let tx = new Transaction()
 
     // Initialize oracle transaction
     const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder)
 
+    let suiCoinObject
     if (sponsoredTx) {
       const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
         sender: this.requireSenderForSponsored(sender),
         additionalSuiAmount: 0n,
       })
       tx = oracle.tx
-      const { suiCoinObject } = oracle
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
       tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     }
-    const zlpCoinObject = this.processCoins(tx, 'zlp', lpCoinObjects, false)
-    const [withdrawObject] = tx.splitCoins(zlpCoinObject, [tx.pure.u64(amount)])
+
+    const withdrawObject = await this.resolveSplitCoinObject(
+      tx,
+      'zlp',
+      BigInt(amount),
+      lpCoinObjects,
+      { sponsoredTx, suiCoinObject, sender },
+    )
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
     tx.moveCall({
@@ -370,6 +391,10 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<TransactionObjectArgument> {
+    if (!lpCoinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: lpCoinObjects or sender is required`)
+    }
+
     if (!tx) {
       tx = new Transaction()
     }
@@ -377,19 +402,26 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     // Initialize oracle transaction
     const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder)
 
+    let suiCoinObject
     if (sponsoredTx) {
       const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
         sender: this.requireSenderForSponsored(sender),
         additionalSuiAmount: 0n,
       })
       tx = oracle.tx
-      const { suiCoinObject } = oracle
+      suiCoinObject = oracle.suiCoinObject
     }
     else {
       tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx
     }
-    const zlpCoinObject = this.processCoins(tx, 'zlp', lpCoinObjects, false)
-    const [withdrawObject] = tx.splitCoins(zlpCoinObject, [tx.pure.u64(amount)])
+
+    const withdrawObject = await this.resolveSplitCoinObject(
+      tx,
+      'zlp',
+      BigInt(amount),
+      lpCoinObjects,
+      { sponsoredTx, suiCoinObject, sender },
+    )
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
     const [withdrawCoin] = tx.moveCall({
@@ -1147,8 +1179,8 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -1179,14 +1211,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({
@@ -1983,8 +2015,8 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -2026,14 +2058,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({

package/src/interfaces/base.ts

@@ -757,6 +757,7 @@ export interface IBaseAPI {
     relayerFee?: bigint,
     coinObjects?: string[],
     sponsoredTx?: boolean,
+    sender?: string,
   ) => Promise<Transaction>
 
   decreaseMultiPositionsWithSCardV2?: (