@onekeyfe/hwk-keystone-adapter 1.2.5-alpha.3 → 1.2.6-alpha.0

package/dist/index.mjs

@@ -5,7 +5,7 @@ import bs58check from "bs58check";
 import * as bitcoin from "bitcoinjs-lib";
 import HDKey from "hdkey";
 import { parse as uuidParse, stringify as uuidStringify } from "uuid";
-import { parseBip32MasterFingerprint } from "@onekeyfe/hwk-adapter-core";
+import { parseWalletMasterFingerprint } from "@onekeyfe/hwk-adapter-core";
 
 // src/urEngine/TronSignRequest.ts
 import {
@@ -155,10 +155,9 @@ function requireSignatureBytes(hex, expectedBytes, chain) {
   }
   return hex;
 }
-var MISSING_MASTER_FINGERPRINT = "00000000";
 function requireBip32MasterFingerprint(value) {
-  const fingerprint = parseBip32MasterFingerprint(value);
-  if (!fingerprint || fingerprint === MISSING_MASTER_FINGERPRINT) {
+  const fingerprint = parseWalletMasterFingerprint(value);
+  if (!fingerprint) {
     throw new Error("Keystone master fingerprint must be exactly 4 bytes (8 hex characters)");
   }
   return fingerprint;
@@ -402,6 +401,7 @@ import {
   DEVICE,
   DeviceJobQueue,
   HardwareErrorCode,
+  MISSING_BIP32_MASTER_FINGERPRINT,
   OperationRegistry,
   SDK,
   TypedEventEmitter,
@@ -424,7 +424,8 @@ import {
   isHwkRecoveryHint,
   isUserRefusal,
   operationMayHaveCompletedParams,
-  parseBip32MasterFingerprint as parseBip32MasterFingerprint3,
+  parseBip32MasterFingerprint,
+  parseWalletMasterFingerprint as parseWalletMasterFingerprint3,
   rehydrateConnectorError,
   resolveHardwareOperationTarget as resolveGenericHardwareOperationTarget,
   runAllNetworkGetAddress,
@@ -525,14 +526,14 @@ function placeholderDeviceInfo() {
 }
 
 // src/utils/queueKey.ts
-import { isHardwareOperationId, parseBip32MasterFingerprint as parseBip32MasterFingerprint2 } from "@onekeyfe/hwk-adapter-core";
+import { isHardwareOperationId, parseWalletMasterFingerprint as parseWalletMasterFingerprint2 } from "@onekeyfe/hwk-adapter-core";
 var KEYSTONE_COLD_START_JOB_LABEL = "keystone-cold-start";
 function keystoneQueueKey(connectId, deviceId) {
   return isHardwareOperationId(connectId) ? connectId : deviceId || connectId || KEYSTONE_COLD_START_JOB_LABEL;
 }
 function keystoneMfpFromIdentifier(identifier) {
   const value = identifier.startsWith(KEYSTONE_WALLET_CONNECT_ID_PREFIX) ? identifier.slice(KEYSTONE_WALLET_CONNECT_ID_PREFIX.length) : identifier;
-  return parseBip32MasterFingerprint2(value);
+  return parseWalletMasterFingerprint2(value);
 }
 function keystoneCancelQueueKeys(identifiers) {
   const keys = /* @__PURE__ */ new Set();
@@ -1837,11 +1838,12 @@ var KeystoneAdapter = class _KeystoneAdapter {
       sessionId = session.sessionId;
       _KeystoneAdapter._throwIfAborted(signal);
       const raw = session.deviceInfo.raw;
-      const mfpValue = parseBip32MasterFingerprint3(raw?.masterFingerprint);
+      const mfpValue = parseWalletMasterFingerprint3(raw?.masterFingerprint);
       if (!mfpValue) {
+        const empty = parseBip32MasterFingerprint(raw?.masterFingerprint) === MISSING_BIP32_MASTER_FINGERPRINT;
         throw createHwkError({
-          code: HardwareErrorCode.DeviceMismatch,
-          message: "Keystone USB did not report a master fingerprint"
+          code: empty ? HardwareErrorCode.DeviceNotInitialized : HardwareErrorCode.DeviceMismatch,
+          message: empty ? "Keystone has no wallet yet; it reported an empty master fingerprint" : "Keystone USB did not report a master fingerprint"
         });
       }
       const masterFingerprint = mfpValue.toLowerCase();
@@ -2308,11 +2310,12 @@ var KeystoneAdapter = class _KeystoneAdapter {
       throw signal.reason instanceof Error ? signal.reason : new Error("Operation aborted");
     }
   }
+  /** A response without the request's id is as unrelated as one with another id. */
   static _assertRequestIdMatches(expected, actual) {
-    if (actual && actual.toLowerCase() !== expected.toLowerCase()) {
+    if (!actual || actual.toLowerCase() !== expected.toLowerCase()) {
       throw createHwkError({
         code: HardwareErrorCode.DeviceMismatch,
-        message: "Keystone response requestId does not match the pending request \u2014 discarding a stale or unrelated scan"
+        message: actual ? "Keystone response requestId does not match the pending request \u2014 discarding a stale or unrelated scan" : "Keystone response carries no requestId \u2014 discarding a stale or unrelated scan"
       });
     }
   }