zo-sdk 0.1.13 → 0.1.14

package/src/data.ts

@@ -201,12 +201,12 @@ export interface IStakePool {
 
 export interface IMarketValidationResult {
   handledVaults: Record<string, {
-    weight: number;
-    value: number;
-  }>;
-  totalWeight: number;
-  totalVaultsValue: number;
-  marketValue: number;
+    weight: number
+    value: number
+  }>
+  totalWeight: number
+  totalVaultsValue: number
+  marketValue: number
 }
 
 export class DataAPI extends OracleAPI {
@@ -248,7 +248,7 @@ export class DataAPI extends OracleAPI {
 
   valuateVaults = (tx: Transaction) => {
     const vaultsValuation = tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::create_vaults_valuation`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::create_vaults_valuation`,
       typeArguments: [`${this.consts.zoCore.package}::zlp::ZLP`],
       arguments: [
         tx.object(SUI_CLOCK_OBJECT_ID),
@@ -259,7 +259,7 @@ export class DataAPI extends OracleAPI {
       const vault = this.consts.zoCore.vaults[key]
       tx.moveCall({
         // todo
-        target: `${this.consts.zoCore.package}::market::valuate_vault`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::valuate_vault`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
           this.consts.coins[key].module,
@@ -277,7 +277,7 @@ export class DataAPI extends OracleAPI {
 
   valuateSymbols = (tx: Transaction) => {
     const symbolsValuation = tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::create_symbols_valuation`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::create_symbols_valuation`,
       typeArguments: [`${this.consts.zoCore.package}::zlp::ZLP`],
       arguments: [
         tx.object(SUI_CLOCK_OBJECT_ID),
@@ -288,7 +288,7 @@ export class DataAPI extends OracleAPI {
       const [direction, token] = parseSymbolKey(key)
       const symbol = this.consts.zoCore.symbols[key]
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::valuate_symbol`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::valuate_symbol`,
         typeArguments: [
           `${this.consts.zoCore.package}::zlp::ZLP`,
           this.consts.coins[token].module,
@@ -322,8 +322,8 @@ export class DataAPI extends OracleAPI {
    */
   validateMarketValuation = (tx: Transaction) => {
     // First, create the valuations using existing methods
-    const vaultsValuation = this.valuateVaults(tx);
-    const symbolsValuation = this.valuateSymbols(tx);
+    const vaultsValuation = this.valuateVaults(tx)
+    const symbolsValuation = this.valuateSymbols(tx)
 
     // Call the validate_market_valuation Move function
     const result = tx.moveCall({
@@ -334,9 +334,9 @@ export class DataAPI extends OracleAPI {
         vaultsValuation,
         symbolsValuation,
       ],
-    });
+    })
 
-    return result;
+    return result
   }
 
   #parseMarketInfo(raw: any): IMarketInfo {
@@ -715,9 +715,9 @@ export class DataAPI extends OracleAPI {
   }
 
   public async getPositionCapInfoList(owner: string): Promise<IPositionCapInfo[]> {
-    const positionCapInfoList: IPositionCapInfo[] = [];
-    let cursor: string | undefined | null = undefined;
-    let hasNextPage = true;
+    const positionCapInfoList: IPositionCapInfo[] = []
+    let cursor: string | undefined | null
+    let hasNextPage = true
 
     while (hasNextPage) {
       const positionCaps = await this.provider.getOwnedObjects({
@@ -753,7 +753,7 @@ export class DataAPI extends OracleAPI {
     return positionCapInfoList
   }
 
-  public async getPositionInfoList(positionCapInfoList: IPositionCapInfo[], owner: string, batchSize: number = 10) {
+  public async getPositionInfoList(positionCapInfoList: IPositionCapInfo[], owner: string, batchSize = 10) {
     const positionInfoList: IPositionInfo[] = []
 
     // Process in batches of 10
@@ -773,7 +773,8 @@ export class DataAPI extends OracleAPI {
             },
           })
           positionInfoList.push(await this.#parsePositionInfo(positionRaw, positionCapInfo.positionCapId))
-        } catch (error) {
+        }
+        catch (error) {
           // Position might have been deleted after force settlement
           console.warn(`Failed to parse position info for position cap ID ${positionCapInfo.positionCapId}: ${error}`)
           // Continue with next position without adding this one to the list
@@ -785,82 +786,83 @@ export class DataAPI extends OracleAPI {
   }
 
   // find all open positions by positionsParent
-  public async getOpenPositions(batchSize: number = 50, symbol: string = 'sui') {
-    let positionDynamicFields: DynamicFieldInfo[] = [];
-    let _continue = true;
-    let cursor = undefined;
+  public async getOpenPositions(batchSize = 50, symbol = 'sui') {
+    let positionDynamicFields: DynamicFieldInfo[] = []
+    let _continue = true
+    let cursor
     while (_continue) {
       // data here will be a list of dynamic fields containing name and value
-      const { data, nextCursor, hasNextPage } =
-        await this.provider.getDynamicFields({
+      const { data, nextCursor, hasNextPage }
+        = await this.provider.getDynamicFields({
           parentId: this.consts.zoCore.positionsParent,
           cursor,
-        });
+        })
 
-      positionDynamicFields = positionDynamicFields.concat(data);
-      _continue = hasNextPage;
-      cursor = nextCursor;
+      positionDynamicFields = positionDynamicFields.concat(data)
+      _continue = hasNextPage
+      cursor = nextCursor
     }
 
     // Filter by symbol if provided
-    if (symbol && this.consts.coins[symbol]) {
-      const coinModule = symbol === 'sui' ? '0x2::sui::SUI' : this.consts.coins[symbol].module;
-      positionDynamicFields = positionDynamicFields.filter(field => {
-        // Extract the second coin module from PositionName<coin1, coin2, direction>
-        const typeStr = field.name?.type;
-        if (!typeStr) return false;
-
-        const match = typeStr.match(/PositionName<([^,]+),\s*([^,]+),\s*([^>]+)>/);
-        if (!match) return false;
-
-        const secondCoin = match[2].trim();
-        return secondCoin === coinModule;
-      });
-    } else {
-      return [];
+    if (!(symbol && this.consts.coins[symbol])) {
+      return []
     }
+    const coinModule = symbol === 'sui' ? '0x2::sui::SUI' : this.consts.coins[symbol].module
+    positionDynamicFields = positionDynamicFields.filter((field) => {
+      // Extract the second coin module from PositionName<coin1, coin2, direction>
+      const typeStr = field.name?.type
+      if (!typeStr)
+        return false
+
+      const match = typeStr.match(/PositionName<([^,]+),\s*([^,]+),\s*([^>]+)>/)
+      if (!match)
+        return false
+
+      const secondCoin = match[2].trim()
+      return secondCoin === coinModule
+    })
 
     // then we query by dynamic field names and order by time
-    const positionInfoList: IPositionInfo[] = [];
-    
+    const positionInfoList: IPositionInfo[] = []
+
     // Process in batches of 50 (or specified batchSize)
     for (let i = 0; i < positionDynamicFields.length; i += batchSize) {
-      const batch = positionDynamicFields.slice(i, i + batchSize);
-      
+      const batch = positionDynamicFields.slice(i, i + batchSize)
+
       await Promise.all(
-        batch.map(async positionDynamicField => {
+        batch.map(async (positionDynamicField) => {
           const positionRaw = await this.provider.getDynamicFieldObject({
             parentId: this.consts.zoCore.positionsParent,
             name: positionDynamicField.name,
-          });
+          })
 
           if (positionRaw?.data?.content) {
             // @ts-ignore
             if (positionRaw?.data?.content?.fields?.value?.fields?.closed) {
               // skip closed positions
-              return;
+              return
             }
             const positionInfo = await this.#parsePositionInfo(
               positionRaw,
               positionDynamicField.objectId,
-            );
+            )
             if (positionInfo) {
-              positionInfoList.push(positionInfo);
+              positionInfoList.push(positionInfo)
             }
           }
         }),
-      );
+      )
     }
 
     return positionInfoList
       .filter(positionInfo => !positionInfo.closed)
-      .sort((a, b) => (a.openTimestamp > b.openTimestamp ? 1 : -1));
+      .sort((a, b) => (a.openTimestamp > b.openTimestamp ? 1 : -1))
   }
 
   public async getOrderCapInfoList(owner: string): Promise<IOrderCapInfo[]> {
-    const orderCapInfoList: IOrderCapInfo[] = [];
-    let cursor: string | undefined | null = undefined;
-    let hasNextPage = true;
+    const orderCapInfoList: IOrderCapInfo[] = []
+    let cursor: string | undefined | null
+    let hasNextPage = true
 
     while (hasNextPage) {
       const orderCaps = await this.provider.getOwnedObjects({
@@ -890,14 +892,14 @@ export class DataAPI extends OracleAPI {
         }
       }
 
-      hasNextPage = orderCaps.hasNextPage;
-      cursor = orderCaps.nextCursor;
+      hasNextPage = orderCaps.hasNextPage
+      cursor = orderCaps.nextCursor
     }
 
     return orderCapInfoList
   }
 
-  public async getOrderInfoList(orderCapInfoList: IOrderCapInfo[], owner: string, batchSize: number = 10) {
+  public async getOrderInfoList(orderCapInfoList: IOrderCapInfo[], owner: string, batchSize = 10) {
     const orderInfoList: IOrderInfo[] = []
 
     // Process in batches of 10
@@ -921,7 +923,8 @@ export class DataAPI extends OracleAPI {
             },
           })
           orderInfoList.push(this.#parseOrderInfo(orderRaw, orderCapInfo.orderCapId))
-        } catch (error) {
+        }
+        catch (error) {
           // Order might have been deleted
           console.warn(`Failed to parse order info for order cap ID ${orderCapInfo.orderCapId}: ${error}`)
           // Continue with next order without adding this one to the list
@@ -1032,7 +1035,7 @@ export class DataAPI extends OracleAPI {
     page = 1,
     limit = 20,
     orderType?: string,
-    symbol?: string
+    symbol?: string,
   ) => {
     const params = new URLSearchParams({
       trader,

package/src/implementations/SLPDataAPI.ts

@@ -467,7 +467,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
     const symbol_ = joinSymbol(long ? 'long' : 'short', indexToken)
     const currentTimestamp = Number.parseInt((Date.now() / 1000).toFixed(0), 10)
     const symbol = tx.moveCall({
-      target: `${this.consts.sudoCore.package}::market::symbol`,
+      target: `${this.consts.sudoCore.upgradedPackage}::market::symbol`,
       typeArguments: [
         `${this.consts.sudoCore.package}::slp::SLP`,
         this.consts.coins[indexToken].module,
@@ -495,7 +495,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
       arguments: [symbol, aggPrice, tx.pure.bool(long)],
     })
     const LpSupplyAmount = tx.moveCall({
-      target: `${this.consts.sudoCore.package}::market::lp_supply_amount`,
+      target: `${this.consts.sudoCore.upgradedPackage}::market::lp_supply_amount`,
       typeArguments: [`${this.consts.sudoCore.package}::slp::SLP`],
       arguments: [tx.object(this.consts.sudoCore.market)],
     })

package/src/implementations/USDZAPI.ts

@@ -155,7 +155,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
 
   public clearClosedPosition(pcpId: string, collateralToken: string, indexToken: string, long: boolean, tx: Transaction): void {
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -169,7 +169,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
   public clearOpenPositionOrder(orderCapId: string, collateralToken: string, indexToken: string, long: boolean, tx: Transaction, isV11Order?: boolean): void {
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -184,7 +184,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
   public clearDecreasePositionOrder(orderCapId: string, collateralToken: string, indexToken: string, long: boolean, tx: Transaction, isV11Order?: boolean): void {
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -265,7 +265,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     )
 
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -374,7 +374,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     )
 
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -501,7 +501,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       )
 
       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}::usdz::USDZ`,
           this.consts.coins[collateralToken].module,
@@ -574,7 +574,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::deposit`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::deposit`,
         typeArguments: [`${this.consts.zoCore.package}::usdz::USDZ`, this.consts.coins[coin].module],
         arguments: [
           tx.object(this.consts.zoCore.market),
@@ -598,7 +598,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::deposit`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::deposit`,
       typeArguments: [
         `${this.consts.zoCore.package}::usdz::USDZ`,
         this.consts.coins[coin].module,
@@ -643,7 +643,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::withdraw`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::withdraw`,
       typeArguments: [
         `${this.consts.zoCore.package}::usdz::USDZ`,
         this.consts.coins[coin].module,
@@ -673,7 +673,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     const vaultsValuation = this.dataAPI.valuateVaults(tx)
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::swap`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::swap`,
       typeArguments: [
         `${this.consts.zoCore.package}::usdz::USDZ`,
         this.consts.coins[fromToken].module,
@@ -748,7 +748,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     )
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::open_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::open_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -835,7 +835,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     )
 
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::decrease_position`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position`,
       typeArguments: [
         `${this.consts.zoCore.package}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -935,7 +935,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       )
 
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::decrease_position`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position`,
         typeArguments: [
           `${this.consts.zoCore.package}::usdz::USDZ`,
           this.consts.coins[collateralToken].module,
@@ -998,7 +998,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     )
 
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -1032,7 +1032,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -1080,7 +1080,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       }
     }
     tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::${functionName}`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::${functionName}`,
       typeArguments: [
         `${this.consts.zoCore.package}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -1128,7 +1128,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       }
 
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::${functionName}`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::${functionName}`,
         typeArguments: [
           `${this.consts.zoCore.package}::usdz::USDZ`,
           this.consts.coins[collateralToken].module,
@@ -1150,7 +1150,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       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}::usdz::USDZ`],
       arguments: [tx.object(this.consts.zoCore.market), tx.object(referralAddress)],
     })
@@ -1210,7 +1210,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,
@@ -1246,7 +1246,7 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     tx: Transaction,
   ): void {
     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}::usdz::USDZ`,
         this.consts.coins[collateralToken].module,

package/src/implementations/USDZDataAPI.ts

@@ -54,7 +54,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
    */
   public valuateVaults(tx: Transaction) {
     const vaultsValuation = tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::create_vaults_valuation`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::create_vaults_valuation`,
       typeArguments: [`${this.consts.zoCore.package}::usdz::USDZ`],
       arguments: [
         tx.object(SUI_CLOCK_OBJECT_ID),
@@ -65,7 +65,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
     for (const key of Object.keys(this.consts.zoCore.vaults)) {
       const vault = this.consts.zoCore.vaults[key]
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::valuate_vault`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::valuate_vault`,
         typeArguments: [
           `${this.consts.zoCore.package}::usdz::USDZ`,
           this.consts.coins[key].module,
@@ -86,7 +86,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
    */
   public valuateSymbols(tx: Transaction) {
     const symbolsValuation = tx.moveCall({
-      target: `${this.consts.zoCore.package}::market::create_symbols_valuation`,
+      target: `${this.consts.zoCore.upgradedPackage}::market::create_symbols_valuation`,
       typeArguments: [`${this.consts.zoCore.package}::usdz::USDZ`],
       arguments: [
         tx.object(SUI_CLOCK_OBJECT_ID),
@@ -98,7 +98,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
       const [direction, token] = parseSymbolKey(key)
       const symbol = this.consts.zoCore.symbols[key]
       tx.moveCall({
-        target: `${this.consts.zoCore.package}::market::valuate_symbol`,
+        target: `${this.consts.zoCore.upgradedPackage}::market::valuate_symbol`,
         typeArguments: [
           `${this.consts.zoCore.package}::usdz::USDZ`,
           this.consts.coins[token].module,

package/src/implementations/ZLPAPI.ts

@@ -189,7 +189,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       const { vaultsValuation, symbolsValuation } = this.dataAPI.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),
@@ -213,7 +213,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     const { vaultsValuation, symbolsValuation } = this.dataAPI.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,
@@ -258,7 +258,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     const { vaultsValuation, symbolsValuation } = this.dataAPI.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,
@@ -288,7 +288,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     const vaultsValuation = this.dataAPI.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,
@@ -552,7 +552,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       )
 
       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,
@@ -649,7 +649,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     )
 
     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,
@@ -759,7 +759,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     )
 
     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,
@@ -886,7 +886,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       )
 
       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,
@@ -958,7 +958,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     )
 
     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,
@@ -992,7 +992,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     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,
@@ -1040,7 +1040,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       }
     }
     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,
@@ -1088,7 +1088,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       }
 
       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,
@@ -1110,7 +1110,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     tx: Transaction,
   ): void {
     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,
@@ -1131,7 +1131,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
   ): void {
     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,
@@ -1153,7 +1153,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
   ): void {
     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,
@@ -1173,7 +1173,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       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(referralAddress)],
     })
@@ -1233,7 +1233,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     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,
@@ -1269,7 +1269,7 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     tx: Transaction,
   ): void {
     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,