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

package/dist/index.d.mts

@@ -377,6 +377,7 @@ declare class KeystoneAdapter implements IHardwareWallet {
     private _retainUsbOperation;
     private static _abortable;
     private static _throwIfAborted;
+    /** A response without the request's id is as unrelated as one with another id. */
     private static _assertRequestIdMatches;
     private _unsupported;
     private _errorToFailure;

package/dist/index.d.ts

@@ -377,6 +377,7 @@ declare class KeystoneAdapter implements IHardwareWallet {
     private _retainUsbOperation;
     private static _abortable;
     private static _throwIfAborted;
+    /** A response without the request's id is as unrelated as one with another id. */
     private static _assertRequestIdMatches;
     private _unsupported;
     private _errorToFailure;

package/dist/index.js

@@ -188,10 +188,9 @@ function requireSignatureBytes(hex, expectedBytes, chain) {
   }
   return hex;
 }
-var MISSING_MASTER_FINGERPRINT = "00000000";
 function requireBip32MasterFingerprint(value) {
-  const fingerprint = (0, import_hwk_adapter_core.parseBip32MasterFingerprint)(value);
-  if (!fingerprint || fingerprint === MISSING_MASTER_FINGERPRINT) {
+  const fingerprint = (0, import_hwk_adapter_core.parseWalletMasterFingerprint)(value);
+  if (!fingerprint) {
     throw new Error("Keystone master fingerprint must be exactly 4 bytes (8 hex characters)");
   }
   return fingerprint;
@@ -532,7 +531,7 @@ function keystoneQueueKey(connectId, deviceId) {
 }
 function keystoneMfpFromIdentifier(identifier) {
   const value = identifier.startsWith(KEYSTONE_WALLET_CONNECT_ID_PREFIX) ? identifier.slice(KEYSTONE_WALLET_CONNECT_ID_PREFIX.length) : identifier;
-  return (0, import_hwk_adapter_core2.parseBip32MasterFingerprint)(value);
+  return (0, import_hwk_adapter_core2.parseWalletMasterFingerprint)(value);
 }
 function keystoneCancelQueueKeys(identifiers) {
   const keys = /* @__PURE__ */ new Set();
@@ -1837,11 +1836,12 @@ var KeystoneAdapter = class _KeystoneAdapter {
       sessionId = session.sessionId;
       _KeystoneAdapter._throwIfAborted(signal);
       const raw = session.deviceInfo.raw;
-      const mfpValue = (0, import_hwk_adapter_core3.parseBip32MasterFingerprint)(raw?.masterFingerprint);
+      const mfpValue = (0, import_hwk_adapter_core3.parseWalletMasterFingerprint)(raw?.masterFingerprint);
       if (!mfpValue) {
+        const empty = (0, import_hwk_adapter_core3.parseBip32MasterFingerprint)(raw?.masterFingerprint) === import_hwk_adapter_core3.MISSING_BIP32_MASTER_FINGERPRINT;
         throw (0, import_hwk_adapter_core3.createHwkError)({
-          code: import_hwk_adapter_core3.HardwareErrorCode.DeviceMismatch,
-          message: "Keystone USB did not report a master fingerprint"
+          code: empty ? import_hwk_adapter_core3.HardwareErrorCode.DeviceNotInitialized : import_hwk_adapter_core3.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 +2308,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 (0, import_hwk_adapter_core3.createHwkError)({
         code: import_hwk_adapter_core3.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"
       });
     }
   }