@zofai/zo-sdk 0.2.29 → 0.2.31

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zofai/zo-sdk",
   "type": "module",
-  "version": "0.2.29",
+  "version": "0.2.31",
   "author": "zo",
   "exports": {
     ".": {

package/src/abstract/BaseAPI.ts

@@ -6,12 +6,10 @@
 
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
 import type { TransactionObjectArgument } from '@mysten/sui/transactions'
-import type { SuiClient } from '../suiClient'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID, SUI_TYPE_ARG } from '@mysten/sui/utils'
 
 import { createSpendableCoin, getCoinBalanceBreakdown, needsCoinWithBalanceFunding } from '../coins'
-
 import type { IConsts, LPToken, Network } from '../consts'
 import { ALLOW_TRADE_CAN_TRADE, ALLOW_TRADE_MUST_TRADE, ALLOW_TRADE_NO_TRADE } from '../consts'
 import type {
@@ -31,7 +29,9 @@ import type {
   IBaseStakePool,
   IBaseSymbolInfo,
   IBaseVaultInfo,
+  IGetTraderOpenPositionsOptions,
 } from '../interfaces'
+import type { SuiClient } from '../suiClient'
 import { BaseDataAPI } from './BaseDataAPI'
 
 export abstract class BaseAPI extends BaseDataAPI implements IBaseAPI {
@@ -110,6 +110,10 @@ export abstract class BaseAPI extends BaseDataAPI implements IBaseAPI {
     return this.dataAPI.getPositionInfoList(positionCapInfoList, owner, batchSize)
   }
 
+  public getTraderOpenPositionInfoList(owner: string, options?: IGetTraderOpenPositionsOptions): Promise<IBasePositionInfo[]> {
+    return this.dataAPI.getTraderOpenPositionInfoList(owner, options)
+  }
+
   public getOrderCapInfoList(owner: string): Promise<IBaseOrderCapInfo[]> {
     return this.dataAPI.getOrderCapInfoList(owner)
   }

package/src/abstract/BaseDataAPI.ts

@@ -4,10 +4,10 @@
  */
 /* eslint-disable class-methods-use-this -- base class helpers used by subclasses */
 
-import type { SuiClient } from '../suiClient'
 import type { Transaction } from '@mysten/sui/transactions'
 
 import type { LPToken, Network } from '../consts'
+import { LPToken as LPTokenEnum } from '../consts'
 import type {
   IBaseDataAPI,
   IBaseHistoryResponse,
@@ -23,8 +23,15 @@ import type {
   IBaseStakePool,
   IBaseSymbolInfo,
   IBaseVaultInfo,
+  IGetTraderOpenPositionsOptions,
 } from '../interfaces'
 import { OracleAPI } from '../oracle'
+import type { SuiClient } from '../suiClient'
+import {
+  fetchAllTraderPositions,
+  traderPositionToCapInfo,
+} from '../traderPositions'
+import { joinSymbol } from '../utils'
 
 export abstract class BaseDataAPI extends OracleAPI implements IBaseDataAPI {
   public readonly provider: SuiClient
@@ -38,6 +45,8 @@ export abstract class BaseDataAPI extends OracleAPI implements IBaseDataAPI {
   protected marketInfoCache: IBaseMarketInfo | null = null
   protected positionConfigCache: Record<string, IBasePositionConfig> = {}
   protected rebaseFeeModelCache: IBaseRebaseFeeModel | null = null
+  /** Per index-token OI funding state; `null` means fetched and missing on-chain. */
+  protected oiFundingStateCache: Record<string, unknown | null> = {}
   protected lastUpdate = 0
   protected readonly CACHE_DURATION = 1000 * 60 * 3 // 3 minutes
 
@@ -75,6 +84,7 @@ export abstract class BaseDataAPI extends OracleAPI implements IBaseDataAPI {
     this.marketInfoCache = null
     this.positionConfigCache = {}
     this.rebaseFeeModelCache = null
+    this.oiFundingStateCache = {}
   }
 
   /**
@@ -93,7 +103,7 @@ export abstract class BaseDataAPI extends OracleAPI implements IBaseDataAPI {
    */
   protected async getCachedSymbolInfo(tokenId: string, long: boolean): Promise<IBaseSymbolInfo> {
     this.validateCache()
-    const key = `${tokenId}_${long}`
+    const key = joinSymbol(long ? 'long' : 'short', tokenId)
     if (!this.symbolInfoCache[key]) {
       this.symbolInfoCache[key] = await this.getSymbolInfo(tokenId, long)
     }
@@ -116,7 +126,7 @@ export abstract class BaseDataAPI extends OracleAPI implements IBaseDataAPI {
    */
   protected async getCachedPositionConfig(indexToken: string, long: boolean): Promise<IBasePositionConfig> {
     this.validateCache()
-    const key = `${indexToken}_${long}`
+    const key = joinSymbol(long ? 'long' : 'short', indexToken)
     if (!this.positionConfigCache[key]) {
       this.positionConfigCache[key] = await this.getPositionConfig(indexToken, long)
     }
@@ -134,6 +144,60 @@ export abstract class BaseDataAPI extends OracleAPI implements IBaseDataAPI {
     return this.rebaseFeeModelCache
   }
 
+  /** Package id used to filter `/trader-positions` rows for this LP. */
+  protected getMarketPackageId(): string {
+    return this.lpToken === LPTokenEnum.SLP
+      ? this.consts.sudoCore.package
+      : this.consts.zoCore.package
+  }
+
+  /**
+   * Load OPEN position caps from zo API `/trader-positions` for this LP package.
+   */
+  protected async fetchTraderOpenPositionCapsFromApi(
+    owner: string,
+    options?: IGetTraderOpenPositionsOptions,
+  ): Promise<IBasePositionCapInfo[]> {
+    const packageId = this.getMarketPackageId().toLowerCase()
+    const records = await fetchAllTraderPositions(
+      this.apiEndpoint,
+      {
+        owner,
+        status: 'OPEN',
+        indexToken: options?.indexToken,
+        collateralToken: options?.collateralToken,
+      },
+      options?.limit,
+    )
+
+    const caps: IBasePositionCapInfo[] = []
+    for (const record of records) {
+      if (record.address?.trim().toLowerCase() !== packageId) {
+        continue
+      }
+      const cap = traderPositionToCapInfo(record, this.consts)
+      if (cap) {
+        caps.push(cap)
+      }
+    }
+    return caps
+  }
+
+  /**
+   * Fetch OPEN positions from zo API, then hydrate live position details via RPC
+   * (same accrual path as getPositionInfoList).
+   */
+  public async getTraderOpenPositionInfoList(
+    owner: string,
+    options?: IGetTraderOpenPositionsOptions,
+  ): Promise<IBasePositionInfo[]> {
+    const caps = await this.fetchTraderOpenPositionCapsFromApi(owner, options)
+    if (caps.length === 0) {
+      return []
+    }
+    return this.getPositionInfoList(caps, owner, options?.batchSize)
+  }
+
   // Abstract methods that must be implemented by concrete classes
   public abstract valuateVaults(tx: Transaction): any
   public abstract valuateSymbols(tx: Transaction): any

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

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

package/src/consts/deployments-zo-oracle-mainnet.json

@@ -33,7 +33,24 @@
       "eba0732395fae9dec4bae12e52760b35fc1c5671e2da8b449c9af4efe5d54341": 624,
       "44465e17d2e9d390e70c999d5a11fda4f092847fcd2e3e5aa089d96c98a30e67": 172,
       "925ca92ff005ae943c158e3563f59698ce7e75c5a8c8dd43303a0a154887b3e6": 657,
-      "8cead549d0e770dea8fdf5e018a85d59585265cf8bff16ba83962fc7996dbb7f": 2998
+      "8cead549d0e770dea8fdf5e018a85d59585265cf8bff16ba83962fc7996dbb7f": 2998,
+      "2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b": 8,
+      "2f95862b045670cd22bee3114c39763a4a08beeb663b145d283c31d7d1101c4f": 15,
+      "2a01deaec9e51a579277b34b122399984d0bbf57e2458a7e42fecd2829867a0d": 16,
+      "93da3352f9f1d105fdfe4971cfa80e9dd777bfc5d0f683ebb6e1294b92137bb7": 18,
+      "2b9ab1e972a281585084148ba1389800799bd4be63b957507db1349314e47445": 29,
+      "0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996": 92,
+      "4279e31cc369bbcc2faf022b382b080e32a8e689ff20fbc530d2a603eb6cd98b": 110,
+      "273717b49430906f4b0c230e99aa1007f83758e3199edbc887c0d06c3e332494": 163,
+      "58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608": 182,
+      "d40472610abe56d36d065a0cf889fc8f1dd9f3b7f2a478231a5fc6df07ea5ce3": 201,
+      "e67d98cc1fbd94f569d5ba6c3c3c759eb3ffc5d2b28e64538a53ae13efad8fd1": 648,
+      "2b529621fa6e2c8429f623ba705572aa64175d7768365ef829df6a12c9f365f4": 1818,
+      "8414cfadf82f6bed644d2e399c11df21ec0131aa574c56030b132113dbbf3a0a": 1841,
+      "d41369178d64f41d51ca95465c144a2c74d2fff30be69164835911943fa64c3e": 1854,
+      "a903b5a82cb572397e3d47595d2889cf80513f5b4cf7a36b513ae10cc8b1e338": 2310,
+      "fa9e8d4591613476ad0961732475dc08969d248faca270cc6c47efe009ea3070": 2311,
+      "1fc9127232d059b415f7b11989d06aa11a3563619e5b7a8e44ae440f0b95e4e1": 2700
     }
   },
   "stork_feeder": {

package/src/data.ts

@@ -483,8 +483,10 @@ export class DataAPI extends OracleAPI {
       openTimestamp: parseValue(positionFields.open_timestamp),
     }
 
-    positionInfo.reservingFeeAmount = this.#calculatePositionReserveFee(positionInfo, await this.getVaultInfo(positionInfo.collateralToken), (await this.getVaultInfo(positionInfo.collateralToken)).reservingFeeModel, Date.now() / 1000)
-    positionInfo.fundingFeeValue = this.#calculatePositionFundingFee(positionInfo, await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long), (await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)).fundingFeeModel, (await this.getOraclePrice(positionInfo.indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked(), (await this.getMarketInfo()).lpSupplyWithDecimals, Date.now() / 1000)
+    const vaultInfo = await this.getVaultInfo(positionInfo.collateralToken)
+    positionInfo.reservingFeeAmount = this.#calculatePositionReserveFee(positionInfo, vaultInfo, vaultInfo.reservingFeeModel, Date.now() / 1000)
+    const symbolInfo = await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)
+    positionInfo.fundingFeeValue = this.#calculatePositionFundingFee(positionInfo, symbolInfo, symbolInfo.fundingFeeModel, (await this.getOraclePrice(positionInfo.indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked(), (await this.getMarketInfo()).lpSupplyWithDecimals, Date.now() / 1000)
 
     return positionInfo
   }
@@ -664,7 +666,9 @@ export class DataAPI extends OracleAPI {
         showContent: true,
       },
     })
-    return this.#parseMarketInfo(rawData)
+    const info = this.#parseMarketInfo(rawData)
+    this.marketInfoCache = info
+    return info
   }
 
   public async getVaultInfo(vaultToken: string) {
@@ -680,7 +684,9 @@ export class DataAPI extends OracleAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.#parseVaultInfo(rawData)
+    const info = await this.#parseVaultInfo(rawData)
+    this.vaultInfoCache[vaultToken] = info
+    return info
   }
 
   public async getSymbolInfo(indexToken: string, long: boolean) {
@@ -696,7 +702,9 @@ export class DataAPI extends OracleAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.#parseSymbolInfo(rawData, long)
+    const info = await this.#parseSymbolInfo(rawData, long)
+    this.symbolInfoCache[symbol] = info
+    return info
   }
 
   public async getPositionConfig(indexToken: string, long: boolean) {
@@ -711,7 +719,9 @@ export class DataAPI extends OracleAPI {
         showContent: true,
       },
     })
-    return this.#parsePositionConfig(rawData)
+    const info = this.#parsePositionConfig(rawData)
+    this.positionConfigCache[symbol] = info
+    return info
   }
 
   public async getPositionCapInfoList(owner: string): Promise<IPositionCapInfo[]> {
@@ -952,7 +962,9 @@ export class DataAPI extends OracleAPI {
         showContent: true,
       },
     })
