@lifi/perps-sdk-provider-lighter 24.0.2 → 25.0.0

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

@@ -1,72 +1,10 @@
-import type { MarketDisplay, OpenOrder, Order, TriggerOrder } from '@lifi/perps-types';
-import { OrderType } from '@lifi/perps-types';
+import type { MarketDisplay, Order } from '@lifi/perps-types';
 import type { LtOrder } from '../types/index.js';
-/**
- * Map a raw Lighter order status to a short English sentence describing
- * *why* the order ended in a terminal non-FILLED state. Non-terminal
- * statuses, plain `filled`, and unknown values return `undefined`.
- * @public
- */
-export declare const mapStatusReason: (status: string) => string | undefined;
-/**
- * True for order types Lighter exposes as TP/SL legs. Mirrors the
- * Hyperliquid helper of the same name so the backend can split a raw
- * Lighter order list into the same `openOrders` / `triggerOrders`
- * buckets the SDK declares on `OrdersResponse`.
- * @public
- */
-export declare const isTriggerType: (type: OrderType) => boolean;
-/**
- * Decide whether a raw Lighter order belongs in the cross-provider
- * `triggerOrders` bucket. Single source of truth for both the REST
- * `getOrders` path and the `account_all_orders` WS handler.
- *
- * Authoritative signals, in order:
- *   1. `trigger_status` — Lighter's own enum. `'ready' | 'mark-price' |
- *      'parent-order'` all mean "this order has trigger semantics" (TP/SL
- *      waiting on price, or a TP/SL leg of a parent placeOrder). `'twap'`
- *      is intentionally excluded — TWAP child orders are scheduled resting
- *      limits, not TP/SL triggers. `'na'` is "regular order".
- *   2. `trigger_price > 0` — catches cases where `trigger_status`
- *      momentarily lags during state transitions (e.g. right after an OCO
- *      sibling cancels).
- *   3. `type` — final fallback via the mapped `OrderType`.
- * @public
- */
-export declare const isTriggerOrder: (raw: LtOrder) => boolean;
-/**
- * Map a raw Lighter trigger order (stop/take-profit, market or limit) to
- * the generic `TriggerOrder` shape. For market variants the `limitPrice`
- * field is omitted; for limit variants `order.price` is the limit and
- * `order.trigger_price` is the activation level.
- * @public
- */
-export declare const mapTriggerOrder: (order: LtOrder, market: MarketDisplay) => TriggerOrder;
-/**
- * Map a raw Lighter order to the generic OpenOrder type.
- * @param market - Backend-resolved market identity for `order.market_index`.
- * @public
- */
-export declare const mapOrder: (order: LtOrder, market: MarketDisplay) => OpenOrder;
-/**
- * Walk a flat list of raw Lighter orders and bucket each into the
- * `OpenOrder` / `TriggerOrder` arrays the cross-provider `OrdersResponse`
- * declares, plus a `terminated` list of orderIds whose status has reached
- * a terminal state (filled / cancelled / rejected / expired) — consumers
- * applying WS deltas evict those from the cached buckets. REST callers
- * see `terminated: []` because `accountActiveOrders` returns active only.
- * An order whose market the resolver does not know is skipped.
- * @public
- */
-export declare const classifyAndMapOrders: (orders: LtOrder[], resolveMarket: (marketIndex: number) => MarketDisplay | undefined) => {
-    openOrders: OpenOrder[];
-    triggerOrders: TriggerOrder[];
+/** Map a Lighter order with its venue identity, lifecycle, and execution fields. */
+export declare const mapOrder: (order: LtOrder, market: MarketDisplay) => Order;
+/** Include terminal rows and their ids so consumers can update history and active caches. */
+export declare const mapOrderUpdates: (rawOrders: LtOrder[], resolveMarket: (marketIndex: number) => MarketDisplay | undefined) => {
+    orders: Order[];
     terminated: string[];
 };
-/**
- * Map a raw Lighter order to the rich Order type — adds status, time-in-force
- * and remaining/filled sizes on top of the OpenOrder fields.
- * @public
- */
-export declare const mapOrderDetail: (order: LtOrder, market: MarketDisplay) => Order;
 //# sourceMappingURL=mapOrder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mapOrder.d.ts","sourceRoot":"","sources":["../../../src/utils/mapOrder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,KAAK,EACL,YAAY,EACb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAGL,SAAS,EAEV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAmDhD;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,SA+BzD,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,SAAS,KAAG,OAIjB,CAAA;AAE/B;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,cAAc,GAAI,KAAK,OAAO,KAAG,OAY7C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,OAAO,EACd,QAAQ,aAAa,KACpB,YAkBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GAAI,OAAO,OAAO,EAAE,QAAQ,aAAa,KAAG,SAW/D,CAAA;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,OAAO,EAAE,EACjB,eAAe,CAAC,WAAW,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,KAChE;IACD,UAAU,EAAE,SAAS,EAAE,CAAA;IACvB,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,UAAU,EAAE,MAAM,EAAE,CAAA;CAsBrB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,OAAO,EACd,QAAQ,aAAa,KACpB,KAeD,CAAA"}
+{"version":3,"file":"mapOrder.d.ts","sourceRoot":"","sources":["../../../src/utils/mapOrder.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAa,MAAM,mBAAmB,CAAA;AASxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAiFhD,oFAAoF;AACpF,eAAO,MAAM,QAAQ,GAAI,OAAO,OAAO,EAAE,QAAQ,aAAa,KAAG,KA8DhE,CAAA;AAED,6FAA6F;AAC7F,eAAO,MAAM,eAAe,GAC1B,WAAW,OAAO,EAAE,EACpB,eAAe,CAAC,WAAW,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,KAChE;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAczC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/perps-sdk-provider-lighter",
-  "version": "24.0.2",
+  "version": "25.0.0",
   "description": "Lighter provider plugin for @lifi/perps-sdk",
   "homepage": "https://github.com/lifinance/perps-sdk",
   "bugs": {
@@ -44,10 +44,10 @@
   "dependencies": {
     "big.js": "^7.0.1",
     "viem": "^2.55.18",
-    "@lifi/perps-types": "^12.3.0"
+    "@lifi/perps-types": "^13.0.0"
   },
   "peerDependencies": {
-    "@lifi/perps-sdk": "^13.0.0"
+    "@lifi/perps-sdk": "^14.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/LighterProvider.ts

@@ -1,4 +1,5 @@
 import {
+  ACTIVE_ORDER_STATUSES,
   type DepositFlow,
   explorerTxUrlFromBase,
   getAssetRegistry,
@@ -20,7 +21,6 @@ import {
   type ProviderGetPortfolioHistoryParams,
   type ProviderGetPositionsParams,
   type ProviderGetQuoteParams,
-  type ProviderGetRunningTwapsParams,
   type ProviderGetWithdrawableBalancesParams,
   type ProviderWithdrawableBalance,
   paginateActivity,
@@ -55,7 +55,6 @@ import type {
   Quote,
   SignedActionStep,
   SigningMethod,
-  TwapOrder,
 } from '@lifi/perps-types'
 import {
   ActionType,
@@ -97,7 +96,6 @@ import type {
   LtAccountPnL,
   LtDepositHistoryItem,
   LtDepositHistoryResponse,
-  LtDetailedAccountPosition,
   LtLiquidation,
   LtLiquidationsResponse,
   LtOrder,
@@ -128,7 +126,6 @@ import {
 } from './utils/apiClient.js'
 import { isAssetMarginEnabled } from './utils/assetCollateral.js'
 import {
-  classifyAndMapOrders,
   estimateLiquidationPrice,
   fetchDetailedAccount,
   formatOrderPrice,
@@ -138,7 +135,7 @@ import {
   lighterWithdrawableBalances,
   mapFill,
   mapOpenPositions,
-  mapOrderDetail,
+  mapOrder,
   mapPortfolioHistory,
   positionMarginConstraints,
   toBigOrNull,
@@ -146,7 +143,6 @@ import {
   toIsoFromSeconds,
   toRequiredBig,
 } from './utils/index.js'
-import { mapRunningTwap } from './utils/mapTwap.js'
 import {
   fetchRegisteredApiKey,
   normalizeLighterPublicKey,
@@ -165,11 +161,6 @@ const projectFeeTier = (
   taker: tickToFeeString(limits.current_taker_fee_tick),
 })
 
-const orderCountFor = (p: LtDetailedAccountPosition): number =>
-  (p.open_order_count ?? 0) +
-  (p.pending_order_count ?? 0) +
-  (p.position_tied_order_count ?? 0)
-
 /**
  * Lighter `sendTx` returns a bare lowercase-hex tx hash (40 bytes → 80 hex
  * chars). `Order.order_id` is a different identifier the matching engine
@@ -647,11 +638,6 @@ export const createLighterProvider = (
     return wireList(response.orders)
   }
 
-  const deriveOrderBearingMarketIds = (account: LtAccount): number[] =>
-    account.positions
-      .filter((p) => orderCountFor(p) > 0)
-      .map((p) => p.market_id)
-
   const fetchAllHistory = async (
     client: LighterApiClient,
     token: string,
@@ -897,23 +883,26 @@ export const createLighterProvider = (
                 ),
               units: availableMargin.toString(),
               valueUsd: availableMargin.toString(),
+              price: '1',
             },
           ]
         : []
       // Spot token holdings — non-collateral. The instance's settlement asset
       // is valued 1:1; other tokens have no price source at this boundary, so
-      // their USD value is unknown.
+      // their price and USD value are unknown.
       const balances: Balance[] = account.assets
         .filter((asset) => toRequiredBig(asset.balance, 'balance').gt(0))
         .map((a) => {
           const assetId = String(a.asset_id)
+          const settlement = a.asset_id === collateral.assetIndex
           return {
             categoryId: spotCategoryId,
             asset:
               assetRegistry.get(assetId) ??
               lighterAsset(assetId, a.symbol, providerKey),
             units: a.balance,
-            valueUsd: a.asset_id === collateral.assetIndex ? a.balance : '0',
+            valueUsd: settlement ? a.balance : '0',
+            ...(settlement ? { price: '1' } : {}),
           }
         })
 
@@ -1063,24 +1052,22 @@ export const createLighterProvider = (
       }
     },
 
-    /**
-     * Lighter's `accountActiveOrders` endpoint takes no limit/cursor and
-     * returns every active order for the account, so the response is always
-     * the complete set: `params.limit` is not honoured and `pagination` is
-     * reported as `{ limit: <count returned>, hasMore: false }` with no cursor.
-     */
     async getOrders(
       params: ProviderGetOrdersParams,
       opts?: SDKRequestOptions
     ): Promise<OrdersResponse> {
+      const statuses = new Set(params.statuses ?? ACTIVE_ORDER_STATUSES)
+      const empty: OrdersResponse = {
+        provider: providerKey,
+        orders: [],
+        pagination: { limit: params.limit ?? 0, hasMore: false },
+      }
+      if (statuses.size === 0) {
+        return empty
+      }
       const token = await resolveAuthToken(opts, params.address)
       if (token === undefined) {
-        return {
-          provider: providerKey,
-          openOrders: [],
-          triggerOrders: [],
-          pagination: { limit: params.limit ?? 0, hasMore: false },
-        }
+        return empty
       }
 
       const client = apiClient(opts)
@@ -1089,69 +1076,73 @@ export const createLighterProvider = (
         fetchDetailedAccount(client, params.address),
         registry.sync(),
       ])
-
       const marketId =
         params.marketId === undefined
           ? LIGHTER_ALL_MARKETS_WILDCARD
           : Number(registry.require(params.marketId).id)
-
-      const response = await retryOnRevoked(opts, params.address, token, (t) =>
-        fetchActiveOrders(client, t, account.index, marketId)
-      )
-
-      const { openOrders, triggerOrders } = classifyAndMapOrders(
-        response.orders,
-        (marketIndex) => registry.require(String(marketIndex))
-      )
-
-      const total = openOrders.length + triggerOrders.length
-      return {
-        provider: providerKey,
-        openOrders,
-        triggerOrders,
-        pagination: { limit: total, hasMore: false },
-      }
-    },
-
-    async getRunningTwaps(
-      params: ProviderGetRunningTwapsParams,
-      opts?: SDKRequestOptions
-    ): Promise<TwapOrder[]> {
-      const token = await resolveAuthToken(opts, params.address)
-      if (token === undefined) {
-        return []
+      let active = false
+      let terminal = false
+      for (const status of statuses) {
+        if (isActiveOrderStatus(status)) {
+          active = true
+        } else {
+          terminal = true
+        }
       }
-
-      const client = apiClient(opts)
-      const registry = getMarketRegistry(requireClient(), providerKey)
-      const [account] = await Promise.all([
-        fetchDetailedAccount(client, params.address),
-        registry.sync(),
-      ])
-      const marketIds =
-        params.marketId === undefined
-          ? deriveOrderBearingMarketIds(account)
-          : [Number(registry.require(params.marketId).id)]
-      const responses = await retryOnRevoked(opts, params.address, token, (t) =>
-        Promise.all(
-          marketIds.map((id) => fetchActiveOrders(client, t, account.index, id))
-        )
+      const [activeResponse, inactiveResponse] = await retryOnRevoked(
+        opts,
+        params.address,
+        token,
+        (t) =>
+          Promise.all([
+            active && params.cursor === undefined
+              ? fetchActiveOrders(client, t, account.index, marketId)
+              : undefined,
+            terminal
+              ? client.getAuthed<LtOrdersResponse>(
+                  '/api/v1/accountInactiveOrders',
+                  t,
+                  {
+                    account_index: account.index,
+                    market_id: marketId,
+                    limit: params.limit ?? LIGHTER_HISTORY_PAGE_SIZE,
+                    ...(params.cursor === undefined
+                      ? {}
+                      : { cursor: params.cursor }),
+                  }
+                )
+              : undefined,
+          ])
       )
-
-      const twaps: TwapOrder[] = []
-      for (const response of responses) {
-        for (const order of response.orders) {
-          if (order.type === 'twap') {
-            twaps.push(
-              mapRunningTwap(
-                order,
-                registry.require(String(order.market_index))
-              )
-            )
+      const orders: Order[] = []
+      for (const response of [activeResponse, inactiveResponse]) {
+        for (const raw of wireList(response?.orders)) {
+          // `get`, not `require`: a market id the backend list no longer
+          // carries drops only its own row instead of rejecting the whole
+          // page. The registry warns once per unresolved id. A delisted
+          // market still resolves, so its rows stay.
+          const market = registry.get(String(raw.market_index))
+          if (market === undefined) {
+            continue
+          }
+          const order = mapOrder(raw, market)
+          if (statuses.has(order.status)) {
+            orders.push(order)
           }
         }
       }
-      return twaps
+      const cursor = inactiveResponse?.next_cursor || undefined
+      return {
+        provider: providerKey,
+        orders,
+        pagination: {
+          limit: terminal
+            ? (params.limit ?? LIGHTER_HISTORY_PAGE_SIZE)
+            : orders.length,
+          hasMore: cursor !== undefined,
+          ...(cursor === undefined ? {} : { cursor }),
+        },
+      }
     },
 
     /**
@@ -1189,7 +1180,7 @@ export const createLighterProvider = (
           `Lighter order ${params.id} not found for ${params.address}`
         )
       const detail = (order: LtOrder): Order =>
-        mapOrderDetail(order, registry.require(String(order.market_index)))
+        mapOrder(order, registry.require(String(order.market_index)))
 
       // A tx-hash route would require mapping the caller's executeAction tx
       // hash → wasm nonce → matching order, which the LI.FI backend did via
@@ -1433,9 +1424,6 @@ export const createLighterProvider = (
           : Promise.resolve(),
       ])
 
-      const assetSymbol = (assetId: number): string =>
-        assetRegistry.get(String(assetId))?.displaySymbol ?? String(assetId)
-
       const items: ActivityItem[] = [
         ...history.deposits.deposits.map(
           (d): ActivityItem => ({
@@ -1443,7 +1431,7 @@ export const createLighterProvider = (
             provider: providerKey,
             timestamp: toIsoFromMs(d.timestamp),
             type: ActivityType.DEPOSIT,
-            asset: assetSymbol(d.asset_id),
+            asset: assetRegistry.require(String(d.asset_id)),
             amount: d.amount,
             explorerLink: d.l1_tx_hash
               ? `https://scan.li.fi/tx/${d.l1_tx_hash}`
@@ -1458,7 +1446,7 @@ export const createLighterProvider = (
             provider: providerKey,
             timestamp: toIsoFromMs(w.timestamp),
             type: ActivityType.WITHDRAWAL,
-            asset: assetSymbol(w.asset_id),
+            asset: assetRegistry.require(String(w.asset_id)),
             amount: w.amount,
             explorerLink: w.l1_tx_hash
               ? `https://scan.li.fi/tx/${w.l1_tx_hash}`
@@ -1555,7 +1543,7 @@ export const createLighterProvider = (
               type: ActivityType.TRANSFER,
               direction,
               counterpartyAccountIndex,
-              asset: assetSymbol(t.asset_id),
+              asset: assetRegistry.require(String(t.asset_id)),
               amount: t.amount,
               // The venue charges the transfer fee in the deployment's
               // settlement asset, not in the asset the row moves, so a spot

package/src/accountConfig.ts

@@ -16,21 +16,6 @@ function assertNever(value: never): never {
   )
 }
 
-const LIGHTER_ACCOUNT_TYPE_STANDARD = 0
-const LIGHTER_ACCOUNT_TYPE_PREMIUM = 1
-
-/**
- * Tier decode for the unauthenticated read, where `/accountLimits` — and with
- * it the tier string — is out of reach. Neither official Lighter client
- * documents an integer for any tier, so `0` (the `account_type` every sampled
- * public account reports) reads as the default tier `standard`, and `1` as
- * `premium`. No integer is known for `plus`: that account projects `null` here.
- */
-const ACCOUNT_TYPE_INT_TO_WIRE: Readonly<Record<number, string>> = {
-  [LIGHTER_ACCOUNT_TYPE_STANDARD]: 'standard',
-  [LIGHTER_ACCOUNT_TYPE_PREMIUM]: 'premium',
-}
-
 // Wire strings match the backend descriptor's ParamOption values. An unmapped
 // int projects to null.
 const ACCOUNT_MODE_INT_TO_WIRE: Readonly<Record<number, string>> = {
@@ -43,8 +28,10 @@ const ACCOUNT_MODE_INT_TO_WIRE: Readonly<Record<number, string>> = {
  * `userTierName` decides it, but only when the descriptor enumerates the
  * string: Lighter owns that vocabulary, so an unrecognised value projects
  * `null` instead of a mis-reported tier. A descriptor whose parameter carries
- * no `values` array enumerates nothing, so it also projects `null`. With no
- * tier string in hand the integer map decides.
+ * no `values` array enumerates nothing, so it also projects `null`. The
+ * unauthenticated read reaches no `/accountLimits` and so carries no tier
+ * string, which projects `null` as well: `config.accountType` is Lighter's
+ * `SubAccountType`, not a tier, so nothing else in the config decides it.
  */
 function resolveAccountTier(
   descriptor: ProviderAction,
@@ -52,7 +39,7 @@ function resolveAccountTier(
 ): string | null {
   const { userTierName } = config
   if (userTierName === undefined) {
-    return ACCOUNT_TYPE_INT_TO_WIRE[config.accountType] ?? null
+    return null
   }
   const enumerated = descriptor.params?.[0]?.values ?? []
   return enumerated.some((option) => option.value === userTierName)

package/src/signers/LighterSigner.ts

@@ -109,6 +109,7 @@ const NIL_INTEGRATOR_MAKER_FEE = 0
 const SELF_TRADE_BEHAVIOR_EXPIRE_MAKER = 0
 const SELF_TRADE_EQUALITY_ACCOUNT_INDEX = 0
 const SKIP_NONCE_DISABLED = 0
+const NIL_ORDER_VERSION = 0
 // CancelAll across every market (lighter-go `NilMarketIndex`); a real index
 // scopes the cancel to a single market.
 const NIL_MARKET_INDEX = 255
@@ -552,6 +553,7 @@ export class LighterSigner {
           SELF_TRADE_EQUALITY_ACCOUNT_INDEX,
           SKIP_NONCE_DISABLED,
           nonce,
+          NIL_ORDER_VERSION,
           ctx.apiKeyIndex,
           ctx.accountIndex
         )

package/src/types/submit.ts

@@ -1,9 +1,14 @@
 // Lighter submit/execute-path wire shapes (sendTx, fastwithdraw, changeAccountTier).
 
 /**
- * Request body for Lighter's `/api/v1/sendTx` endpoint. `tx_type` and
- * `tx_info` are the signed WASM transaction envelope; `price_protection` is an
- * optional venue-side execution guard.
+ * Request body for Lighter's `/api/v1/sendTx` endpoint (spec schema
+ * `ReqSendTx`). `tx_type` and `tx_info` are the signed WASM transaction
+ * envelope. `price_protection` is a venue-side execution guard the spec
+ * defaults to `true`, so an absent member leaves the guard on.
+ *
+ * The generated client carries the same members as `SendTxRequest` in
+ * `zklighter-perps/apis/TransactionApi` — the call signature of
+ * `TransactionApi.sendTx`, not a `models/` wire model.
  *
  * @public
  */
@@ -28,9 +33,14 @@ export interface LtSendTxResponse {
 }
 
 /**
- * Batch request body for Lighter's transaction submission endpoint.
- * `tx_types` is a JSON-encoded number array and `tx_infos` a JSON-encoded
- * string array; corresponding entries are submitted in array order.
+ * Batch request body for Lighter's `/api/v1/sendTxBatch` endpoint (spec schema
+ * `ReqSendTxBatch`). `tx_types` is a JSON-encoded number array and `tx_infos` a
+ * JSON-encoded string array; corresponding entries are submitted in array
+ * order.
+ *
+ * The generated client carries the same members as `SendTxBatchRequest` in
+ * `zklighter-perps/apis/TransactionApi` — the call signature of
+ * `TransactionApi.sendTxBatch`, not a `models/` wire model.
  *
  * @public
  */

package/src/utils/activityCursor.ts

@@ -1,18 +1,13 @@
 import { PerpsError } from '@lifi/perps-sdk'
-import { type ActivityItem, PerpsErrorCode } from '@lifi/perps-types'
+import {
+  type ActivityItem,
+  ActivityType,
+  PerpsErrorCode,
+} from '@lifi/perps-types'
 
 /**
- * Per-endpoint cursor envelope for Lighter activity pagination.
- *
- * Each key holds the upstream `cursor` / `next_cursor` returned by that
- * endpoint on the previous call. When a key is **present** with a non-empty
- * string the corresponding endpoint will be re-fetched at that cursor on the
- * next call; when a key is **absent** the endpoint is treated as exhausted
- * (or never paged because the type filter excluded it) and skipped.
- *
- * The envelope is round-tripped through `cursor` as base64url JSON so callers
- * don't need to know the per-endpoint shape. The encoding mirrors the LI.FI
- * backend's wire format so cursors created by the backend remain usable.
+ * Endpoint-keyed activity cursor; absent endpoints are exhausted or excluded.
+ * Nonempty overflow requires a version-2 base64url JSON envelope.
  * @public
  */
 export interface LighterActivityCursor {
@@ -66,7 +61,7 @@ export const encodeActivityCursor = (
   if (Object.keys(compact).length === 0) {
     return undefined
   }
-  return toBase64Url(JSON.stringify(compact))
+  return toBase64Url(JSON.stringify({ version: 2, ...compact }))
 }
 
 /**
@@ -120,20 +115,57 @@ export const decodeActivityCursor = (
         'Invalid Lighter activity cursor: overflow must be an array'
       )
     }
-    env.overflow = overflow as ActivityItem[]
+    if (overflow.length > 0 && cursorRecord.version !== 2) {
+      throw new PerpsError(
+        PerpsErrorCode.ValidationError,
+        'Invalid Lighter activity cursor: legacy overflow format; restart pagination'
+      )
+    }
+    env.overflow = overflow.map(toOverflowItem)
   }
   return env
 }
 
+const ACTIVITY_TYPES: readonly string[] = Object.values(ActivityType)
+
+/**
+ * A cursor travels through consumer storage, so an overflow row may arrive
+ * corrupted or from an incompatible build. Reject it here rather than let a
+ * malformed row reach a consumer as a typed activity.
+ */
+const toOverflowItem = (row: unknown, index: number): ActivityItem => {
+  const invalid = (detail: string): PerpsError =>
+    new PerpsError(
+      PerpsErrorCode.ValidationError,
+      `Invalid Lighter activity cursor: overflow[${index}] ${detail}`
+    )
+  if (row === null || typeof row !== 'object' || Array.isArray(row)) {
+    throw invalid('must be an object')
+  }
+  const item = row as Record<string, unknown>
+  for (const field of ['id', 'provider', 'timestamp'] as const) {
+    if (typeof item[field] !== 'string') {
+      throw invalid(`${field} must be a string`)
+    }
+  }
+  if (typeof item.type !== 'string' || !ACTIVITY_TYPES.includes(item.type)) {
+    throw invalid('carries an unknown activity type')
+  }
+  return row as ActivityItem
+}
+
 const toBase64Url = (s: string): string => {
-  const utf8 = unescape(encodeURIComponent(s))
-  return btoa(utf8).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
+  let binary = ''
+  for (const byte of new TextEncoder().encode(s)) {
+    binary += String.fromCharCode(byte)
+  }
+  return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
 }
 
 const fromBase64Url = (s: string): string => {
   const padded = s.replace(/-/g, '+').replace(/_/g, '/') + padFor(s)
-  const decoded = atob(padded)
-  return decodeURIComponent(escape(decoded))
+  const bytes = Uint8Array.from(atob(padded), (char) => char.charCodeAt(0))
+  return new TextDecoder().decode(bytes)
 }
 
 const padFor = (s: string): string => {

package/src/utils/index.ts

@@ -16,15 +16,7 @@ export { estimateLiquidationPrice } from './liquidation.js'
 export { mapFill } from './mapFill.js'
 export { mapMarketContext } from './mapMarketContext.js'
 export { mapOpenPositions } from './mapOpenPositions.js'
-export {
-  classifyAndMapOrders,
-  isTriggerOrder,
-  isTriggerType,
-  mapOrder,
-  mapOrderDetail,
-  mapStatusReason,
-  mapTriggerOrder,
-} from './mapOrder.js'
+export { mapOrder, mapOrderUpdates } from './mapOrder.js'
 export { mapPortfolioHistory } from './mapPortfolioHistory.js'
 export { leverageFromImf, mapPosition } from './mapPosition.js'
 export { mapMarketOrderLimits } from './marketLimits.js'

package/src/utils/mapFill.ts

@@ -4,12 +4,7 @@ import {
   explorerTxUrl,
 } from '@lifi/perps-sdk'
 import type { Fill, MarketDisplay } from '@lifi/perps-types'
-import {
-  FillStatus,
-  LiquidityRole,
-  OrderSide,
-  OrderType,
-} from '@lifi/perps-types'
+import { LiquidityRole, OrderSide, OrderType } from '@lifi/perps-types'
 import Big from 'big.js'
 import {
   LIGHTER_FEE_TICK_SCALE,
@@ -131,7 +126,6 @@ export const mapFill = (
     type: OrderType.LIMIT,
     size: trade.size,
     price: trade.price,
-    status: FillStatus.FILLED,
     liquidity: isMaker ? LiquidityRole.MAKER : LiquidityRole.TAKER,
     // Lighter charges the fill fee in the market's quote asset.
     fee: