@lifi/perps-sdk-provider-lighter 13.0.0 → 13.0.2

package/dist/types/signers/signActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signActions.d.ts","sourceRoot":"","sources":["../../../src/signers/signActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAA8B,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAOnC,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxE,OAAO,KAAK,EAAiB,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD;;;;;;;;GAQG;AACH,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,aAAa,CAAA;IACrB,QAAQ,EAAE,eAAe,CAAA;IACzB;;qCAEiC;IACjC,SAAS,EAAE,gBAAgB,CAAA;IAC3B;;;;;OAKG;IACH,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CACvD;AAiBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,kBAAkB,EAAE,EAC3B,GAAG,EAAE,kBAAkB,GAAG,SAAS,GAClC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAkBrC;AAkUD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,eAAe,EAAE,EACxB,GAAG,EAAE,kBAAkB,GAAG,SAAS,GAClC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CA6ElC;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,sBAAsB,EAC5B,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,kBAAkB,GACvB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsB7B"}
+{"version":3,"file":"signActions.d.ts","sourceRoot":"","sources":["../../../src/signers/signActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAA8B,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAOnC,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAMxE,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,oBAAoB,CAAA;AAE3B;;;;;;;;GAQG;AACH,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,aAAa,CAAA;IACrB,QAAQ,EAAE,eAAe,CAAA;IACzB;;qCAEiC;IACjC,SAAS,EAAE,gBAAgB,CAAA;IAC3B;;;OAGG;IACH,eAAe,EAAE,sBAAsB,CAAA;IACvC;;;;;OAKG;IACH,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CACvD;AAyBD;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,CACnB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CAAA;CACjB;AAED;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,QAAO,sBAqD/C,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,kBAAkB,EAAE,EAC3B,GAAG,EAAE,kBAAkB,GAAG,SAAS,GAClC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAkCrC;AAgUD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,eAAe,EAAE,EACxB,GAAG,EAAE,kBAAkB,GAAG,SAAS,GAClC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CA6ElC;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,sBAAsB,EAC5B,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,kBAAkB,GACvB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsB7B"}

package/dist/types/signers/wasmLoader.d.ts

@@ -14,9 +14,6 @@ export interface LighterWasmExports {
     CreateClient: (url: string, privateKey: string, chainId: number, apiKeyIndex: number, accountIndex: number) => {
         error?: string;
     };
-    CheckClient: (apiKeyIndex: number, accountIndex: number) => {
-        error?: string;
-    };
     /**
      * Returns `{authToken}` on success — note the field name is `authToken`,
      * NOT `token`. Reading the wrong field silently fails (Go sets nothing

package/dist/types/signers/wasmLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasmLoader.d.ts","sourceRoot":"","sources":["../../../src/signers/wasmLoader.ts"],"names":[],"mappings":"AASA;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM;QACpB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;IACD,YAAY,EAAE,CACZ,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACvB,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC9E;;;;;OAKG;IACH,eAAe,EAAE,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC3C;;;;;;;OAOG;IACH,gBAAgB,EAAE,CAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB,UAAU,GAAG;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C;;;;;;;;;;;;;;;OAeG;IACH,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACnD,2EAA2E;IAC3E,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACnD;;;OAGG;IACH,mBAAmB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACvD;;;;;;;;OAQG;IACH,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,GAAG;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7E,iFAAiF;IACjF,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IAChD;;;OAGG;IACH,kBAAkB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACtD;;;;;OAKG;IACH,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACnD;;;OAGG;IACH,gBAAgB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACpD;;;;;;;OAOG;IACH,qBAAqB,EAAE,CACrB,GAAG,IAAI,EAAE,OAAO,EAAE,KACf,UAAU,GAAG;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C;;;;OAIG;IACH,uBAAuB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IAC3D;;;;OAIG;IACH,4BAA4B,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;CACjE;AAED,gBAAgB;AAChB,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAwHD;;;;;;;;;GASG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAYnE;AAmDD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
+{"version":3,"file":"wasmLoader.d.ts","sourceRoot":"","sources":["../../../src/signers/wasmLoader.ts"],"names":[],"mappings":"AASA;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM;QACpB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;IACD,YAAY,EAAE,CACZ,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACvB;;;;;OAKG;IACH,eAAe,EAAE,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC3C;;;;;;;OAOG;IACH,gBAAgB,EAAE,CAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB,UAAU,GAAG;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C;;;;;;;;;;;;;;;OAeG;IACH,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACnD,2EAA2E;IAC3E,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACnD;;;OAGG;IACH,mBAAmB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACvD;;;;;;;;OAQG;IACH,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,GAAG;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7E,iFAAiF;IACjF,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IAChD;;;OAGG;IACH,kBAAkB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACtD;;;;;OAKG;IACH,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACnD;;;OAGG;IACH,gBAAgB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IACpD;;;;;;;OAOG;IACH,qBAAqB,EAAE,CACrB,GAAG,IAAI,EAAE,OAAO,EAAE,KACf,UAAU,GAAG;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C;;;;OAIG;IACH,uBAAuB,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;IAC3D;;;;OAIG;IACH,4BAA4B,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,UAAU,CAAA;CACjE;AAED,gBAAgB;AAChB,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAuHD;;;;;;;;;GASG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAYnE;AAyDD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}

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

@@ -0,0 +1,21 @@
+import type { LighterApiClient } from './apiClient.js';
+/**
+ * One entry of Lighter's `/api/v1/apikeys` response: the public key the venue
+ * holds in an API-key slot.
+ *
+ * @internal
+ */
+export interface LighterRegisteredApiKey {
+    api_key_index: number;
+    public_key: string;
+}
+/** Compare Lighter public keys irrespective of `0x` prefix / casing. */
+export declare const normalizeLighterPublicKey: (key: string) => string;
+/**
+ * Read the public key Lighter holds in one API-key slot. Returns `undefined`
+ * when the response carries no entry for `apiKeyIndex`.
+ *
+ * @internal
+ */
+export declare const fetchRegisteredApiKey: (client: LighterApiClient, accountIndex: number, apiKeyIndex: number) => Promise<LighterRegisteredApiKey | undefined>;
+//# sourceMappingURL=registeredApiKey.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"registeredApiKey.d.ts","sourceRoot":"","sources":["../../../src/utils/registeredApiKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,wEAAwE;AACxE,eAAO,MAAM,yBAAyB,GAAI,KAAK,MAAM,KAAG,MACjB,CAAA;AAEvC;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,gBAAgB,EACxB,cAAc,MAAM,EACpB,aAAa,MAAM,KAClB,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAM7C,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/perps-sdk-provider-lighter",
-  "version": "13.0.0",
+  "version": "13.0.2",
   "description": "Lighter provider plugin for @lifi/perps-sdk",
   "homepage": "https://github.com/lifinance/perps-sdk",
   "bugs": {

package/src/LighterProvider.ts

@@ -76,7 +76,10 @@ import { createAuthToken } from './signers/createAuthToken.js'
 import { LighterKeyStore } from './signers/LighterKeyStore.js'
 import { LighterReadOnlyTokenManager } from './signers/LighterReadOnlyTokenManager.js'
 import { LighterSigner } from './signers/LighterSigner.js'
-import { lighterSignActions } from './signers/signActions.js'
+import {
+  createLighterApiKeyFreshness,
+  lighterSignActions,
+} from './signers/signActions.js'
 import type {
   LtAccountLimits,
   LtDepositHistoryResponse,
@@ -119,6 +122,10 @@ import {
   toRequiredBig,
 } from './utils/index.js'
 import { mapRunningTwap } from './utils/mapTwap.js'
+import {
+  fetchRegisteredApiKey,
+  normalizeLighterPublicKey,
+} from './utils/registeredApiKey.js'
 
 const ZERO_FEE_TIER = { maker: '0', taker: '0' }
 
@@ -170,10 +177,6 @@ interface ReadOnlyCreationBackoff {
   attempt: number
 }
 
-/** Compare Lighter public keys irrespective of `0x` prefix / casing. */
-const normalizeLighterPublicKey = (key: string): string =>
-  key.replace(/^0x/i, '').toLowerCase()
-
 /**
  * Consumer-level overrides for a ready-made Lighter provider plugin. Every
  * deployment fact — provider key, endpoints, signing chain id, collateral
@@ -285,6 +288,7 @@ export const createLighterProvider = (
     collateralAssetIndex: collateral.assetIndex,
   })
   const keyStore = new LighterKeyStore(storage, providerKey)
+  const apiKeyFreshness = createLighterApiKeyFreshness()
   const readOnlyTokenManager = new LighterReadOnlyTokenManager({
     storage,
     providerKey,
@@ -518,18 +522,6 @@ export const createLighterProvider = (
     }
   }
 
-  const fetchRegisteredApiKey = async (
-    client: LighterApiClient,
-    accountIndex: number,
-    apiKeyIndex: number
-  ): Promise<{ api_key_index: number; public_key: string } | undefined> => {
-    const response = await client.get<{
-      code: number
-      api_keys: Array<{ api_key_index: number; public_key: string }>
-    }>('/api/v1/apikeys', { account_index: accountIndex })
-    return response.api_keys?.find((k) => k.api_key_index === apiKeyIndex)
-  }
-
   const fetchAccountLimits = (
     client: LighterApiClient,
     accountIndex: number,
@@ -1449,6 +1441,7 @@ export const createLighterProvider = (
           signer,
           keyStore,
           apiClient: apiClient(),
+          apiKeyFreshness,
           resolveAccountIndex: async (addr) => {
             const apiKey = await keyStore.get(addr)
             if (apiKey !== null) {

package/src/signers/signActions.ts

@@ -16,8 +16,17 @@ import {
   LIGHTER_MUTATION_SUCCESS_CODE,
 } from '../constants.js'
 import type { ApiParams, LighterApiClient } from '../utils/apiClient.js'
+import {
+  fetchRegisteredApiKey,
+  type LighterRegisteredApiKey,
+  normalizeLighterPublicKey,
+} from '../utils/registeredApiKey.js'
 import type { LighterApiKey, LighterKeyStore } from './LighterKeyStore.js'
-import type { LighterSigner } from './LighterSigner.js'
+import type {
+  LighterSignedBlob,
+  LighterSigner,
+  LighterSignerContext,
+} from './LighterSigner.js'
 
 /**
  * Per-batch dependencies the Lighter `signActions` implementation needs:
@@ -35,6 +44,11 @@ export interface LighterSignActionsDeps {
    * `changeAccountTier` / `referral/use` POSTs so their auth token never
    * transits the LI.FI backend. */
   apiClient: LighterApiClient
+  /**
+   * Pre-sign guard that the stored API key still occupies its venue slot.
+   * Created once per provider instance so its freshness window spans batches.
+   */
+  apiKeyFreshness: LighterApiKeyFreshness
   /**
    * Resolve the user's Lighter `accountIndex` for an L1 address. Required
    * by REGISTER_API_KEY so the ChangePubKey blob carries the right
@@ -59,6 +73,89 @@ const TOKEN_AUTH_MUTATION_KINDS = new Set(['changeAccountTier', 'referralUse'])
  */
 const TOKEN_AUTH_MUTATION_DEADLINE_SECONDS = 5 * 60
 
+/**
+ * Window in which one `/apikeys` read stands for the next. 30s keeps a burst
+ * of batches — several orders submitted back to back, a close-then-reduce
+ * sequence — at one read, and still surfaces a key rotated on another device
+ * on the user's next action instead of after a venue rejection.
+ */
+const API_KEY_FRESHNESS_WINDOW_MS = 30_000
+
+/**
+ * Pre-sign guard that the stored Lighter API key is still the key registered
+ * in its venue slot. Owns the freshness window, so one instance is created per
+ * provider instance and shared by every batch that instance signs.
+ *
+ * @internal
+ */
+export interface LighterApiKeyFreshness {
+  assertStillRegistered(
+    client: LighterApiClient,
+    address: Address,
+    apiKey: LighterApiKey
+  ): Promise<void>
+}
+
+/**
+ * Build the guard {@link LighterSignActionsDeps.apiKeyFreshness} needs.
+ *
+ * @internal
+ */
+export const createLighterApiKeyFreshness = (): LighterApiKeyFreshness => {
+  const checkedAtMs = new Map<string, number>()
+  return {
+    async assertStillRegistered(client, address, apiKey) {
+      const storedKey = normalizeLighterPublicKey(apiKey.apiKeyPublicKey)
+      // Keyed on the stored key, so a rotation retires the entry by itself.
+      const windowKey = `${apiKey.accountIndex}:${apiKey.apiKeyIndex}:${storedKey}`
+      const checkedAt = checkedAtMs.get(windowKey)
+      if (
+        checkedAt !== undefined &&
+        Date.now() - checkedAt < API_KEY_FRESHNESS_WINDOW_MS
+      ) {
+        return
+      }
+
+      let registered: LighterRegisteredApiKey | undefined
+      try {
+        registered = await fetchRegisteredApiKey(
+          client,
+          apiKey.accountIndex,
+          apiKey.apiKeyIndex
+        )
+      } catch (err) {
+        // A transport failure or a non-success body proves nothing about the
+        // slot, so the venue decides. A failed check never blocks a signature.
+        // The code names the failure without the response body, which lists
+        // the account's other key slots.
+        console.warn(
+          '[lighter] could not read the registered API key before signing; ' +
+            'signing anyway and letting the venue decide.',
+          err instanceof PerpsError ? err.code : String(err)
+        )
+        checkedAtMs.set(windowKey, Date.now())
+        return
+      }
+      // A slot carrying no entry leaves nothing to compare against.
+      if (
+        registered !== undefined &&
+        normalizeLighterPublicKey(registered.public_key) !== storedKey
+      ) {
+        throw new PerpsError(
+          PerpsErrorCode.SDKError,
+          `The Lighter API key stored for ${address} is no longer registered: ` +
+            `API-key slot ${apiKey.apiKeyIndex} now holds a different key. ` +
+            'Run prepareAccount / REGISTER_API_KEY to register a fresh key.'
+        )
+      }
+      // Every read the venue answered counts against the window, so a burst
+      // costs one read whatever the verdict. A mismatch throws above, so it
+      // never records and the next batch reads again.
+      checkedAtMs.set(windowKey, Date.now())
+    },
+  }
+}
+
 /**
  * Sign a `WASM_BLOB` batch (Lighter). Ensures the user's API keypair is
  * registered first — generating one and running the REGISTER_API_KEY
@@ -78,6 +175,22 @@ export async function signWasmBlobActions(
   steps: WasmBlobActionStep[],
   ctx: SignActionsContext | undefined
 ): Promise<WasmBlobSignedActionStep[]> {
+  // REGISTER_API_KEY replaces the slot's key, so for such a batch the stored
+  // key is expected to differ from the registered one.
+  const replacesApiKey = steps.some(
+    (step) => step.action === ActionType.REGISTER_API_KEY
+  )
+  if (!replacesApiKey) {
+    const storedKey = await deps.keyStore.get(address)
+    if (storedKey !== null) {
+      await deps.apiKeyFreshness.assertStillRegistered(
+        deps.apiClient,
+        address,
+        storedKey
+      )
+    }
+  }
+
   const signed: WasmBlobSignedActionStep[] = []
   for (const step of steps) {
     if (step.action === ActionType.REGISTER_API_KEY) {
@@ -202,34 +315,41 @@ async function signRegisterApiKey(
 }
 
 /**
- * APPROVE_INTEGRATOR flow:
- *   1. Load the user's stored API key (no keypair generation).
- *   2. Wasm-sign the `L2ApproveIntegrator` blob with that key, obtaining the
- *      EIP-191 L1 message the wallet must countersign.
- *   3. Have the user's L1 Ethereum wallet sign that message.
- *   4. Inject the L1 signature into the txInfo JSON as `L1Sig`.
+ * Shared L1-countersign flow for the Lighter WASM_BLOB actions that require
+ * the end-user's Ethereum wallet:
+ *   1. Guard that the caller supplied `ctx.userWallet`.
+ *   2. Load the user's stored API key (no keypair generation).
+ *   3. Wasm-sign the blob via `signMethod`, obtaining the EIP-191 L1 message
+ *      the wallet must countersign.
+ *   4. Have the user's L1 Ethereum wallet sign that message.
+ *   5. Inject the L1 signature into the txInfo JSON as `L1Sig`.
  *
- * Requires the end-user's wallet in `ctx.userWallet`: Lighter rejects the tx
- * without the user's `L1Sig` when the integrator account belongs to a
- * different L1 address with non-zero fee caps.
+ * `actionLabel` names the caller's action in the missing-wallet error
+ * message. `signMethod` is the caller's wasm-signing call; each caller keeps
+ * its own doc comment stating why its flow needs the L1 signature.
  */
-async function signApproveIntegrator(
+async function signL1CountersignedWasmAction(
   deps: LighterSignActionsDeps,
   address: Address,
   step: WasmBlobActionStep,
-  ctx: SignActionsContext | undefined
+  ctx: SignActionsContext | undefined,
+  actionLabel: 'APPROVE_INTEGRATOR' | 'TRANSFER',
+  signMethod: (
+    wasmSignParams: Record<string, unknown>,
+    context: LighterSignerContext
+  ) => Promise<LighterSignedBlob & { messageToSign: string }>
 ): Promise<WasmBlobSignedActionStep> {
   const walletSigner = ctx?.userWallet
   if (!walletSigner) {
     throw new PerpsError(
       PerpsErrorCode.SDKError,
-      'APPROVE_INTEGRATOR requires the end-user wallet — pass `userWallet` to ' +
+      `${actionLabel} requires the end-user wallet — pass \`userWallet\` to ` +
         'createPerpsClient or call setUserWallet(walletClient).'
     )
   }
 
   const apiKey = await requireApiKey(deps, address)
-  const signed = await deps.signer.signApproveIntegrator(step.wasmSignParams, {
+  const signed = await signMethod(step.wasmSignParams, {
     apiKeyPrivateKey: apiKey.apiKeyPrivateKey,
     apiKeyIndex: apiKey.apiKeyIndex,
     accountIndex: apiKey.accountIndex,
@@ -257,58 +377,49 @@ async function signApproveIntegrator(
 }
 
 /**
- * TRANSFER flow:
- *   1. Load the user's stored API key (no keypair generation).
- *   2. Wasm-sign the `L2Transfer` blob with that key, obtaining the EIP-191
- *      L1 message the wallet must countersign.
- *   3. Have the user's L1 Ethereum wallet sign that message.
- *   4. Inject the L1 signature into the txInfo JSON as `L1Sig`.
- *
- * Requires the end-user's wallet in `ctx.userWallet`: the destination account
- * and the amount are only bound to the account owner by the user's `L1Sig`,
- * so the stored API key alone must not authorize the move.
+ * APPROVE_INTEGRATOR flow. Requires the end-user's wallet in
+ * `ctx.userWallet`: Lighter rejects the tx without the user's `L1Sig` when
+ * the integrator account belongs to a different L1 address with non-zero fee
+ * caps.
  */
-async function signTransfer(
+async function signApproveIntegrator(
   deps: LighterSignActionsDeps,
   address: Address,
   step: WasmBlobActionStep,
   ctx: SignActionsContext | undefined
 ): Promise<WasmBlobSignedActionStep> {
-  const walletSigner = ctx?.userWallet
-  if (!walletSigner) {
-    throw new PerpsError(
-      PerpsErrorCode.SDKError,
-      'TRANSFER requires the end-user wallet — pass `userWallet` to ' +
-        'createPerpsClient or call setUserWallet(walletClient).'
-    )
-  }
-
-  const apiKey = await requireApiKey(deps, address)
-  const signed = await deps.signer.signTransfer(step.wasmSignParams, {
-    apiKeyPrivateKey: apiKey.apiKeyPrivateKey,
-    apiKeyIndex: apiKey.apiKeyIndex,
-    accountIndex: apiKey.accountIndex,
-  })
-
-  const l1Signature = await walletSigner.signMessage({
-    account: walletSigner.account,
-    message: signed.messageToSign,
-  })
-
-  const txInfoWithL1Sig = deps.signer.embedL1Signature(
-    signed.txInfo,
-    l1Signature
+  return await signL1CountersignedWasmAction(
+    deps,
+    address,
+    step,
+    ctx,
+    'APPROVE_INTEGRATOR',
+    (wasmSignParams, context) =>
+      deps.signer.signApproveIntegrator(wasmSignParams, context)
   )
+}
 
-  return {
-    action: step.action,
-    wasmSignParams: step.wasmSignParams,
-    signedTx: {
-      txType: signed.txType,
-      txInfo: txInfoWithL1Sig,
-      txHash: signed.txHash,
-    },
-  }
+/**
+ * TRANSFER flow. Requires the end-user's wallet in `ctx.userWallet`: the
+ * destination account and the amount are only bound to the account owner by
+ * the user's `L1Sig`, so the stored API key alone must not authorize the
+ * move.
+ */
+async function signTransfer(
+  deps: LighterSignActionsDeps,
+  address: Address,
+  step: WasmBlobActionStep,
+  ctx: SignActionsContext | undefined
+): Promise<WasmBlobSignedActionStep> {
+  return await signL1CountersignedWasmAction(
+    deps,
+    address,
+    step,
+    ctx,
+    'TRANSFER',
+    (wasmSignParams, context) =>
+      deps.signer.signTransfer(wasmSignParams, context)
+  )
 }
 
 /**

package/src/signers/wasmLoader.ts

@@ -27,7 +27,6 @@ export interface LighterWasmExports {
     apiKeyIndex: number,
     accountIndex: number
   ) => { error?: string }
-  CheckClient: (apiKeyIndex: number, accountIndex: number) => { error?: string }
   /**
    * Returns `{authToken}` on success — note the field name is `authToken`,
    * NOT `token`. Reading the wrong field silently fails (Go sets nothing
@@ -143,7 +142,6 @@ export interface SignResult {
 const WASM_FUNCTION_NAMES = [
   'GenerateAPIKey',
   'CreateClient',
-  'CheckClient',
   'CreateAuthToken',
   'SignChangePubKey',
   'SignCreateOrder',
@@ -304,9 +302,14 @@ async function loadWasmUncached(): Promise<LighterWasmExports> {
   // Wait microtasks to let Go's init() register JS-bound functions.
   await yieldToGoRuntime()
 
+  // Go's main.go only calls `js.Global().Set(name, ...)`; it never reads those
+  // names back, so dispatch survives the deletion while the captured handle
+  // keeps working. Left installed, they let any same-origin script sign with
+  // the API key held inside the instance. Never restore them for convenience.
+  const globals = globalThis as Record<string, unknown>
   const exports: Partial<LighterWasmExports> = {}
   for (const name of WASM_FUNCTION_NAMES) {
-    const fn = (globalThis as Record<string, unknown>)[name]
+    const fn = globals[name]
     if (typeof fn !== 'function') {
       throw new Error(
         `Lighter WASM did not export expected function: ${name}. ` +
@@ -314,6 +317,7 @@ async function loadWasmUncached(): Promise<LighterWasmExports> {
       )
     }
     ;(exports as Record<string, unknown>)[name] = fn
+    delete globals[name]
   }
 
   return exports as LighterWasmExports

package/src/utils/registeredApiKey.ts

@@ -0,0 +1,34 @@
+import type { LighterApiClient } from './apiClient.js'
+
+/**
+ * One entry of Lighter's `/api/v1/apikeys` response: the public key the venue
+ * holds in an API-key slot.
+ *
+ * @internal
+ */
+export interface LighterRegisteredApiKey {
+  api_key_index: number
+  public_key: string
+}
+
+/** Compare Lighter public keys irrespective of `0x` prefix / casing. */
+export const normalizeLighterPublicKey = (key: string): string =>
+  key.replace(/^0x/i, '').toLowerCase()
+
+/**
+ * Read the public key Lighter holds in one API-key slot. Returns `undefined`
+ * when the response carries no entry for `apiKeyIndex`.
+ *
+ * @internal
+ */
+export const fetchRegisteredApiKey = async (
+  client: LighterApiClient,
+  accountIndex: number,
+  apiKeyIndex: number
+): Promise<LighterRegisteredApiKey | undefined> => {
+  const response = await client.get<{
+    code: number
+    api_keys: LighterRegisteredApiKey[]
+  }>('/api/v1/apikeys', { account_index: accountIndex })
+  return response.api_keys?.find((k) => k.api_key_index === apiKeyIndex)
+}