@lifi/perps-sdk-provider-hyperliquid 1.4.0 → 1.5.2

package/dist/types/utils/mapOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapOrder.d.ts","sourceRoot":"","sources":["../../../src/utils/mapOrder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,KAAK,EACL,YAAY,EACb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAEL,WAAW,EACX,SAAS,EAEV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE3E;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,KAAG,SAehD,CAAA;AAED,cAAc;AACd,eAAO,MAAM,aAAa,GAAI,MAAM,SAAS,KAAG,OAIjB,CAAA;AAE/B;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,cAAc,GACzB,GAAG,mBAAmB,GAAG,aAAa,CAAC,OAAO,CAAC,KAC9C,OAkBF,CAAA;AAED,cAAc;AACd,eAAO,MAAM,YAAY,GACvB,GAAG,mBAAmB,EACtB,QAAQ,aAAa,KACpB,SAaD,CAAA;AAEF,cAAc;AACd,eAAO,MAAM,eAAe,GAC1B,GAAG,mBAAmB,EACtB,QAAQ,aAAa,KACpB,YAcF,CAAA;AAED,cAAc;AACd,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,KAAG,WAmB/C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,SAuBzD,CAAA;AAeD,cAAc;AACd,eAAO,MAAM,QAAQ,GACnB,QAAQ,aAAa,EACrB,QAAQ,aAAa,KACpB,KAsBF,CAAA"}
+{"version":3,"file":"mapOrder.d.ts","sourceRoot":"","sources":["../../../src/utils/mapOrder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,KAAK,EACL,YAAY,EACb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAEL,WAAW,EACX,SAAS,EAEV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE3E;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,KAAG,SAehD,CAAA;AAED,cAAc;AACd,eAAO,MAAM,aAAa,GAAI,MAAM,SAAS,KAAG,OAIjB,CAAA;AAE/B;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,cAAc,GACzB,GAAG,mBAAmB,GAAG,aAAa,CAAC,OAAO,CAAC,KAC9C,OAkBF,CAAA;AAED,cAAc;AACd,eAAO,MAAM,YAAY,GACvB,GAAG,mBAAmB,EACtB,QAAQ,aAAa,KACpB,SAaD,CAAA;AAEF,cAAc;AACd,eAAO,MAAM,eAAe,GAC1B,GAAG,mBAAmB,EACtB,QAAQ,aAAa,KACpB,YAcF,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,KAAG,WAwB/C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,SAyBzD,CAAA;AAeD,cAAc;AACd,eAAO,MAAM,QAAQ,GACnB,QAAQ,aAAa,EACrB,QAAQ,aAAa,KACpB,KAsBF,CAAA"}

package/dist/types/websocket/HyperliquidWsProvider.d.ts

@@ -80,6 +80,8 @@ export declare class HyperliquidWsProvider extends WsProviderBase<object> {
      * + mark overlaid from `fastAssetCtxs`.
      */
     private emitMarketsContext;
+    private handleActiveAssetCtx;
+    private handleActiveSpotAssetCtx;
     /** Latest mid per `Market.id` across asset-context and fast feeds. */
     private mergedMids;
     private orderbookReferencePrice;

package/dist/types/websocket/HyperliquidWsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperliquidWsProvider.d.ts","sourceRoot":"","sources":["../../../src/websocket/HyperliquidWsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAGlB,cAAc,EACd,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAOL,KAAK,YAAY,EAElB,MAAM,mBAAmB,CAAA;AA2C1B;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,QAC5B,iBAEgD,CAAA;AAEtD;;;;;;;;;;;;;GAaG;AACH,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,MAAM,CAAC;IAC/D,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,eAAe,CAAsD;IAC7E,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,uBAAuB,CAAiC;IAChE,OAAO,CAAC,yBAAyB,CAAuC;IAKxE,OAAO,CAAC,iBAAiB,CAAuC;IAGhE,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,oBAAoB,CAAmC;gBAEnD,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;IASjE,cAAc,CAClB,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,IAAI,CAAC;cAkBN,WAAW,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IA+DnE;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,iBAAiB;IAmBzB;;;;OAIG;IACH,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,gBAAgB;cAcL,OAAO,IAAI,IAAI;IAalC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM9C,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM;IAwB1C,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,WAAW;IAwCnB,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAwEnC,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,SAAS;IAoBjB,OAAO,CAAC,oBAAoB;IAe5B;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAgB3B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA6C1B,sEAAsE;IACtE,OAAO,CAAC,UAAU;IAuBlB,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,QAAQ;IAoBhB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,kBAAkB;IA0D1B,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,+BAA+B;IAkBvC,OAAO,CAAC,eAAe;CAaxB"}
+{"version":3,"file":"HyperliquidWsProvider.d.ts","sourceRoot":"","sources":["../../../src/websocket/HyperliquidWsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAGlB,cAAc,EACd,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAOL,KAAK,YAAY,EAElB,MAAM,mBAAmB,CAAA;AA6C1B;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,QAC5B,iBAEgD,CAAA;AAEtD;;;;;;;;;;;;;GAaG;AACH,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,MAAM,CAAC;IAC/D,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,eAAe,CAAsD;IAC7E,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,uBAAuB,CAAiC;IAChE,OAAO,CAAC,yBAAyB,CAAuC;IAKxE,OAAO,CAAC,iBAAiB,CAAuC;IAGhE,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,oBAAoB,CAAmC;gBAEnD,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;IASjE,cAAc,CAClB,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,IAAI,CAAC;cAkBN,WAAW,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IA+DnE;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,iBAAiB;IAmBzB;;;;OAIG;IACH,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,gBAAgB;cAcL,OAAO,IAAI,IAAI;IAalC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM9C,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM;IA0B1C,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,WAAW;IA6CnB,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IA8EnC,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,SAAS;IAoBjB,OAAO,CAAC,oBAAoB;IAe5B;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAgB3B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAuC1B,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,wBAAwB;IAWhC,sEAAsE;IACtE,OAAO,CAAC,UAAU;IAuBlB,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,QAAQ;IAoBhB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,kBAAkB;IA0D1B,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,+BAA+B;IAkBvC,OAAO,CAAC,eAAe;CAaxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/perps-sdk-provider-hyperliquid",
-  "version": "1.4.0",
+  "version": "1.5.2",
   "description": "Hyperliquid provider plugin for @lifi/perps-sdk",
   "homepage": "https://github.com/lifinance/perps-sdk",
   "bugs": {
@@ -48,10 +48,10 @@
   "dependencies": {
     "big.js": "^7.0.1",
     "viem": "^2.48.8",
-    "@lifi/perps-types": "^1.4.0"
+    "@lifi/perps-types": "^1.5.1"
   },
   "peerDependencies": {
-    "@lifi/perps-sdk": "^1.4.0"
+    "@lifi/perps-sdk": "^1.5.2"
   },
   "publishConfig": {
     "access": "public"

package/src/accountSummary.ts

@@ -1,4 +1,4 @@
-import { summarizeAccount } from '@lifi/perps-sdk'
+import { type CollateralSemantics, summarizeAccount } from '@lifi/perps-sdk'
 import type {
   AccountResponse,
   AccountSummary,
@@ -7,20 +7,23 @@ import type {
 import { HlAbstractionMode } from './types/index.js'
 
 /**
- * In `unifiedAccount`/`portfolioMargin` the whole account lives in spot, so the
- * collateral rows are already gross holdings (locked margin included). In
- * `disabled`/`dexAbstraction` (and the unset/standard mode) the venue rows hold
- * `accountValue`, which Hyperliquid reports net of locked margin — i.e. free.
+ * In `unifiedAccount`/`portfolioMargin` the whole account lives in spot, so
+ * the collateral rows are gross holdings: locked margin included, unrealized
+ * PnL carried by the positions. In `disabled`/`dexAbstraction` (and the
+ * unset/standard mode) the venue rows hold `accountValue`, Hyperliquid's
+ * total equity — locked margin AND unrealized PnL already included.
  */
-const isUnifiedMode = (account: AccountResponse): boolean =>
+const collateralSemantics = (account: AccountResponse): CollateralSemantics =>
   account.config.provider === 'hyperliquid' &&
   (account.config.abstractionMode === HlAbstractionMode.UNIFIED_ACCOUNT ||
     account.config.abstractionMode === HlAbstractionMode.PORTFOLIO_MARGIN)
+    ? 'gross'
+    : 'equity'
 
 /**
  * Roll a Hyperliquid {@link AccountResponse} up into an {@link AccountSummary},
- * branching on the abstraction mode so the gross/free meaning of the collateral
- * rows is interpreted correctly.
+ * branching on the abstraction mode so the margin/PnL content of the
+ * collateral rows is interpreted correctly.
  *
  * @public
  */
@@ -28,5 +31,5 @@ export function getAccountSummary(
   account: AccountResponse,
   positions: Position[]
 ): AccountSummary {
-  return summarizeAccount(account, positions, isUnifiedMode(account))
+  return summarizeAccount(account, positions, collateralSemantics(account))
 }

package/src/services/getAccount.ts

@@ -28,7 +28,7 @@ import {
   spotPriceById,
 } from '../utils/index.js'
 import { hlInfoOptions, infoRequest } from '../utils/infoClient.js'
-import { mapPosition } from '../utils/mapPosition.js'
+import { isOpenAssetPosition, mapPosition } from '../utils/mapPosition.js'
 
 /**
  * Parameters for {@link getAccount}.
@@ -37,16 +37,14 @@ import { mapPosition } from '../utils/mapPosition.js'
  */
 export type GetAccountParams = ProviderGetAccountParams
 
+// `marginSummary` covers the whole account (cross AND isolated positions);
+// `crossMarginSummary` is the cross-only subset and would drop isolated
+// equity/margin.
 const getAccountValue = (state: HlClearinghouseState): number =>
-  Number.parseFloat(
-    state.crossMarginSummary.accountValue || state.marginSummary.accountValue
-  )
+  Number.parseFloat(state.marginSummary.accountValue)
 
 const getTotalMarginUsed = (state: HlClearinghouseState): number =>
-  Number.parseFloat(
-    state.crossMarginSummary.totalMarginUsed ||
-      state.marginSummary.totalMarginUsed
-  )
+  Number.parseFloat(state.marginSummary.totalMarginUsed)
 
 const getMarginUsed = (
   abstraction: HlAbstractionMode | null,
@@ -113,8 +111,8 @@ const buildBalances = (
 
   // Unified/portfolio modes hold everything in spot — per-dex equity would
   // double-count. Only disabled/dexAbstraction carry separate venue collateral.
-  // `accountValue` is reported net of locked margin, i.e. the free collateral;
-  // the locked portion is carried by the positions' `marginUsed`.
+  // `accountValue` is the dex's TOTAL equity: locked margin and unrealized
+  // PnL are already included, so summaries must not add them on top.
   if (!isUnifiedMode(abstraction)) {
     for (const [dex, state] of stateByDex) {
       const categoryId = dex || PROVIDER_KEY
@@ -218,7 +216,7 @@ export const getAccount = async (
 
   const positions: Position[] = stateResults.flatMap((state) =>
     state.assetPositions
-      .filter((ap) => Number.parseFloat(ap.position.szi) !== 0)
+      .filter(isOpenAssetPosition)
       .map((ap) => mapPosition(ap, registry.require(ap.position.coin)))
   )
 
@@ -252,6 +250,7 @@ export const getAccount = async (
     address: params.address,
     balances,
     collateralBalances,
+    positions,
     marginUsed: getMarginUsed(abstractionResult, positions, stateByDex),
     unrealizedPnl: totalUnrealizedPnl.toString(),
     feeTier: {

package/src/types/ws.ts

@@ -71,6 +71,18 @@ export type HlWsSpotAssetCtx = {
   circulatingSupply?: HlWsNumberString
 }
 
+/** @public */
+export type HlWsActiveAssetCtxData = {
+  coin: string
+  ctx: Partial<Record<keyof HlWsPerpAssetCtx, HlWsNumberString | null>>
+}
+
+/** @public */
+export type HlWsActiveSpotAssetCtxData = {
+  coin: string
+  ctx: HlWsSpotAssetCtx
+}
+
 /**
  * Compressed spot asset-context feed. The first frame is a broad snapshot; later
  * frames only carry changed fields.

package/src/utils/mapOrder.ts

@@ -122,7 +122,17 @@ export const mapTriggerOrder = (
   }
 }
 
-/** @public */
+/**
+ * Map a raw Hyperliquid order status string to the SDK's OrderStatus enum.
+ *
+ * HL's terminal statuses are mostly compound strings ending in `Canceled`
+ * or `Rejected` (e.g. `siblingFilledCanceled`, `tickRejected`); classify
+ * those by suffix so a status HL adds later still lands in the correct
+ * terminal bucket instead of silently falling through to PENDING, which
+ * {@link isActiveOrderStatus} treats as active. `scheduledCancel` is the
+ * one documented cancel status without the `Canceled` suffix.
+ * @public
+ */
 export const mapOrderStatus = (status: string): OrderStatus => {
   switch (status) {
     case 'open':
@@ -132,14 +142,19 @@ export const mapOrderStatus = (status: string): OrderStatus => {
       return OrderStatus.FILLED
     case 'canceled':
     case 'cancelled':
+    case 'scheduledCancel':
       return OrderStatus.CANCELLED
     case 'rejected':
       return OrderStatus.REJECTED
     case 'triggered':
       return OrderStatus.TRIGGERED
-    case 'marginCanceled':
-      return OrderStatus.CANCELLED
     default:
+      if (status.endsWith('Canceled') || status.endsWith('Cancelled')) {
+        return OrderStatus.CANCELLED
+      }
+      if (status.endsWith('Rejected')) {
+        return OrderStatus.REJECTED
+      }
       return OrderStatus.PENDING
   }
 }
@@ -153,7 +168,7 @@ export const mapOrderStatus = (status: string): OrderStatus => {
  */
 export const mapStatusReason = (status: string): string | undefined => {
   switch (status) {
-    case 'iocCanceled':
+    case 'iocCancelRejected':
       return 'Order cancelled: not enough liquidity to fill immediately.'
     case 'reduceOnlyCanceled':
       return 'Order cancelled: would not reduce your position.'
@@ -165,12 +180,14 @@ export const mapStatusReason = (status: string): string | undefined => {
       return 'Order cancelled: sibling OCO order filled first.'
     case 'selfTradeCanceled':
       return 'Order cancelled: would self-trade against your own resting order.'
+    case 'scheduledCancel':
+      return "Order cancelled: dead man's switch triggered."
     case 'tickRejected':
       return 'Order rejected: price did not match the tick size.'
     case 'minTradeNtlRejected':
       return 'Order rejected: notional value below the minimum trade size.'
-    case 'delistedRejected':
-      return 'Order rejected: market has been delisted.'
+    case 'delistedCanceled':
+      return 'Order cancelled: market has been delisted.'
     default:
       return undefined
   }

package/src/websocket/HyperliquidWsProvider.ts

@@ -27,6 +27,8 @@ import type {
   HlAssetPosition,
   HlOrderDetail,
   HlUserFill,
+  HlWsActiveAssetCtxData,
+  HlWsActiveSpotAssetCtxData,
   HlWsAllDexsAssetCtxsData,
   HlWsAllDexsClearinghouseStateData,
   HlWsCandleData,
@@ -309,6 +311,8 @@ export class HyperliquidWsProvider extends WsProviderBase<object> {
     switch (sub.channel) {
       case 'marketsContext':
         return 'marketsContext'
+      case 'marketContext':
+        return `marketContext:${sub.marketId}`
       case 'orderbook':
         return `l2:${sub.marketId}:${this.orderbookAggregationKey(
           sub.marketId,
@@ -361,6 +365,11 @@ export class HyperliquidWsProvider extends WsProviderBase<object> {
         // Handled via getMarketsContextSubEntries in openChannel; never reaches
         // toHlPayload, but TS requires an exhaustive switch.
         return { type: 'allDexsAssetCtxs' }
+      case 'marketContext':
+        return {
+          type: 'activeAssetCtx',
+          coin: sub.marketId,
+        }
       case 'orderbook': {
         const aggregation = this.orderbookAggregation(
           sub.marketId,
@@ -435,6 +444,12 @@ export class HyperliquidWsProvider extends WsProviderBase<object> {
         case 'fastAssetCtxs':
           this.handleFastAssetCtxs(msg.data as string)
           break
+        case 'activeAssetCtx':
+          this.handleActiveAssetCtx(msg.data as HlWsActiveAssetCtxData, raw)
+          break
+        case 'activeSpotAssetCtx':
+          this.handleActiveSpotAssetCtx(msg.data as HlWsActiveSpotAssetCtxData)
+          break
         case 'l2':
           this.handleL2(msg.data as HlWsL2Data)
           break
@@ -580,21 +595,15 @@ export class HyperliquidWsProvider extends WsProviderBase<object> {
       }
     }
     for (const [marketId, ctx] of Object.entries(this.spotCtxByMarketId)) {
-      const midPrice = toMarketContextString(ctx.midPx ?? ctx.markPx)
-      const markPrice = toMarketContextString(ctx.markPx)
-      if (midPrice === undefined || markPrice === undefined) {
-        continue
-      }
-      const fast = this.fastCtxByMarketId[marketId]
-      const emittedMarkPrice = fast?.markPx != null ? fast.markPx : markPrice
-      data[marketId] = {
+      const context = mapSpotMarketContext(
         marketId,
-        midPrice: fast?.midPx != null ? fast.midPx : midPrice,
-        markPrice: emittedMarkPrice,
-        prevDayPrice: toMarketContextString(ctx.prevDayPx),
-        volume24h: toMarketContextString(ctx.dayNtlVlm),
-        marketCap: toMarketCapString(emittedMarkPrice, ctx.circulatingSupply),
+        ctx,
+        this.fastCtxByMarketId[marketId]
+      )
+      if (context === undefined) {
+        continue
       }
+      data[marketId] = context
     }
     for (const [marketId, fast] of Object.entries(this.fastCtxByMarketId)) {
       if (data[marketId] !== undefined) {
@@ -611,6 +620,29 @@ export class HyperliquidWsProvider extends WsProviderBase<object> {
     this.emit('marketsContext', { channel: 'marketsContext', data })
   }
 
+  private handleActiveAssetCtx(data: HlWsActiveAssetCtxData, raw: string) {
+    const ctx = activePerpAssetCtx(data.coin, data.ctx)
+    if (ctx === undefined) {
+      wsLog.parseFailure(this.providerKey, raw)
+      return
+    }
+    this.emit(`marketContext:${data.coin}`, {
+      channel: 'marketContext',
+      data: mapMarketContext(data.coin, ctx),
+    })
+  }
+
+  private handleActiveSpotAssetCtx(data: HlWsActiveSpotAssetCtxData) {
+    const context = mapSpotMarketContext(data.coin, data.ctx)
+    if (context === undefined) {
+      return
+    }
+    this.emit(`marketContext:${data.coin}`, {
+      channel: 'marketContext',
+      data: context,
+    })
+  }
+
   /** Latest mid per `Market.id` across asset-context and fast feeds. */
   private mergedMids(): Map<string, number> {
     const map = new Map<string, number>()
@@ -932,6 +964,66 @@ function allDexsAssetCtxEntries(
   return data.assetCtxs ?? data.ctxs ?? []
 }
 
+function activePerpAssetCtx(
+  marketId: string,
+  ctx: HlWsActiveAssetCtxData['ctx']
+): HlWsPerpAssetCtx | undefined {
+  const funding = toMarketContextString(ctx.funding)
+  const openInterest = toMarketContextString(ctx.openInterest)
+  const dayNtlVlm = toMarketContextString(ctx.dayNtlVlm)
+  const prevDayPx = toMarketContextString(ctx.prevDayPx)
+  const markPx = toMarketContextString(ctx.markPx)
+  const midPx =
+    ctx.midPx === undefined || ctx.midPx === null
+      ? null
+      : (toMarketContextString(ctx.midPx) ?? null)
+  const oraclePx = toMarketContextString(ctx.oraclePx)
+
+  if (
+    funding === undefined ||
+    openInterest === undefined ||
+    dayNtlVlm === undefined ||
+    prevDayPx === undefined ||
+    markPx === undefined ||
+    oraclePx === undefined
+  ) {
+    return undefined
+  }
+
+  return {
+    coin: marketId,
+    funding,
+    openInterest,
+    dayNtlVlm,
+    prevDayPx,
+    markPx,
+    midPx,
+    oraclePx,
+  }
+}
+
+function mapSpotMarketContext(
+  marketId: string,
+  ctx: HlWsSpotAssetCtx,
+  fast?: HlWsFastAssetCtx
+): MarketContext | undefined {
+  const midPrice = toMarketContextString(ctx.midPx ?? ctx.markPx)
+  const markPrice = toMarketContextString(ctx.markPx)
+  if (midPrice === undefined || markPrice === undefined) {
+    return undefined
+  }
+
+  const emittedMarkPrice = fast?.markPx != null ? fast.markPx : markPrice
+  return {
+    marketId,
+    midPrice: fast?.midPx != null ? fast.midPx : midPrice,
+    markPrice: emittedMarkPrice,
+    prevDayPrice: toMarketContextString(ctx.prevDayPx),
+    volume24h: toMarketContextString(ctx.dayNtlVlm),
+    marketCap: toMarketCapString(emittedMarkPrice, ctx.circulatingSupply),
+  }
+}
+
 function compactRemovalPrice(
   levels: OrderbookLevel[],
   value: number | string | { p: string }
@@ -991,6 +1083,9 @@ function isValidHlFrame(channel: string, data: unknown): boolean {
   switch (channel) {
     case 'allDexsAssetCtxs':
       return Array.isArray(data.assetCtxs) || Array.isArray(data.ctxs)
+    case 'activeAssetCtx':
+    case 'activeSpotAssetCtx':
+      return typeof data.coin === 'string' && isObject(data.ctx)
     case 'l2Book':
       return (
         typeof data.coin === 'string' &&