@onekeyfe/hwk-keystone-adapter 1.2.3-alpha.2 → 1.2.3-alpha.4

package/dist/index.js

@@ -1401,7 +1401,9 @@ var KeystoneAdapter = class _KeystoneAdapter {
     if (!params) return (0, import_hwk_adapter_core3.failure)(import_hwk_adapter_core3.HardwareErrorCode.InvalidParams, "btcSignPsbt requires params");
     if (!params.psbt)
       return (0, import_hwk_adapter_core3.failure)(import_hwk_adapter_core3.HardwareErrorCode.InvalidParams, "btcSignPsbt requires params.psbt");
-    if (params.path && !isKeystoneSignableBtcAccountPath(splitAccountPath(params.path).accountPath)) {
+    if (!params.path)
+      return (0, import_hwk_adapter_core3.failure)(import_hwk_adapter_core3.HardwareErrorCode.InvalidParams, "btcSignPsbt requires params.path");
+    if (!isKeystoneSignableBtcAccountPath(splitAccountPath(params.path).accountPath)) {
       return (0, import_hwk_adapter_core3.failure)(import_hwk_adapter_core3.HardwareErrorCode.DevicePathForbidden, KEYSTONE_BTC_ACCOUNT_FORBIDDEN_MESSAGE);
     }
     try {
@@ -1599,10 +1601,11 @@ var KeystoneAdapter = class _KeystoneAdapter {
   }
   // ---------------------------------------------------------------------------
   // TRON — routed through `TronSignRequest`/`TronSignature` (see
-  // urEngine/TronSignRequest.ts), a port of OneKey's own already-proven
-  // production TRON QR-wallet implementation — NOT keystone-sdk's own
-  // bundled `sdk.tron` module (different, protobuf-based protocol with
-  // unverified response semantics).
+  // urEngine/TronSignRequest.ts), whose key layout follows keystone-sdk-rust
+  // (tags 5201/5202, firmware >= 2.5.0). The OneKey Pro air-gap encoding under
+  // the same tag is a different layout the firmware rejects. Not keystone-sdk's
+  // bundled `sdk.tron` module either (protobuf-based, unverified response
+  // semantics).
   // ---------------------------------------------------------------------------
   async tronGetAddress(connectIdArg, deviceIdArg, paramsArg, book) {
     const operationTarget = resolveHardwareOperationTarget(connectIdArg, paramsArg?.operationId);
@@ -1791,14 +1794,17 @@ var KeystoneAdapter = class _KeystoneAdapter {
       if (!requestedByKey.size) {
         return { book };
       }
-      if (this._forcedTransport !== "qr" && !record?.usbSessionId && this._usbConnector && target.expectedWalletId) {
+      const operation = (0, import_hwk_adapter_core3.isHardwareOperationId)(params.operationId) ? this._operations.find(params.operationId) : void 0;
+      const operationRoute = operation ? this._operationRoutes.get(operation.connectId) : void 0;
+      const routedToQr = operationRoute?.operationId === operation?.operationId && operationRoute?.connectionType === "qr";
+      if (this._forcedTransport !== "qr" && !routedToQr && !record?.usbSessionId && this._usbConnector && target.expectedWalletId) {
         record = await this._tryUsbAttach(
           target.expectedWalletId,
           record?.masterFingerprint ?? target.expectedMasterFingerprint
         ) ?? record;
         _KeystoneAdapter._throwIfAborted(signal);
       }
-      if (this._forcedTransport !== "qr" && record?.usbSessionId) {
+      if (this._forcedTransport !== "qr" && !routedToQr && record?.usbSessionId) {
         const bundleSessionId = record.usbSessionId;
         const assertBundleSession = () => {
           if (record?.usbSessionId !== bundleSessionId) {
@@ -2519,7 +2525,7 @@ var KeystoneAdapter = class _KeystoneAdapter {
   _errorToFailure(err) {
     if (err && typeof err === "object") {
       const e = err;
-      if (typeof e.code === "number") {
+      if (typeof e.code === "number" && e.code >= 1e4 && e.code <= 99999) {
         const { origin } = e;
         return (0, import_hwk_adapter_core3.failure)(
           e.code,