zo-sdk 0.1.39 → 0.1.41

package/src/implementations/ZLPDataAPI.ts

@@ -19,6 +19,8 @@ import type {
   IZLPFundingFeeModel,
   IZLPMarketInfo,
   IZLPMarketValuationInfo,
+  IZLPOiFundingModel,
+  IZLPOiFundingState,
   IZLPOrderCapInfo,
   IZLPOrderInfo,
   IZLPPositionCapInfo,
@@ -204,8 +206,20 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     const symbolPromises = Object.keys(this.consts.zoCore.symbols).map(async (symbol) => {
       const [direction, tokenId] = parseSymbolKey(symbol)
       const symbolInfo = await this.getSymbolInfo(tokenId, direction === 'long')
-      const deltaSize = ZLPDataAPI.calcDeltaSize(symbolInfo, (await this.getOraclePrice(tokenId)).getPriceUnchecked().getPriceAsNumberUnchecked())
-      const fundingFeeDelta = ZLPDataAPI.calculateSymbolFundingFee(symbolInfo, symbolInfo.fundingFeeModel, (await this.getOraclePrice(tokenId)).getPriceUnchecked().getPriceAsNumberUnchecked(), marketInfo.lpSupplyWithDecimals, Date.now() / 1000)
+      const price = (await this.getOraclePrice(tokenId)).getPriceUnchecked().getPriceAsNumberUnchecked()
+      const deltaSize = ZLPDataAPI.calcDeltaSize(symbolInfo, price)
+
+      const oiState = await this.getSymbolOiFundingState(tokenId)
+      const pairedInfo = await this.getSymbolInfo(tokenId, direction !== 'long')
+      const fundingFeeDelta = ZLPDataAPI.calculateSymbolFundingFee(
+        symbolInfo,
+        symbolInfo.fundingFeeModel,
+        price,
+        marketInfo.lpSupplyWithDecimals,
+        Date.now() / 1000,
+        oiState && oiState.enabled ? oiState.model : undefined,
+        pairedInfo.openingSize,
+      )
       return fundingFeeDelta + deltaSize
     })
 
@@ -309,9 +323,31 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
       })
       return ZLPDataAPI.parseSymbolConfig(rawData)
     }
-    catch {
+    catch (e: any) {
+      // If the dynamic field doesn't exist, return null
+      console.error('Error Fetching Symbol Config:', e)
+      return null
+    }
+  }
+
+  /**
+   * Gets ZLP symbol OI funding model
+   */
+  public async getSymbolOiFundingState(indexToken: string): Promise<IZLPOiFundingState | null> {
+    this.validateCache()
+    try {
+      const rawData = await this.provider.getDynamicFieldObject({
+        parentId: this.consts.zoCore.market,
+        name: {
+          type: `${this.consts.zoCore.upgradedPackage}::funding::FundingStateKey<${this.consts.coins[indexToken].module}>`,
+          value: { dummy_field: false },
+        },
+      })
+      return ZLPDataAPI.parseOiFundingState(rawData)
+    }
+    catch (e: any) {
       // If the dynamic field doesn't exist, return null
-      console.error('Symbol Config Not Found')
+      console.error('Error Fetching Symbol OI Funding State:', e)
       return null
     }
   }
