@lifi/perps-sdk-provider-lighter 42.0.0 → 43.0.0

package/src/constants.ts

@@ -16,17 +16,6 @@ export const LIGHTER_PROVIDER_KEY = 'lighter'
  */
 export const LIGHTER_RH_PROVIDER_KEY = 'lighter-rh'
 
-/**
- * Category id for Lighter spot token holdings, matching the backend's Lighter
- * spot asset category. Every Lighter call site, REST and WebSocket, uses this
- * constant for the spot category. The perps category id is not a constant:
- * `LighterProvider.getAccount` reads it from the `/providers` category whose
- * `quoteAsset` is not null.
- *
- * @public
- */
-export const LIGHTER_SPOT_CATEGORY_ID = 'spot'
-
 /**
  * Default mainnet REST and WS base URL for Lighter.
  *

package/src/index.ts

@@ -34,7 +34,6 @@ export {
   LIGHTER_RH_REST_URL,
   LIGHTER_RH_SIGNER_CHAIN_ID,
   LIGHTER_RH_WS_URL,
-  LIGHTER_SPOT_CATEGORY_ID,
 } from './constants.js'
 export { lighterDepositFlow } from './depositFlow.js'
 export type {

package/src/types/ws.ts

@@ -142,8 +142,10 @@ export type LtWsTrade = {
   trade_id: number
   trade_id_str?: string
   market_id?: number
+  type: string
   size: string
   price: string
+  usd_amount: string
   is_maker_ask: boolean
   timestamp: number
 }

package/src/utils/mapFill.ts

@@ -10,7 +10,6 @@ import {
   isDecimalStringZero,
   safeAddDecimalString,
   safeDivideDecimalString,
-  safeIsDecimalStringZero,
   safeMultiplyDecimalString,
   warnSkippedVenueRow,
 } from '@lifi/perps-sdk'
@@ -20,6 +19,7 @@ import { LIGHTER_FEE_TICK_SCALE, LIGHTER_PROVIDER_KEY } from '../constants.js'
 import type { LtTrade } from '../types/index.js'
 import { leverageFromScaledImf } from './mapPosition.js'
 import { rowTimestampToIsoStringOrUndefined } from './rowTimestamp.js'
+import { resolveTradePrice } from './tradePrice.js'
 import { isPlaceholderTxHash } from './txHash.js'
 
 /**
@@ -144,12 +144,7 @@ export const mapFill = (
   market: MarketDisplay
 ): Fill | undefined => {
   const { size } = trade
-  // Lighter reports a zero `price` on a `deleverage` row, but `usd_amount`
-  // still carries the execution notional.
-  const price =
-    trade.type === 'deleverage' && safeIsDecimalStringZero(trade.price) === true
-      ? (safeDivideDecimalString(trade.usd_amount, size) ?? trade.price)
-      : trade.price
+  const price = resolveTradePrice(trade)
   const createdAt = rowTimestampToIsoStringOrUndefined(trade.timestamp)
   if (createdAt === undefined) {
     warnSkippedVenueRow(

package/src/utils/spotPrice.ts

@@ -1,5 +1,6 @@
 import {
   isDecimalStringGreaterThan,
+  isSpotCategory,
   multiplyDecimalString,
   unknownToDecimalString,
 } from '@lifi/perps-sdk'
@@ -18,7 +19,6 @@ import { LIGHTER_PROVIDER_KEY } from '../constants.js'
  */
 export const spotPriceByAssetId = (
   markets: readonly Market[],
-  spotCategoryId: string,
   contexts: readonly MarketContext[],
   assetIds: ReadonlySet<string>
 ): Map<string, string> => {
@@ -27,7 +27,7 @@ export const spotPriceByAssetId = (
   for (const market of markets) {
     const mark = markByMarketId.get(market.id)
     if (
-      market.categoryId !== spotCategoryId ||
+      !isSpotCategory(market.categoryId) ||
       mark === undefined ||
       !assetIds.has(market.baseAsset.id) ||
       priceByAssetId.has(market.baseAsset.id)

package/src/utils/tradePrice.ts

@@ -0,0 +1,20 @@
+import {
+  safeDivideDecimalString,
+  safeIsDecimalStringZero,
+} from '@lifi/perps-sdk'
+import type { LtTrade } from '../types/index.js'
+
+/**
+ * Execution price of a Lighter trade row. Lighter reports a zero `price` on a
+ * `deleverage` row, but `usd_amount` still carries the execution notional, so
+ * that row resolves to `usd_amount / size`. Every other row, and a row whose
+ * division fails, keeps the venue `price`.
+ *
+ * @internal
+ */
+export const resolveTradePrice = (
+  trade: Pick<LtTrade, 'type' | 'price' | 'size' | 'usd_amount'>
+): string =>
+  trade.type === 'deleverage' && safeIsDecimalStringZero(trade.price) === true
+    ? (safeDivideDecimalString(trade.usd_amount, trade.size) ?? trade.price)
+    : trade.price

package/src/utils/withdrawableBalances.ts

@@ -6,7 +6,8 @@ import {
   subtractDecimalString,
   unknownToDecimalString,
 } from '@lifi/perps-sdk'
-import { LIGHTER_PROVIDER_KEY, LIGHTER_SPOT_CATEGORY_ID } from '../constants.js'
+import { SPOT_CATEGORY_ID } from '@lifi/perps-types'
+import { LIGHTER_PROVIDER_KEY } from '../constants.js'
 import type { LtAccount } from '../types/account.js'
 
 /**
@@ -45,7 +46,7 @@ export const lighterWithdrawableBalances = (
     if (isDecimalStringGreaterThan(spot, '0')) {
       rows.push({
         assetId,
-        categoryId: LIGHTER_SPOT_CATEGORY_ID,
+        categoryId: SPOT_CATEGORY_ID,
         available: spot,
         max: calculateWithdrawMax({ available: spot }),
       })

package/src/websocket/LighterWsProvider.ts

@@ -4,6 +4,7 @@ import {
   createSafeFunction,
   getMarketRegistry,
   isDecimalStringGreaterThan,
+  isSpotCategory,
   type MarketRegistry,
   numberToDecimalString,
   PerpsError,
@@ -41,7 +42,6 @@ import {
   LIGHTER_COLLATERAL_ASSETS,
   LIGHTER_PROVIDER_KEY,
   LIGHTER_RH_PROVIDER_KEY,
-  LIGHTER_SPOT_CATEGORY_ID,
 } from '../constants.js'
 import type { LighterPerpsProvider } from '../LighterProvider.js'
 import type {
@@ -73,6 +73,7 @@ import {
   mapPosition,
 } from '../utils/index.js'
 import { spotPriceByAssetId, spotValuation } from '../utils/spotPrice.js'
+import { resolveTradePrice } from '../utils/tradePrice.js'
 import { askOrder, bidOrder, OrderBookSide } from './orderBookSide.js'
 
 // Public channels: `marketsContext` (market_stats/all + spot_market_stats/all),
@@ -207,7 +208,6 @@ const heldPortfolioValue = (
     .filter(([, balance]) => isDecimalStringGreaterThan(balance, '0'))
   const spotPrices = spotPriceByAssetId(
     markets,
-    LIGHTER_SPOT_CATEGORY_ID,
     contexts,
     new Set(
       held
@@ -526,10 +526,9 @@ export class LighterWsProvider extends WsProviderBase<SubState> {
         )
       }
       const market = this.registry.require(sub.marketId)
-      const prefix =
-        market.categoryId === LIGHTER_SPOT_CATEGORY_ID
-          ? 'spot_market_stats'
-          : 'market_stats'
+      const prefix = isSpotCategory(market.categoryId)
+        ? 'spot_market_stats'
+        : 'market_stats'
       return [{ channel: `${prefix}/${market.id}`, needsAuth: false }]
     }
     if (sub.channel === 'orderbook') {
@@ -1097,7 +1096,7 @@ export class LighterWsProvider extends WsProviderBase<SubState> {
       data: trades.map((t) => ({
         provider: this.providerKey,
         marketId: assetId,
-        price: t.price,
+        price: resolveTradePrice(t),
         size: t.size,
         timestamp: t.timestamp,
         side: t.is_maker_ask ? 'buy' : 'sell',