zo-sdk 0.1.13 → 0.1.15

package/src/api.ts

@@ -1,9 +1,10 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable class-methods-use-this */
+import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
+import { KioskTransaction } from '@mysten/kiosk'
 import type { SuiClient } from '@mysten/sui/client'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
-import { KioskClient, KioskOwnerCap, KioskTransaction } from '@mysten/kiosk';
 
 import type { Network } from './consts'
 import { ALLOW_TRADE_CAN_TRADE, ALLOW_TRADE_MUST_TRADE, ALLOW_TRADE_NO_TRADE } from './consts'
@@ -74,7 +75,7 @@ export class API extends DataAPI {
     const { vaultsValuation, symbolsValuation } = this.valuate(tx)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::deposit`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::deposit`,
       typeArguments: [`${this.consts.zoCore.package}::zlp::ZLP`, this.consts.coins[coin].module],
       arguments: [
         tx.object(this.consts.zoCore.market),
@@ -96,7 +97,7 @@ export class API extends DataAPI {
     const { vaultsValuation, symbolsValuation } = this.valuate(tx)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::withdraw`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::withdraw`,
       typeArguments: [`${this.consts.zoCore.package}::zlp::ZLP`, this.consts.coins[coin].module],
       arguments: [
         tx.object(this.consts.zoCore.market),
@@ -122,8 +123,8 @@ export class API extends DataAPI {
     collateralPrice: number,
     isLimitOrder = false,
     isIocOrder = false,
-    pricesSlippage: number = 0.003,
-    collateralSlippage: number = 0.5,
+    pricesSlippage = 0.003,
+    collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
     referralAddress = '',
     sender = '',
@@ -149,7 +150,7 @@ export class API extends DataAPI {
     }
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::open_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::open_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -187,16 +188,16 @@ export class API extends DataAPI {
     reserveAmount: bigint,
     indexPrice: number,
     collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
     isLimitOrder = false,
     isIocOrder = false,
-    pricesSlippage: number = 0.003,
-    collateralSlippage: number = 0.5,
+    pricesSlippage = 0.003,
+    collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
     referralAddress = '',
     sender = '',
-    kioskClient: KioskClient,
-    kioskCap: KioskOwnerCap,
-    scard: string,
   ) => {
     let tx = new Transaction()
     if (referralAddress && !(await this.hasReferral(sender || ''))) {
@@ -222,7 +223,7 @@ export class API extends DataAPI {
       transaction: tx,
       kioskClient,
       cap: kioskCap,
-    });
+    })
 
     const [sudoCard, promise] = kioskTx.borrow({
       itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
@@ -230,7 +231,7 @@ export class API extends DataAPI {
     })
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::open_position_with_scard`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::open_position_with_scard`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -261,7 +262,7 @@ export class API extends DataAPI {
       .return({
         itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
         item: sudoCard,
-        promise: promise,
+        promise,
       })
       .finalize()
     return tx
@@ -280,7 +281,7 @@ export class API extends DataAPI {
     const [depositObject] = tx.splitCoins(coinObject, [tx.pure.u64(amount)])
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::pledge_in_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::pledge_in_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -303,7 +304,7 @@ export class API extends DataAPI {
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::redeem_from_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::redeem_from_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -337,8 +338,8 @@ export class API extends DataAPI {
     isTriggerOrder = false,
     isTakeProfitOrder = true,
     isIocOrder = false,
-    pricesSlippage: number = 0.003,
-    collateralSlippage: number = 0.5,
+    pricesSlippage = 0.003,
+    collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
   ) => {
     const tx = await this.initOracleTxb([collateralToken, indexToken])
@@ -352,12 +353,13 @@ export class API extends DataAPI {
     let allowTrade = ALLOW_TRADE_MUST_TRADE
     if (isTriggerOrder) {
       allowTrade = isIocOrder || !isTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE
-    } else {
+    }
+    else {
       isTakeProfitOrder = true
     }
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::decrease_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -394,15 +396,15 @@ export class API extends DataAPI {
     long: boolean,
     indexPrice: number,
     collateralPrice: number,
+    kioskClient: KioskClient,
+    kioskCap: KioskOwnerCap,
+    scard: string,
     isTriggerOrder = false,
     isTakeProfitOrder = true,
     isIocOrder = false,
-    pricesSlippage: number = 0.003,
-    collateralSlippage: number = 0.5,
+    pricesSlippage = 0.003,
+    collateralSlippage = 0.5,
     relayerFee = BigInt(0.5),
-    kioskClient: KioskClient,
-    kioskCap: KioskOwnerCap,
-    scard: string,
   ) => {
     const tx = await this.initOracleTxb([collateralToken, indexToken])
 
@@ -427,12 +429,13 @@ export class API extends DataAPI {
     let allowTrade = ALLOW_TRADE_MUST_TRADE
     if (isTriggerOrder) {
       allowTrade = isIocOrder || !isTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE
-    } else {
+    }
+    else {
       isTakeProfitOrder = true
     }
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::decrease_position_with_scard`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -462,37 +465,47 @@ export class API extends DataAPI {
       .return({
         itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
         item: sudoCard,
-        promise: promise,
+        promise,
       })
       .finalize()
     return tx
   }
 
   decreaseMultiPositions = async (positions: Array<{
-    pcpId: string,
-    collateralToken: string,
-    coinObjects: string[],
-    indexToken: string,
-    amount: bigint,
-    long: boolean,
-    indexPrice: number,
-    collateralPrice: number,
-    isTriggerOrder: boolean,
-    isTakeProfitOrder: boolean,
-    isIocOrder: boolean,
-    slippage: number,
-    relayerFee: bigint,
+    pcpId: string
+    collateralToken: string
+    coinObjects: string[]
+    indexToken: string
+    amount: bigint
+    long: boolean
+    indexPrice: number
+    collateralPrice: number
+    isTriggerOrder: boolean
+    isTakeProfitOrder: boolean
+    isIocOrder: boolean
+    slippage: number
+    relayerFee: bigint
   }>, tx?: Transaction) => {
     if (!tx) {
-      tx = new Transaction();
+      tx = new Transaction()
     }
-    tx = await this.initOracleTxb(positions.map(position => [position.collateralToken, position.indexToken]).flat(), tx);
+    tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
 
     for (const position of positions) {
       const {
         pcpId,
         collateralToken,
-        coinObjects, indexToken, amount, long, indexPrice, collateralPrice, isTriggerOrder, isTakeProfitOrder, isIocOrder, slippage, relayerFee
+        coinObjects,
+        indexToken,
+        amount,
+        long,
+        indexPrice,
+        collateralPrice,
+        isTriggerOrder,
+        isTakeProfitOrder,
+        isIocOrder,
+        slippage,
+        relayerFee,
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
       const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
@@ -505,12 +518,13 @@ export class API extends DataAPI {
       let allowTrade = ALLOW_TRADE_MUST_TRADE
       if (isTriggerOrder) {
         allowTrade = isIocOrder || !innerIsTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE
-      } else {
+      }
+      else {
         innerIsTakeProfitOrder = true
       }
 
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::decrease_position`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
           this.consts.coins[collateralToken].module,
@@ -539,28 +553,24 @@ export class API extends DataAPI {
   }
 
   decreaseMultiPositionsWithSCard = async (positions: Array<{
-    pcpId: string,
-    collateralToken: string,
-    coinObjects: string[],
-    indexToken: string,
-    amount: bigint,
-    long: boolean,
-    indexPrice: number,
-    collateralPrice: number,
-    isTriggerOrder: boolean,
-    isTakeProfitOrder: boolean,
-    isIocOrder: boolean,
-    slippage: number,
-    relayerFee: bigint,
-  }>,
-    kioskClient: KioskClient,
-    kioskCap: KioskOwnerCap,
-    scard: string,
-    tx?: Transaction) => {
+    pcpId: string
+    collateralToken: string
+    coinObjects: string[]
+    indexToken: string
+    amount: bigint
+    long: boolean
+    indexPrice: number
+    collateralPrice: number
+    isTriggerOrder: boolean
+    isTakeProfitOrder: boolean
+    isIocOrder: boolean
+    slippage: number
+    relayerFee: bigint
+  }>, kioskClient: KioskClient, kioskCap: KioskOwnerCap, scard: string, tx?: Transaction) => {
     if (!tx) {
-      tx = new Transaction();
+      tx = new Transaction()
     }
-    tx = await this.initOracleTxb(positions.map(position => [position.collateralToken, position.indexToken]).flat(), tx);
+    tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx)
 
     const kioskTx = new KioskTransaction({
       transaction: tx,
@@ -577,7 +587,17 @@ export class API extends DataAPI {
       const {
         pcpId,
         collateralToken,
-        coinObjects, indexToken, amount, long, indexPrice, collateralPrice, isTriggerOrder, isTakeProfitOrder, isIocOrder, slippage, relayerFee
+        coinObjects,
+        indexToken,
+        amount,
+        long,
+        indexPrice,
+        collateralPrice,
+        isTriggerOrder,
+        isTakeProfitOrder,
+        isIocOrder,
+        slippage,
+        relayerFee,
       } = position
       let innerIsTakeProfitOrder = isTakeProfitOrder
       const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
@@ -590,12 +610,13 @@ export class API extends DataAPI {
       let allowTrade = ALLOW_TRADE_MUST_TRADE
       if (isTriggerOrder) {
         allowTrade = isIocOrder || !innerIsTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE
-      } else {
+      }
+      else {
         innerIsTakeProfitOrder = true
       }
 
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::decrease_position_with_scard`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
           this.consts.coins[collateralToken].module,
@@ -626,7 +647,7 @@ export class API extends DataAPI {
       .return({
         itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
         item: sudoCard,
-        promise: promise,
+        promise,
       })
       .finalize()
     return tx
@@ -658,7 +679,7 @@ export class API extends DataAPI {
       }
     }
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::${functionName}`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::${functionName}`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -671,13 +692,13 @@ export class API extends DataAPI {
     return tx
   }
 
-  cancelMultiOrder = async (orders: Array<{
-    orderCapId: string,
-    collateralToken: string,
-    indexToken: string,
-    long: boolean,
-    type: string,
-    isV11Order: boolean,
+  cancelMultiOrder = (orders: Array<{
+    orderCapId: string
+    collateralToken: string
+    indexToken: string
+    long: boolean
+    type: string
+    isV11Order: boolean
   }>, tx?: Transaction) => {
     if (!tx) {
       tx = new Transaction()
@@ -703,7 +724,7 @@ export class API extends DataAPI {
       }
 
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::${functionName}`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::${functionName}`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
           this.consts.coins[collateralToken].module,
@@ -729,7 +750,7 @@ export class API extends DataAPI {
     const vaultsValuation = this.valuateVaults(tx)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::swap`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::swap`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[fromToken].module,
@@ -755,7 +776,7 @@ export class API extends DataAPI {
     tx: Transaction,
   ) => {
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::clear_closed_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::clear_closed_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -776,7 +797,7 @@ export class API extends DataAPI {
   ) => {
     const funcName = isV11Order ? 'clear_open_position_order' : 'clear_open_position_order'
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::${funcName}`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::${funcName}`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -798,7 +819,7 @@ export class API extends DataAPI {
   ) => {
     const funcName = isV11Order ? 'clear_decrease_position_order' : 'clear_decrease_position_order'
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::${funcName}`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::${funcName}`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -866,7 +887,7 @@ export class API extends DataAPI {
       tx = new Transaction()
     }
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::add_new_referral`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::add_new_referral`,
       typeArguments: [`${this.consts.zoCore.package}::zlp::ZLP`],
       arguments: [tx.object(this.consts.zoCore.market), tx.object(referrer)],
     })
@@ -875,12 +896,12 @@ export class API extends DataAPI {
   }
 
   // admin methods
-  adminUpdatePriceFeed = async (collateralToken: string, indexToken: string,) => {
+  adminUpdatePriceFeed = async (collateralToken: string, indexToken: string) => {
     const tx = await this.initOracleTxb([collateralToken, indexToken])
     return tx
   }
 
-  adminSettlePosition = async (
+  adminSettlePosition = (
     positionId: string,
     owner: string,
     collateralToken: string,
@@ -911,7 +932,7 @@ export class API extends DataAPI {
     return tx
   }
 
-  adminDecreasePosition = async (
+  adminDecreasePosition = (
     positionId: string,
     owner: string,
     collateralToken: string,
@@ -924,7 +945,7 @@ export class API extends DataAPI {
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::force_close_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::force_close_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -951,7 +972,7 @@ export class API extends DataAPI {
     return tx
   }
 
-  adminClearClosedPosition = async (
+  adminClearClosedPosition = (
     positionId: string,
     owner: string,
     collateralToken: string,
@@ -960,7 +981,7 @@ export class API extends DataAPI {
     tx: Transaction,
   ) => {
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::force_clear_closed_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::force_clear_closed_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::zlp::ZLP`,
         this.consts.coins[collateralToken].module,
@@ -977,25 +998,25 @@ export class API extends DataAPI {
   }
 
   // ZO Lootbox
-  adminIssueLootbox = async (
+  adminIssueLootbox = (
     coin: string,
     tiers: number[],
     beneficiaries: string[],
     amounts: number[],
     tx: Transaction,
   ) => {
-    let module = this.consts.zoCore.package + '::zlp::ZLP'
+    let module = `${this.consts.zoCore.package}::zlp::ZLP`
     if (coin !== 'zlp') {
       module = this.consts.coins[coin].module
     }
-    for (let i = 0; i < beneficiaries.length; i++) {
+    for (const [i, beneficiary] of beneficiaries.entries()) {
       tx.moveCall({
         target: `${this.consts.zoLootbox.package}::lootbox::admin_issue_lootbox`,
         typeArguments: [module],
         arguments: [
           tx.object(this.consts.zoLootbox.adminCap),
           tx.pure.u8(tiers[i]),
-          tx.pure.address(beneficiaries[i]),
+          tx.pure.address(beneficiary),
           tx.pure.u64(amounts[i]),
           tx.pure.bool(amounts[i] > 0),
           tx.object(`${this.consts.zoLootbox.lootboxSettings}`),
@@ -1004,7 +1025,7 @@ export class API extends DataAPI {
     }
   }
 
-  depositToPrizePool = async (
+  depositToPrizePool = (
     coin: string,
     coinObjects: string[],
     amount: number,
@@ -1013,7 +1034,7 @@ export class API extends DataAPI {
     const coinObject = this.#processCoins(tx, coin, coinObjects)
     const [depositObject] = tx.splitCoins(coinObject, [tx.pure.u64(amount)])
 
-    let module = this.consts.zoCore.package + '::zlp::ZLP'
+    let module = `${this.consts.zoCore.package}::zlp::ZLP`
     if (coin !== 'zlp') {
       module = this.consts.coins[coin].module
     }
@@ -1030,10 +1051,10 @@ export class API extends DataAPI {
     return tx
   }
 
-  withdrawFromPricePool = async (coin: string, amount: number) => {
+  withdrawFromPricePool = (coin: string, amount: number) => {
     const tx = new Transaction()
 
-    let module = this.consts.zoCore.package + '::zlp::ZLP'
+    let module = `${this.consts.zoCore.package}::zlp::ZLP`
     let metadata = this.consts.zoCore.zlpMetadata
     if (coin !== 'zlp') {
       module = this.consts.coins[coin].module
@@ -1053,10 +1074,10 @@ export class API extends DataAPI {
     return tx
   }
 
-  openLootbox = async (coin: string, lootbox: string) => {
+  openLootbox = (coin: string, lootbox: string) => {
     const tx = new Transaction()
 
-    let module = this.consts.zoCore.package + '::zlp::ZLP'
+    let module = `${this.consts.zoCore.package}::zlp::ZLP`
     let metadata = this.consts.zoCore.zlpMetadata
     if (coin !== 'zlp') {
       module = this.consts.coins[coin].module

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

@@ -1,7 +1,7 @@
 {
   "zo_core": {
     "package": "0x7fd8aba1652c58b6397c799fd375e748e5053145cb7e126d303e0a1545fd1fec",
-    "upgraded_package": "0x7fd8aba1652c58b6397c799fd375e748e5053145cb7e126d303e0a1545fd1fec",
+    "upgraded_package": "0x93f66649a5c82835a8d8628ad88a85a2d67fd49d044ef6144bf7d8621da77dfd",
     "upgrade_cap": "0x2f67d379d3b9e256a9c4079de50f4bd336dcbda1bd90d1fcd61a9cc1dc369d69",
     "admin_cap": "0x63af8e78701327be98e0c44967389148c374f4ea7c7cf8acf64957b705ffd02d",
     "market": "0x3310c794d0bbc4b0421d2fedc74fbd5a028b09fe4d396cd5458786f4c52fa636",

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

@@ -1,7 +1,7 @@
 {
   "zo_core": {
     "package": "0xf7fade57462e56e2eff1d7adef32e4fd285b21fd81f983f407bb7110ca766cda",
-    "upgraded_package": "0x670957e55ed2e6e0fbae1dc82244616484d2d449e12132d6ee7a6466d033dc9e",
+    "upgraded_package": "0x25a1d518373e465f1bff4c4ab069e160f9c30da9d9a2cb5a17f5bd645ab62ea4",
     "upgrade_cap": "0xcc96f78abe0b868afaab05954ccc6357afb5d379a21389d6eb88dda8b1f60052",
     "admin_cap": "0xbc10f6481f2b5d6185c73ee680aa90a60fe3854d9f638e00f7e00d3b6a88e2b8",
     "market": "0x35c667bd8c401036103992791a924f31df0d104256a9e2313acee5b1bcf05b7e",