@@ -570,18 +606,38 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
   }
 
   public async fundingFeeRate(indexToken: string, long: boolean): Promise<number> {
-    const symbol = await this.getSymbolInfo(indexToken, long)
-    if (symbol.lastUpdate <= 0) {
+    const oiState = await this.getSymbolOiFundingState(indexToken)
+
+    if (!oiState || !oiState.enabled) {
+      const symbol = await this.getSymbolInfo(indexToken, long)
+      if (symbol.lastUpdate <= 0) {
+        return 0
+      }
+      const price = (await this.getOraclePrice(indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked()
+      const lpSupplyAmount = (await this.getMarketInfo()).lpSupplyWithDecimals
+      const model = symbol.fundingFeeModel
+      const elapsed = SECONDS_PER_EIGHT_HOUR
+
+      const deltaSize = ZLPDataAPI.calcDeltaSize(symbol, price)
+      const pnlPerLp = (symbol.realisedPnl + symbol.unrealisedFundingFeeValue + deltaSize) / lpSupplyAmount
+      return ZLPDataAPI.calcFundingFeeRate(model, pnlPerLp, elapsed)
+    }
+
+    const longSymbol = await this.getSymbolInfo(indexToken, true)
+    const shortSymbol = await this.getSymbolInfo(indexToken, false)
+
+    if (longSymbol.lastUpdate <= 0 && shortSymbol.lastUpdate <= 0) {
       return 0
     }
-    const price = (await this.getOraclePrice(indexToken)).getPriceUnchecked().getPriceAsNumberUnchecked()
-    const lpSupplyAmount = (await this.getMarketInfo()).lpSupplyWithDecimals
-    const model = symbol.fundingFeeModel
+
     const elapsed = SECONDS_PER_EIGHT_HOUR
 
-    const deltaSize = ZLPDataAPI.calcDeltaSize(symbol, price)
-    const pnlPerLp = (symbol.realisedPnl + symbol.unrealisedFundingFeeValue + deltaSize) / lpSupplyAmount
-    return ZLPDataAPI.calcFundingFeeRate(model, pnlPerLp, elapsed)
+    const longSize = longSymbol.openingSize
+    const shortSize = shortSymbol.openingSize
+
+    const deltaRate = ZLPDataAPI.calcOiFundingFeeRate(oiState.model, longSize, shortSize, elapsed)
+    console.log('deltaRate is:', deltaRate)
+    return long ? deltaRate : -deltaRate
   }
 
   public async rebaseFeeRate(collateralToken: string, increase: boolean, amount: number): Promise<number> {
@@ -667,10 +723,37 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     return pnlPerRate >= 0 ? -secondsRate : secondsRate
   }
 
-  private static calcAccFundingFeeRate(symbol: IZLPSymbolInfo, model: IZLPFundingFeeModel, price: number, lpSupplyAmount: number, timestamp: number): number {
+  private static calcOiFundingFeeRate(model: IZLPOiFundingModel, longSize: number, shortSize: number, elapsed: number): number {
+    const imbalance = Math.abs(longSize - shortSize)
+
+    // multiplier = 0.1%, exponent = 1
+    const dailyRate = Math.min(model.multiplier * (imbalance ** model.exponent) / (longSize + shortSize > 0 ? longSize + shortSize : 1), model.max)
+    const secondsRate = dailyRate * elapsed / SECONDS_PER_EIGHT_HOUR
+    return longSize >= shortSize ? secondsRate : -secondsRate
+  }
+
+  private static calcAccFundingFeeRate(
+    symbol: IZLPSymbolInfo,
+    model: IZLPFundingFeeModel,
+    price: number,
+    lpSupplyAmount: number,
+    timestamp: number,
+    oiModel?: IZLPOiFundingModel,
+    pairedOpeningSize?: number,
+  ): number {
     if (symbol.lastUpdate > 0) {
       const elapsed = timestamp - symbol.lastUpdate
       if (elapsed > 0) {
+        // Prefer OI-based delta when model and paired side are available
+        if (oiModel && typeof pairedOpeningSize === 'number') {
+          const longSize = symbol.long ? symbol.openingSize : pairedOpeningSize
+          const shortSize = symbol.long ? pairedOpeningSize : symbol.openingSize
+          const deltaRate = ZLPDataAPI.calcOiFundingFeeRate(oiModel, longSize, shortSize, elapsed)
+          const appliedRate = symbol.long ? deltaRate : -deltaRate
+          return symbol.accFundingRate + appliedRate
+        }
+
+        // Fallback to PnL-based funding delta
         const deltaSize = ZLPDataAPI.calcDeltaSize(symbol, price)
         const pnlPerLp = (symbol.realisedPnl + symbol.unrealisedFundingFeeValue + deltaSize) / lpSupplyAmount
         return symbol.accFundingRate + ZLPDataAPI.calcFundingFeeRate(model, pnlPerLp, elapsed)
@@ -679,8 +762,24 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     return symbol.accFundingRate
   }
 
-  private static calculateSymbolFundingFee(symbol: IZLPSymbolInfo, model: IZLPFundingFeeModel, price: number, lpSupplyAmount: number, timestamp: number): number {
-    const accFundingRate = ZLPDataAPI.calcAccFundingFeeRate(symbol, model, price, lpSupplyAmount, timestamp)
+  private static calculateSymbolFundingFee(
+    symbol: IZLPSymbolInfo,
+    model: IZLPFundingFeeModel,
+    price: number,
+    lpSupplyAmount: number,
+    timestamp: number,
+    oiModel?: IZLPOiFundingModel,
+    pairedOpeningSize?: number,
+  ): number {
+    const accFundingRate = ZLPDataAPI.calcAccFundingFeeRate(
+      symbol,
+      model,
+      price,
+      lpSupplyAmount,
+      timestamp,
+      oiModel,
+      pairedOpeningSize,
+    )
     return symbol.unrealisedFundingFeeValue + (accFundingRate - symbol.accFundingRate) * symbol.openingSize
   }
 
@@ -868,13 +967,33 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     }
 
     positionInfo.reservingFeeAmount = ZLPDataAPI.calculatePositionReserveFee(positionInfo, await this.getVaultInfo(positionInfo.collateralToken), (await this.getVaultInfo(positionInfo.collateralToken)).reservingFeeModel, Date.now() / 1000)
-    positionInfo.fundingFeeValue = ZLPDataAPI.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)
+    // 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)
+    positionInfo.fundingFeeValue = ZLPDataAPI.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, oiState && oiState.enabled ? oiState.model : undefined, pairedSymbol.openingSize)
 
     return positionInfo
   }
 
-  private static calculatePositionFundingFee(position: IZLPPositionInfo, symbol: IZLPSymbolInfo, model: IZLPFundingFeeModel, price: number, lpSupplyAmount: number, timestamp: number): number {
-    const accFundingRate = ZLPDataAPI.calcAccFundingFeeRate(symbol, model, price, lpSupplyAmount, timestamp)
+  private static calculatePositionFundingFee(
+    position: IZLPPositionInfo,
+    symbol: IZLPSymbolInfo,
+    model: IZLPFundingFeeModel,
+    price: number,
+    lpSupplyAmount: number,
+    timestamp: number,
+    oiModel?: IZLPOiFundingModel,
+    pairedOpeningSize?: number,
+  ): number {
+    const accFundingRate = ZLPDataAPI.calcAccFundingFeeRate(
+      symbol,
+      model,
+      price,
+      lpSupplyAmount,
+      timestamp,
+      oiModel,
+      pairedOpeningSize,
+    )
     return position.fundingFeeValue + (accFundingRate - position.lastFundingRate) * position.positionSize
   }
 
@@ -902,6 +1021,23 @@ export class ZLPDataAPI extends BaseDataAPI implements IZLPDataAPI {
     }
   }
 
+  private static parseOiFundingState(raw: any): IZLPOiFundingState {
+    console.log('checking oi funding state raw:', raw)
+    const content = raw.data.content.fields
+    console.log('oi funding state raw:', content)
+    return {
+      id: content.id.id,
+      enabled: content.enabled,
+      last_update: parseValue(content.last_update),
+      model: {
+        id: content.model.fields.id.id,
+        multiplier: parseValue(content.model.fields.multiplier),
+        exponent: parseValue(content.model.fields.exponent),
+        max: parseValue(content.model.fields.max),
+      },
+    }
+  }
+
   private parseOrderInfo(raw: any, capId: string): IZLPOrderInfo {
     const { content } = raw.data
     const { fields } = content.fields.value

package/src/interfaces/zlp.ts

@@ -89,6 +89,19 @@ export interface IZLPSymbolConfig {
   instant_exit_fee_config: IZLPPositionInstantExitFeeConfig
 }
 
+export interface IZLPOiFundingModel {
+  id: string
+  multiplier: number
+  exponent: number
+  max: number
+}
+export interface IZLPOiFundingState {
+  id: string
+  enabled: boolean
+  last_update: number
+  model: IZLPOiFundingModel
+}
+
 // ZLP-specific data API interface
 export interface IZLPDataAPI extends IBaseDataAPI {
   getSymbolConfig: (indexToken: string, long: boolean) => Promise<IZLPSymbolConfig | null>