zo-sdk 0.0.45 → 0.0.46

package/src/data.ts

@@ -199,6 +199,16 @@ export interface IStakePool {
   lockDuration: number
 }
 
+export interface IMarketValidationResult {
+  handledVaults: Record<string, {
+    weight: number;
+    value: number;
+  }>;
+  totalWeight: number;
+  totalVaultsValue: number;
+  marketValue: number;
+}
+
 export class DataAPI extends OracleAPI {
   provider: SuiClient
   apiEndpoint: string
@@ -305,6 +315,30 @@ export class DataAPI extends OracleAPI {
     }
   }
 
+  /**
+   * Validates the market valuation by calling the validate_market_valuation Move function
+   * @param tx Transaction object
+   * @returns An object containing handled vaults, total weight, total vaults value, and market value
+   */
+  validateMarketValuation = (tx: Transaction) => {
+    // First, create the valuations using existing methods
+    const vaultsValuation = this.valuateVaults(tx);
+    const symbolsValuation = this.valuateSymbols(tx);
+
+    // Call the validate_market_valuation Move function
+    const result = tx.moveCall({
+      target: `${this.consts.zoCore.upgradedPackage}::market::validate_market_valuation`,
+      typeArguments: [`${this.consts.zoCore.package}::zlp::ZLP`],
+      arguments: [
+        tx.object(this.consts.zoCore.market),
+        vaultsValuation,
+        symbolsValuation,
+      ],
+    });
+
+    return result;
+  }
+
   #parseMarketInfo(raw: any): IMarketInfo {
     const content = raw.data.content.fields
 
@@ -681,106 +715,147 @@ export class DataAPI extends OracleAPI {
   }
 
   public async getPositionCapInfoList(owner: string): Promise<IPositionCapInfo[]> {
-    const positionCaps = await this.provider.getOwnedObjects({
-      owner,
-      filter: {
-        MoveModule: {
-          package: this.consts.zoCore.package,
-          module: 'market',
+    const positionCapInfoList: IPositionCapInfo[] = [];
+    let cursor: string | undefined | null = undefined;
+    let hasNextPage = true;
+
+    while (hasNextPage) {
+      const positionCaps = await this.provider.getOwnedObjects({
+        owner,
+        filter: {
+          MoveModule: {
+            package: this.consts.zoCore.package,
+            module: 'market',
+          },
         },
-      },
-      options: {
-        showType: true,
-      },
-    })
-    const positionCapInfoList = []
-    for (const positionCap of positionCaps.data) {
-      if (positionCap.data?.type?.includes('PositionCap')) {
-        positionCapInfoList.push({
-          positionCapId: positionCap.data.objectId,
-          symbol0: positionCap.data.type.split('<')[1].split(',')[0].trim(),
-          symbol1: positionCap.data.type.split('<')[1].split(',')[1].split(',')[0].trim(),
-          long: positionCap.data.type.includes('LONG'),
-        })
+        options: {
+          showType: true,
+        },
+        cursor,
+      })
+
+      for (const positionCap of positionCaps.data) {
+        if (positionCap.data?.type?.includes('PositionCap')) {
+          positionCapInfoList.push({
+            positionCapId: positionCap.data.objectId,
+            symbol0: positionCap.data.type.split('<')[1].split(',')[0].trim(),
+            symbol1: positionCap.data.type.split('<')[1].split(',')[1].split(',')[0].trim(),
+            long: positionCap.data.type.includes('LONG'),
+          })
+        }
       }
+
+      // If we don't want to fetch all pages or there are no more pages, break the loop
+      hasNextPage = positionCaps.hasNextPage
+      cursor = positionCaps.nextCursor
     }
+
     return positionCapInfoList
   }
 
-  public async getPositionInfoList(positionCapInfoList: IPositionCapInfo[], owner: string) {
+  public async getPositionInfoList(positionCapInfoList: IPositionCapInfo[], owner: string, batchSize: number = 10) {
     const positionInfoList: IPositionInfo[] = []
-    await Promise.all(positionCapInfoList.map(async (positionCapInfo) => {
-      try {
-        const positionRaw = await this.provider.getDynamicFieldObject({
-          parentId: this.consts.zoCore.positionsParent,
-          name: {
-            type: `${this.consts.zoCore.package}::market::PositionName<${positionCapInfo.symbol0}, ${positionCapInfo.symbol1}, ${this.consts.zoCore.package}::market::${positionCapInfo.long ? 'LONG' : 'SHORT'}>`,
-            value: {
-              owner,
-              id: positionCapInfo.positionCapId,
+
+    // Process in batches of 10
+    for (let i = 0; i < positionCapInfoList.length; i += batchSize) {
+      const batch = positionCapInfoList.slice(i, i + batchSize)
+
+      await Promise.all(batch.map(async (positionCapInfo) => {
+        try {
+          const positionRaw = await this.provider.getDynamicFieldObject({
+            parentId: this.consts.zoCore.positionsParent,
+            name: {
+              type: `${this.consts.zoCore.package}::market::PositionName<${positionCapInfo.symbol0}, ${positionCapInfo.symbol1}, ${this.consts.zoCore.package}::market::${positionCapInfo.long ? 'LONG' : 'SHORT'}>`,
+              value: {
+                owner,
+                id: positionCapInfo.positionCapId,
+              },
             },
-          },
-        })
-        positionInfoList.push(await this.#parsePositionInfo(positionRaw, positionCapInfo.positionCapId))
-      }
-      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
-      }
-    }))
+          })
+          positionInfoList.push(await this.#parsePositionInfo(positionRaw, positionCapInfo.positionCapId))
+        } 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
+        }
+      }))
+    }
 
     return positionInfoList.sort((a, b) => a.openTimestamp > b.openTimestamp ? 1 : -1)
   }
 
-  public async getOrderCapInfoList(owner: string) {
-    const orderCaps = await this.provider.getOwnedObjects({
-      owner,
-      filter: {
-        MoveModule: {
-          package: this.consts.zoCore.package,
-          module: 'market',
+  public async getOrderCapInfoList(owner: string): Promise<IOrderCapInfo[]> {
+    const orderCapInfoList: IOrderCapInfo[] = [];
+    let cursor: string | undefined | null = undefined;
+    let hasNextPage = true;
+
+    while (hasNextPage) {
+      const orderCaps = await this.provider.getOwnedObjects({
+        owner,
+        filter: {
+          MoveModule: {
+            package: this.consts.zoCore.package,
+            module: 'market',
+          },
         },
-      },
-      options: {
-        showType: true,
-        showContent: true,
-      },
-    })
-    const orderCapInfoList = []
-    for (const orderCap of orderCaps.data) {
-      if (orderCap.data?.type?.includes('OrderCap')) {
-        orderCapInfoList.push({
-          orderCapId: orderCap.data.objectId,
-          symbol0: orderCap.data.type.split('<')[1].split(',')[0].trim(),
-          symbol1: orderCap.data.type.split('<')[1].split(',')[1].split(',')[0].trim(),
-          long: orderCap.data.type.includes('LONG'),
-          positionId: (orderCap.data.content as any)?.fields?.position_id,
-        })
+        options: {
+          showType: true,
+          showContent: true,
+        },
+        cursor,
+      })
+
+      for (const orderCap of orderCaps.data) {
+        if (orderCap.data?.type?.includes('OrderCap')) {
+          orderCapInfoList.push({
+            orderCapId: orderCap.data.objectId,
+            symbol0: orderCap.data.type.split('<')[1].split(',')[0].trim(),
+            symbol1: orderCap.data.type.split('<')[1].split(',')[1].split(',')[0].trim(),
+            long: orderCap.data.type.includes('LONG'),
+            positionId: (orderCap.data.content as any)?.fields?.position_id,
+          })
+        }
       }
+
+      hasNextPage = orderCaps.hasNextPage;
+      cursor = orderCaps.nextCursor;
     }
+
     return orderCapInfoList
   }
 
-  public async getOrderInfoList(orderCapInfoList: IOrderCapInfo[], owner: string) {
+  public async getOrderInfoList(orderCapInfoList: IOrderCapInfo[], owner: string, batchSize: number = 10) {
     const orderInfoList: IOrderInfo[] = []
-    await Promise.all(orderCapInfoList.map(async (orderCapInfo) => {
-      const orderRaw = await this.provider.getDynamicFieldObject({
-        parentId: this.consts.zoCore.ordersParent,
-        name: {
-          // We have enforced collateral coin type to match with fee coin type so we can use symbol0 in the first slot and the last slot of the OrderName
-          type: `${this.consts.zoCore.package}::market::OrderName<${orderCapInfo.symbol0}, ${orderCapInfo.symbol1}, ${this.consts.zoCore.package}::market::${orderCapInfo.long ? 'LONG' : 'SHORT'}, ${orderCapInfo.symbol0}>`,
-          value: {
-            owner,
-            id: orderCapInfo.orderCapId,
-            position_id: {
-              vec: orderCapInfo.positionId ? [orderCapInfo.positionId] : [],
+
+    // Process in batches of 10
+    for (let i = 0; i < orderCapInfoList.length; i += batchSize) {
+      const batch = orderCapInfoList.slice(i, i + batchSize)
+
+      await Promise.all(batch.map(async (orderCapInfo) => {
+        try {
+          const orderRaw = await this.provider.getDynamicFieldObject({
+            parentId: this.consts.zoCore.ordersParent,
+            name: {
+              // We have enforced collateral coin type to match with fee coin type so we can use symbol0 in the first slot and the last slot of the OrderName
+              type: `${this.consts.zoCore.package}::market::OrderName<${orderCapInfo.symbol0}, ${orderCapInfo.symbol1}, ${this.consts.zoCore.package}::market::${orderCapInfo.long ? 'LONG' : 'SHORT'}, ${orderCapInfo.symbol0}>`,
+              value: {
+                owner,
+                id: orderCapInfo.orderCapId,
+                position_id: {
+                  vec: orderCapInfo.positionId ? [orderCapInfo.positionId] : [],
+                },
+              },
             },
-          },
-        },
-      })
-      orderInfoList.push(this.#parseOrderInfo(orderRaw, orderCapInfo.orderCapId))
-    }))
+          })
+          orderInfoList.push(this.#parseOrderInfo(orderRaw, orderCapInfo.orderCapId))
+        } 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
+        }
+      }))
+    }
+
     return orderInfoList.sort((a, b) => a.createdAt > b.createdAt ? 1 : -1)
   }