zo-sdk 0.1.7 → 0.1.9

package/src/abstract/BaseAPI.ts

@@ -41,6 +41,17 @@ export abstract class BaseAPI extends BaseDataAPI implements IBaseAPI {
     return tx.object(coinObjects[0])
   }
 
+  protected processCoinSplitting(tx: Transaction, token: string, coinObjects: string[], amounts: any[], sponsoredTx?: boolean, suiCoinObject?: any) {
+    if (sponsoredTx) {
+      const sourceObject = token === 'sui'
+        ? suiCoinObject
+        : this.processCoins(tx, token, coinObjects, true)
+      return tx.splitCoins(sourceObject, amounts)
+    }
+    const coinObject = this.processCoins(tx, token, coinObjects)
+    return tx.splitCoins(coinObject, amounts)
+  }
+
   /**
    * Processes slippage for price calculations
    */
@@ -71,7 +82,6 @@ export abstract class BaseAPI extends BaseDataAPI implements IBaseAPI {
     sender?: string,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
-    isDepositingSui?: boolean,
   ): Promise<Transaction>
 
   public abstract withdraw(
@@ -122,7 +132,9 @@ export abstract class BaseAPI extends BaseDataAPI implements IBaseAPI {
     collateralSlippage?: number,
     relayerFee?: bigint,
     referralAddress?: string,
-    sender?: string
+    sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction>
 
   public abstract decreasePosition(
@@ -139,7 +151,9 @@ export abstract class BaseAPI extends BaseDataAPI implements IBaseAPI {
     pricesSlippage?: number,
     collateralSlippage?: number,
     relayerFee?: bigint,
-    coinObjects?: string[]
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction>
 
   public abstract decreaseMultiPositions(

package/src/consts/deployments-slp-mainnet.json

@@ -14,39 +14,39 @@
     "orders_parent": "0x6084377e6a7eb77c6bcc18e8f2af8a46708af87e98aff448a44e46d7c5afd31a",
     "vaults": {
       "sui": {
-        "weight": "70000000000000000",
+        "weight": "200000000000000000",
         "reserving_fee_model": "0x06420378d3b4bdba8d5afc2f88d33b7c7640aa14330c35f14c9874289147f15b"
       },
       "usdc": {
-        "weight": "0",
+        "weight": "50000000000000000",
         "reserving_fee_model": "0x75183cd63566bf3ef9c5d1ec790a28e5b0a75a0901a33b48e1e8423a62a6eb9d"
       },
       "usdt": {
-        "weight": "0",
+        "weight": "50000000000000000",
         "reserving_fee_model": "0xbb09fbc5c2103ffcde3c589463c700b7c6cd2c2a462429c6b5fd147c7b1aba4f"
       },
       "afSui": {
-        "weight": "12500000000000000",
+        "weight": "200000000000000000",
         "reserving_fee_model": "0x94243eff61204c6afb510639de396217dbbc0cc838626ce7ae8ab7aa9b30a020"
       },
       "vSui": {
-        "weight": "12500000000000000",
+        "weight": "200000000000000000",
         "reserving_fee_model": "0xc02335751b486792862e2d04402f64296442e104e2ee79e1ef9a56f038a2cd2e"
       },
       "buck": {
-        "weight": "2000000000000000",
+        "weight": "50000000000000000",
         "reserving_fee_model": "0xb5bfc5231b21059123fd4c0bdb39af025ec3025683d43fe23e05cf792bcbc8b8"
       },
       "nusdc": {
-        "weight": "2000000000000000",
+        "weight": "100000000000000000",
         "reserving_fee_model": "0xc9f2c56c85589ce19d58a55097234df845fca075a902c4b912d36ba5d21b32de"
       },
       "suiEth": {
-        "weight": "0",
+        "weight": "50000000000000000",
         "reserving_fee_model": "0xd0d0b5076dd61ff70205a2f38d3abc6d18974b0ef524bb2dc7631371b5090b8c"
       },
       "ausd": {
-        "weight": "1000000000000000",
+        "weight": "50000000000000000",
         "reserving_fee_model": "0xcf5fcdd8fc9d295f1d44ba68a0b74350fe8191ee6b367dfa8c103c5ebc6f80c0"
       }
     },

package/src/consts/deployments-zlp-mainnet.json

@@ -18,19 +18,19 @@
         "reserving_fee_model": "0x4d19ffb376fb4c0dcfc85f434b100372f55a67eae44078b4516b61f28a82ceb4"
       },
       "deep": {
-        "weight": "12500000000000000",
+        "weight": "25000000000000000",
         "reserving_fee_model": "0x229d034eba80fc3473a691e945923c57bb369ee6823a69824d68e20c462e0577"
       },
       "nusdc": {
-        "weight": "10000000000000000",
+        "weight": "50000000000000000",
         "reserving_fee_model": "0x7536eaafa9851c86ca771eff21b915d787d57e0939bb353ba6a5839b0bcc472f"
       },
       "wal": {
-        "weight": "12500000000000000",
+        "weight": "25000000000000000",
         "reserving_fee_model": "0x86ee98bdf815a46d4eff6a622f4e95eb0cf630e48a51ab2c340abb57883442b1"
       },
       "cetus": {
-        "weight": "10000000000000000",
+        "weight": "12500000000000000",
         "reserving_fee_model": "0x21c5f1cc0596ac9fc2b2cc6c4c748dc5ccc66f116fcf25900822c683d6a38972"
       }
     },

package/src/implementations/SLPAPI.ts

@@ -153,7 +153,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sender?: string,
     sponsoredTx?: boolean,
     suiCoinObjectsForPythUpdate?: string[],
-    isDepositingSui?: boolean,
   ): Promise<Transaction> {
     let tx = new Transaction()
 
@@ -171,7 +170,7 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       tx = await this.initOracleTxb(pythFeederKeys, tx, true, suiCoinObject)
 
       // Process deposit coins
-      const depositObject = isDepositingSui
+      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]
 
@@ -400,27 +399,46 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     relayerFee = BigInt(0.5),
     referralAddress?: string,
     sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
       tx = await this.addReferral(referralAddress, tx)
     }
-    tx = await this.initOracleTxb([collateralToken, indexToken], tx)
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-    const [depositObject] = tx.splitCoins(coinObject, [
-      tx.pure.u64(collateralAmount),
-    ])
-    const feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee || BigInt(0.5))]) // Sudo contract requires SUI as fee
 
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-    const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage || 0.003)
-    const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage || 0.5)
+    const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage)
+    const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
 
     let allowTrade = ALLOW_TRADE_MUST_TRADE
     if (isLimitOrder) {
       allowTrade = isIocOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE
     }
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    let feeObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      feeObject = tx.splitCoins(suiCoinObject, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [depositObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(collateralAmount)],
+      sponsoredTx,
+      suiCoinObject,
+    )
+
     tx.moveCall({
       target: `${this.consts.sudoCore.upgradedPackage}::market::open_position_v1_2`,
       typeArguments: [
@@ -470,10 +488,12 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     pricesSlippage = 0.003,
     collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    let tx = new Transaction()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-    const feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
 
     const adjustPrice = this.processSlippage(
       indexPrice,
@@ -494,6 +514,19 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       isTakeProfitOrder = true
     }
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    let feeObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      feeObject = tx.splitCoins(suiCoinObject, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
     tx.moveCall({
       target: `${this.consts.sudoCore.upgradedPackage}::market::decrease_position_v1_2`,
       typeArguments: [
@@ -544,11 +577,22 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       coinObjects?: string[]
     }>,
     tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
     }
-    tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+
+    // 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)
+    }
+    else {
+      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+    }
 
     for (const position of positions) {
       const {
@@ -569,8 +613,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
       const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-      const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-      const feeObject = tx.splitCoins(coinObject, [tx.pure.u64(relayerFee)])
 
       const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
       const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -583,6 +625,16 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
         innerIsTakeProfitOrder = true
       }
 
+      // Process coin splitting
+      const [feeObject] = this.processCoinSplitting(
+        tx,
+        collateralToken,
+        coinObjects,
+        [tx.pure.u64(relayerFee)],
+        sponsoredTx,
+        suiCoinObject,
+      )
+
       tx.moveCall({
         target: `${this.consts.sudoCore.upgradedPackage}::market::decrease_position_v1_2`,
         typeArguments: [
@@ -622,10 +674,30 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     amount: number,
     coinObjects: string[],
     long: boolean,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-    const [depositObject] = tx.splitCoins(coinObject, [tx.pure.u64(amount)])
+    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)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [depositObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(amount)],
+      sponsoredTx,
+      suiCoinObject,
+    )
 
     tx.moveCall({
       target: `${this.consts.sudoCore.upgradedPackage}::market::pledge_in_position`,
@@ -650,8 +722,19 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     indexToken: string,
     amount: number,
     long: boolean,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    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)
+    }
+    else {
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
     tx.moveCall({
@@ -847,22 +930,18 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     scard: string,
     isLimitOrder = false,
     isIocOrder = false,
-    pricesSlippage?: number,
-    collateralSlippage?: number,
-    relayerFee?: bigint,
+    pricesSlippage = 0.003,
+    collateralSlippage = 0.5,
+    relayerFee = BigInt(0.5),
     referralAddress?: string,
     sender?: string,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     let tx = new Transaction()
     if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
       tx = await this.addReferral(referralAddress, tx)
     }
-    tx = await this.initOracleTxb([collateralToken, indexToken], tx)
-    const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-    const [depositObject] = tx.splitCoins(coinObject, [
-      tx.pure.u64(collateralAmount),
-    ])
-    const feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee || BigInt(0.5))]) // Sudo contract requires SUI as fee
 
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage || 0.003)
@@ -884,6 +963,29 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       itemId: scard,
     })
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    let feeObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      feeObject = tx.splitCoins(suiCoinObject, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
+    // Process coin splitting
+    const [depositObject] = this.processCoinSplitting(
+      tx,
+      collateralToken,
+      coinObjects,
+      [tx.pure.u64(collateralAmount)],
+      sponsoredTx,
+      suiCoinObject,
+    )
+
     tx.moveCall({
       target: `${this.consts.sudoCore.upgradedPackage}::market::open_position_v1_3`,
       typeArguments: [
@@ -942,10 +1044,12 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     pricesSlippage = 0.003,
     collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
+    coinObjects?: string[],
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
-    const tx = await this.initOracleTxb([collateralToken, indexToken])
+    let tx = new Transaction()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-    const feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
 
     const adjustPrice = this.processSlippage(
       indexPrice,
@@ -977,6 +1081,19 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       itemId: scard,
     })
 
+    // Handle oracle initialization and coin processing
+    let suiCoinObject
+    let feeObject
+    if (sponsoredTx) {
+      suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true)
+      feeObject = tx.splitCoins(suiCoinObject, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject)
+    }
+    else {
+      feeObject = tx.splitCoins(tx.gas, [tx.pure.u64(relayerFee)]) // Sudo contract requires SUI as fee
+      tx = await this.initOracleTxb([collateralToken, indexToken], tx)
+    }
+
     tx.moveCall({
       target: `${this.consts.sudoCore.upgradedPackage}::market::decrease_position_v1_3`,
       typeArguments: [
@@ -1038,11 +1155,22 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     kioskCap: KioskOwnerCap,
     scard: string,
     tx?: Transaction,
+    sponsoredTx?: boolean,
+    suiCoinObjectsForPythUpdate?: string[],
   ): Promise<Transaction> {
     if (!tx) {
       tx = new Transaction()
     }
-    tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+
+    // 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)
+    }
+    else {
+      tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
+    }
 
     const kioskTx = new KioskTransaction({
       transaction: tx,
@@ -1074,8 +1202,6 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
       const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
-      const coinObject = this.processCoins(tx, collateralToken, coinObjects)
-      const feeObject = tx.splitCoins(coinObject, [tx.pure.u64(relayerFee)])
 
       const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage)
       const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage)
@@ -1088,6 +1214,16 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
         innerIsTakeProfitOrder = true
       }
 
+      // Process coin splitting
+      const [feeObject] = this.processCoinSplitting(
+        tx,
+        collateralToken,
+        coinObjects,
+        [tx.pure.u64(relayerFee)],
+        sponsoredTx,
+        suiCoinObject,
+      )
+
       tx.moveCall({
         target: `${this.consts.sudoCore.upgradedPackage}::market::decrease_position_v1_3`,
         typeArguments: [

package/src/implementations/SLPDataAPI.ts

@@ -1008,6 +1008,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
   }
 
   private async parseSymbolInfo(raw: any, long: boolean): Promise<ISLPSymbolInfo> {
+    const { objectId } = raw.data
     const { fields } = raw.data.content.fields.value
     const fundingFeeModelAddr = fields.funding_fee_model
     const fundingFeeModelRaw = await this.provider.getObject({
@@ -1019,6 +1020,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
     const fundingFeeModel = SLPDataAPI.parseFundingFeeModel(fundingFeeModelRaw)
 
     return {
+      objectId,
       openingSize: parseValue(fields.opening_size),
       openingAmount: parseValue(fields.opening_amount),
       accFundingRate: parseValue(fields.acc_funding_rate),