-    return this.#parseRebaseFeeModel(rawData)
+    const info = this.#parseRebaseFeeModel(rawData)
+    this.rebaseFeeModelCache = info
+    return info
   }
 
   fundingFeeRate = async (indexToken: string, long: boolean) => {

package/src/implementations/SLPDataAPI.ts

@@ -39,13 +39,13 @@ import type {
   ISwapFeeBreakdown,
 } from '../interfaces'
 import type { OracleInputs } from '../oraclePro'
-import type { DynamicFieldInfo, SuiClient } from '../suiClient'
 import {
   buildPythProPriceFeedMap,
   resolveTokenUsdPriceFromPythPro,
   valuateSymbolsV3,
   valuateVaultsV3,
 } from '../oraclePro'
+import type { DynamicFieldInfo, SuiClient } from '../suiClient'
 import { joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
 
 export interface GetCumulativeAprResponse {
@@ -117,7 +117,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
   public async getRebaseFeeModel(): Promise<ISLPRebaseFeeModel> {
     this.validateCache()
     if (this.rebaseFeeModelCache) {
-      return this.rebaseFeeModelCache
+      return this.rebaseFeeModelCache as ISLPRebaseFeeModel
     }
     const rawData = await this.provider.getObject({
       id: this.consts.sudoCore.rebaseFeeModel,
@@ -131,7 +131,9 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
       this.consts.sudoCore.rebaseFeeModel,
       this.consts.sudoCore.upgradedPackage,
     )
-    return { ...model, exponent }
+    const info = { ...model, exponent }
+    this.rebaseFeeModelCache = info
+    return info
   }
 
   /**
@@ -448,7 +450,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
   public async getMarketInfo(): Promise<ISLPMarketInfo> {
     this.validateCache()
     if (this.marketInfoCache) {
-      return this.marketInfoCache
+      return this.marketInfoCache as ISLPMarketInfo
     }
 
     const rawData = await this.provider.getObject({
@@ -458,10 +460,12 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
       },
     })
     const apr = await this.getCumulativeApr()
-    return {
+    const info = {
       ...SLPDataAPI.parseMarketInfo(rawData),
       apr,
     }
+    this.marketInfoCache = info
+    return info
   }
 
   /**
@@ -470,7 +474,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
   public async getVaultInfo(vaultToken: string): Promise<ISLPVaultInfo> {
     this.validateCache()
     if (this.vaultInfoCache[vaultToken]) {
-      return this.vaultInfoCache[vaultToken]
+      return this.vaultInfoCache[vaultToken] as ISLPVaultInfo
     }
 
     const rawData = await this.provider.getDynamicFieldObject({
@@ -480,7 +484,9 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.parseVaultInfo(rawData)
+    const info = await this.parseVaultInfo(rawData)
+    this.vaultInfoCache[vaultToken] = info
+    return info
   }
 
   /**
@@ -490,7 +496,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
     this.validateCache()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     if (this.symbolInfoCache[symbol]) {
-      return this.symbolInfoCache[symbol]
+      return this.symbolInfoCache[symbol] as ISLPSymbolInfo
     }
 
     const rawData = await this.provider.getDynamicFieldObject({
@@ -503,7 +509,9 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
       },
     })
 
-    return await this.parseSymbolInfo(rawData, long)
+    const info = await this.parseSymbolInfo(rawData, long)
+    this.symbolInfoCache[symbol] = info
+    return info
   }
 
   /**
@@ -556,6 +564,9 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
    */
   public async getSymbolOiFundingState(indexToken: string): Promise<ISLPOiFundingState | null> {
     this.validateCache()
+    if (Object.prototype.hasOwnProperty.call(this.oiFundingStateCache, indexToken)) {
+      return this.oiFundingStateCache[indexToken] as ISLPOiFundingState | null
+    }
     try {
       const rawData = await this.provider.getDynamicFieldObject({
         parentId: this.consts.sudoCore.market,
@@ -564,11 +575,14 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
           value: { dummy_field: false },
         },
       })
-      return SLPDataAPI.parseOiFundingState(rawData)
+      const info = SLPDataAPI.parseOiFundingState(rawData)
+      this.oiFundingStateCache[indexToken] = info
+      return info
     }
     catch (e: any) {
       // If the dynamic field doesn't exist, return null
       console.error('Error Fetching SLP Symbol OI Funding State:', e)
+      this.oiFundingStateCache[indexToken] = null
       return null
     }
   }
@@ -1075,7 +1089,7 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
     this.validateCache()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     if (this.positionConfigCache[symbol]) {
-      return this.positionConfigCache[symbol]
+      return this.positionConfigCache[symbol] as ISLPPositionConfig
     }
 
     const rawData = await this.provider.getObject({
@@ -1084,7 +1098,9 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
         showContent: true,
       },
     })
-    return SLPDataAPI.parsePositionConfig(rawData)
+    const info = SLPDataAPI.parsePositionConfig(rawData)
+    this.positionConfigCache[symbol] = info
+    return info
   }
 
   public async getOpenPositions(batchSize = 50, symbol = 'sui'): Promise<ISLPPositionInfo[]> {
@@ -1925,21 +1941,23 @@ export class SLPDataAPI extends BaseDataAPI implements ISLPDataAPI {
 
     if (!positionFields.closed) {
       try {
+        const vaultInfo = await this.getVaultInfo(positionInfo.collateralToken)
         positionInfo.reservingFeeAmount = SLPDataAPI.calculatePositionReserveFee(
           positionInfo,
-          await this.getVaultInfo(positionInfo.collateralToken),
-          (await this.getVaultInfo(positionInfo.collateralToken)).reservingFeeModel,
+          vaultInfo,
+          vaultInfo.reservingFeeModel,
           Date.now() / 1000,
         )
 
         // OI context for funding: fetch state and paired side size when enabled
         const oiState = await this.getSymbolOiFundingState(positionInfo.indexToken)
         const pairedSymbol = await this.getSymbolInfo(positionInfo.indexToken, !positionInfo.long)
+        const symbolInfo = await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)
 
         positionInfo.fundingFeeValue = SLPDataAPI.calculatePositionFundingFee(
           positionInfo,
-          await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long),
-          (await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)).fundingFeeModel,
+          symbolInfo,
+          symbolInfo.fundingFeeModel,
           (await this.getOraclePrice(positionInfo.indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked(),
           (await this.getMarketInfo()).lpSupplyWithDecimals,
           Date.now() / 1000,

package/src/implementations/USDZDataAPI.ts

@@ -308,7 +308,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
   public async getMarketInfo(): Promise<IUSDZMarketInfo> {
     this.validateCache()
     if (this.marketInfoCache) {
-      return this.marketInfoCache
+      return this.marketInfoCache as IUSDZMarketInfo
     }
     const rawData = await this.provider.getObject({
       id: this.consts.zoCore.market,
@@ -316,7 +316,9 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
         showContent: true,
       },
     })
-    return USDZDataAPI.parseMarketInfo(rawData)
+    const info = USDZDataAPI.parseMarketInfo(rawData)
+    this.marketInfoCache = info
+    return info
   }
 
   /**
@@ -325,7 +327,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
   public async getVaultInfo(vaultToken: string): Promise<IUSDZVaultInfo> {
     this.validateCache()
     if (this.vaultInfoCache[vaultToken]) {
-      return this.vaultInfoCache[vaultToken]
+      return this.vaultInfoCache[vaultToken] as IUSDZVaultInfo
     }
 
     const rawData = await this.provider.getDynamicFieldObject({
@@ -335,7 +337,9 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.parseVaultInfo(rawData)
+    const info = await this.parseVaultInfo(rawData)
+    this.vaultInfoCache[vaultToken] = info
+    return info
   }
 
   /**
@@ -345,7 +349,7 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
     this.validateCache()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     if (this.symbolInfoCache[symbol]) {
-      return this.symbolInfoCache[symbol]
+      return this.symbolInfoCache[symbol] as IUSDZSymbolInfo
     }
     const rawData = await this.provider.getDynamicFieldObject({
       parentId: this.consts.zoCore.symbolsParent,
@@ -354,14 +358,16 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.parseSymbolInfo(rawData, long)
+    const info = await this.parseSymbolInfo(rawData, long)
+    this.symbolInfoCache[symbol] = info
+    return info
   }
 
   public async getPositionConfig(indexToken: string, long: boolean): Promise<IUSDZPositionConfig> {
     this.validateCache()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     if (this.positionConfigCache[symbol]) {
-      return this.positionConfigCache[symbol]
+      return this.positionConfigCache[symbol] as IUSDZPositionConfig
     }
     const rawData = await this.provider.getObject({
       id: this.consts.zoCore.symbols[symbol].positionConfig,
@@ -369,7 +375,9 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
         showContent: true,
       },
     })
-    return USDZDataAPI.parsePositionConfig(rawData)
+    const info = USDZDataAPI.parsePositionConfig(rawData)
+    this.positionConfigCache[symbol] = info
+    return info
   }
 
   /**
@@ -399,6 +407,9 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
    */
   public async getSymbolOiFundingState(indexToken: string): Promise<IUSDZOiFundingState | null> {
     this.validateCache()
+    if (Object.prototype.hasOwnProperty.call(this.oiFundingStateCache, indexToken)) {
+      return this.oiFundingStateCache[indexToken] as IUSDZOiFundingState | null
+    }
     try {
       const rawData = await this.provider.getDynamicFieldObject({
         parentId: this.consts.zoCore.market,
@@ -407,10 +418,13 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
           value: { dummy_field: false },
         },
       })
-      return USDZDataAPI.parseOiFundingState(rawData)
+      const info = USDZDataAPI.parseOiFundingState(rawData)
+      this.oiFundingStateCache[indexToken] = info
+      return info
     }
     catch (e: any) {
       console.error('Error Fetching USDZ Symbol OI Funding State:', e)
+      this.oiFundingStateCache[indexToken] = null
       return null
     }
   }
@@ -816,7 +830,9 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
         showContent: true,
       },
     })
-    return USDZDataAPI.parseRebaseFeeModel(rawData)
+    const info = USDZDataAPI.parseRebaseFeeModel(rawData)
+    this.rebaseFeeModelCache = info
+    return info
   }
 
   public async fundingFeeRate(indexToken: string, long: boolean): Promise<number> {
@@ -1205,20 +1221,22 @@ export class USDZDataAPI extends BaseDataAPI implements IUSDZDataAPI {
       openTimestamp: parseValue(positionFields.open_timestamp),
     }
 
+    const vaultInfo = await this.getVaultInfo(positionInfo.collateralToken)
     positionInfo.reservingFeeAmount = USDZDataAPI.calculatePositionReserveFee(
       positionInfo,
-      await this.getVaultInfo(positionInfo.collateralToken),
-      (await this.getVaultInfo(positionInfo.collateralToken)).reservingFeeModel,
+      vaultInfo,
+      vaultInfo.reservingFeeModel,
       Date.now() / 1000,
     )
 
     // OI context for funding: fetch state and paired side size when enabled
     const oiState = await this.getSymbolOiFundingState(positionInfo.indexToken)
     const pairedSymbol = await this.getSymbolInfo(positionInfo.indexToken, !positionInfo.long)
+    const symbolInfo = await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)
     positionInfo.fundingFeeValue = USDZDataAPI.calculatePositionFundingFee(
       positionInfo,
-      await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long),
-      (await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)).fundingFeeModel,
+      symbolInfo,
+      symbolInfo.fundingFeeModel,
       (await this.getOraclePrice(positionInfo.indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked(),
       (await this.getMarketInfo()).lpSupplyWithDecimals,
       Date.now() / 1000,

package/src/implementations/ZBTCVCDataAPI.ts

@@ -230,7 +230,7 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
   public async getMarketInfo(): Promise<IZBTCVCMarketInfo> {
     this.validateCache()
     if (this.marketInfoCache) {
-      return this.marketInfoCache
+      return this.marketInfoCache as IZBTCVCMarketInfo
     }
     const rawData = await this.provider.getObject({
       id: this.consts.zoCore.market,
@@ -238,7 +238,9 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
         showContent: true,
       },
     })
-    return ZBTCVCDataAPI.parseMarketInfo(rawData)
+    const info = ZBTCVCDataAPI.parseMarketInfo(rawData)
+    this.marketInfoCache = info
+    return info
   }
 
   /**
@@ -247,7 +249,7 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
   public async getVaultInfo(vaultToken: string): Promise<IZBTCVCVaultInfo> {
     this.validateCache()
     if (this.vaultInfoCache[vaultToken]) {
-      return this.vaultInfoCache[vaultToken]
+      return this.vaultInfoCache[vaultToken] as IZBTCVCVaultInfo
     }
 
     const rawData = await this.provider.getDynamicFieldObject({
@@ -257,7 +259,9 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.parseVaultInfo(rawData)
+    const info = await this.parseVaultInfo(rawData)
+    this.vaultInfoCache[vaultToken] = info
+    return info
   }
 
   /**
@@ -267,7 +271,7 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
     this.validateCache()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     if (this.symbolInfoCache[symbol]) {
-      return this.symbolInfoCache[symbol]
+      return this.symbolInfoCache[symbol] as IZBTCVCSymbolInfo
     }
     const rawData = await this.provider.getDynamicFieldObject({
       parentId: this.consts.zoCore.symbolsParent,
@@ -276,14 +280,16 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
         value: { dummy_field: false },
       },
     })
-    return await this.parseSymbolInfo(rawData, long)
+    const info = await this.parseSymbolInfo(rawData, long)
+    this.symbolInfoCache[symbol] = info
+    return info
   }
 
   public async getPositionConfig(indexToken: string, long: boolean): Promise<IZBTCVCPositionConfig> {
     this.validateCache()
     const symbol = joinSymbol(long ? 'long' : 'short', indexToken)
     if (this.positionConfigCache[symbol]) {
-      return this.positionConfigCache[symbol]
+      return this.positionConfigCache[symbol] as IZBTCVCPositionConfig
     }
     const rawData = await this.provider.getObject({
       id: this.consts.zoCore.symbols[symbol].positionConfig,
@@ -291,7 +297,9 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
         showContent: true,
       },
     })
-    return ZBTCVCDataAPI.parsePositionConfig(rawData)
+    const info = ZBTCVCDataAPI.parsePositionConfig(rawData)
+    this.positionConfigCache[symbol] = info
+    return info
   }
 
   /**
@@ -536,7 +544,9 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
         showContent: true,
       },
     })
-    return ZBTCVCDataAPI.parseRebaseFeeModel(rawData)
+    const info = ZBTCVCDataAPI.parseRebaseFeeModel(rawData)
+    this.rebaseFeeModelCache = info
+    return info
   }
 
   public async fundingFeeRate(indexToken: string, long: boolean): Promise<number> {
@@ -837,8 +847,10 @@ export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {
       openTimestamp: parseValue(positionFields.open_timestamp),
     }
 
-    positionInfo.reservingFeeAmount = ZBTCVCDataAPI.calculatePositionReserveFee(positionInfo, await this.getVaultInfo(positionInfo.collateralToken), (await this.getVaultInfo(positionInfo.collateralToken)).reservingFeeModel, Date.now() / 1000)
-    positionInfo.fundingFeeValue = ZBTCVCDataAPI.calculatePositionFundingFee(positionInfo, await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long), (await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)).fundingFeeModel, (await this.getOraclePrice(positionInfo.indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked(), (await this.getMarketInfo()).lpSupplyWithDecimals, Date.now() / 1000)
+    const vaultInfo = await this.getVaultInfo(positionInfo.collateralToken)
+    positionInfo.reservingFeeAmount = ZBTCVCDataAPI.calculatePositionReserveFee(positionInfo, vaultInfo, vaultInfo.reservingFeeModel, Date.now() / 1000)
+    const symbolInfo = await this.getSymbolInfo(positionInfo.indexToken, positionInfo.long)
+    positionInfo.fundingFeeValue = ZBTCVCDataAPI.calculatePositionFundingFee(positionInfo, symbolInfo, symbolInfo.fundingFeeModel, (await this.getOraclePrice(positionInfo.indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked(), (await this.getMarketInfo()).lpSupplyWithDecimals, Date.now() / 1000)
 
     return positionInfo
   }