@onekeyfe/hwk-trezor-core 1.2.8 → 1.2.9

package/dist/index.d.mts

@@ -206,7 +206,10 @@ type TrezorThpSessionOptions = {
      * it back via `knownCredentials` on the next connect to skip pairing UX.
      */
     onPairingCredentialsChanged?: (payload: {
+        /** This device's credentials only, never other devices'. */
         credentials: TrezorThpCredentials[];
+        /** Credentials the device rejected; a host keeping one list for all devices drops these. */
+        removed?: TrezorThpCredentials[];
     }) => Promise<void> | void;
     logger?: TrezorDebugLogger;
 };

package/dist/index.d.ts

@@ -206,7 +206,10 @@ type TrezorThpSessionOptions = {
      * it back via `knownCredentials` on the next connect to skip pairing UX.
      */
     onPairingCredentialsChanged?: (payload: {
+        /** This device's credentials only, never other devices'. */
         credentials: TrezorThpCredentials[];
+        /** Credentials the device rejected; a host keeping one list for all devices drops these. */
+        removed?: TrezorThpCredentials[];
     }) => Promise<void> | void;
     logger?: TrezorDebugLogger;
 };

package/dist/index.js

@@ -7901,6 +7901,7 @@ __export(messages_solana_pb_exports, {
   SolanaGetAddressSchema: () => SolanaGetAddressSchema,
   SolanaGetPublicKeySchema: () => SolanaGetPublicKeySchema,
   SolanaMessageSignatureSchema: () => SolanaMessageSignatureSchema,
+  SolanaOffchainMessageV1Schema: () => SolanaOffchainMessageV1Schema,
   SolanaPublicKeySchema: () => SolanaPublicKeySchema,
   SolanaSignMessageSchema: () => SolanaSignMessageSchema,
   SolanaSignTxSchema: () => SolanaSignTxSchema,
@@ -7912,7 +7913,7 @@ __export(messages_solana_pb_exports, {
 });
 init_buffer();
 var file_messages_solana = fileDesc(
-  "ChVtZXNzYWdlcy1zb2xhbmEucHJvdG8SGWh3LnRyZXpvci5tZXNzYWdlcy5zb2xhbmEiPQoSU29sYW5hR2V0UHVibGljS2V5EhEKCWFkZHJlc3NfbhgBIAMoDRIUCgxzaG93X2Rpc3BsYXkYAiABKAgiJQoPU29sYW5hUHVibGljS2V5EhIKCnB1YmxpY19rZXkYASACKAwiTQoQU29sYW5hR2V0QWRkcmVzcxIRCglhZGRyZXNzX24YASADKA0SFAoMc2hvd19kaXNwbGF5GAIgASgIEhAKCGNodW5raWZ5GAMgASgIIi0KDVNvbGFuYUFkZHJlc3MSDwoHYWRkcmVzcxgBIAIoCRILCgNtYWMYAiABKAwicgoYU29sYW5hVHhUb2tlbkFjY291bnRJbmZvEhQKDGJhc2VfYWRkcmVzcxgBIAIoCRIVCg10b2tlbl9wcm9ncmFtGAIgAigJEhIKCnRva2VuX21pbnQYAyACKAkSFQoNdG9rZW5fYWNjb3VudBgEIAIoCSKCAQoWU29sYW5hVHhBZGRpdGlvbmFsSW5mbxJRChR0b2tlbl9hY2NvdW50c19pbmZvcxgBIAMoCzIzLmh3LnRyZXpvci5tZXNzYWdlcy5zb2xhbmEuU29sYW5hVHhUb2tlbkFjY291bnRJbmZvEhUKDWVuY29kZWRfdG9rZW4YAiABKAwi1gEKDFNvbGFuYVNpZ25UeBIRCglhZGRyZXNzX24YASADKA0SFQoNc2VyaWFsaXplZF90eBgCIAIoDBJKCg9hZGRpdGlvbmFsX2luZm8YAyABKAsyMS5ody50cmV6b3IubWVzc2FnZXMuc29sYW5hLlNvbGFuYVR4QWRkaXRpb25hbEluZm8SPgoLcGF5bWVudF9yZXEYBCABKAsyKS5ody50cmV6b3IubWVzc2FnZXMuY29tbW9uLlBheW1lbnRSZXF1ZXN0EhAKCGNodW5raWZ5GAUgASgIIiYKEVNvbGFuYVR4U2lnbmF0dXJlEhEKCXNpZ25hdHVyZRgBIAIoDCJJChFTb2xhbmFTaWduTWVzc2FnZRIRCglhZGRyZXNzX24YASADKA0SDwoHbWVzc2FnZRgCIAIoDBIQCghjaHVua2lmeRgDIAEoCCIrChZTb2xhbmFNZXNzYWdlU2lnbmF0dXJlEhEKCXNpZ25hdHVyZRgBIAIoDCI5ChNTb2xhbmFWZXJpZnlNZXNzYWdlEhAKCGVudmVsb3BlGAEgAigMEhAKCGNodW5raWZ5GAIgASgIQjoKI2NvbS5zYXRvc2hpbGFicy50cmV6b3IubGliLnByb3RvYnVmQhNUcmV6b3JNZXNzYWdlU29sYW5h",
+  "ChVtZXNzYWdlcy1zb2xhbmEucHJvdG8SGWh3LnRyZXpvci5tZXNzYWdlcy5zb2xhbmEiPQoSU29sYW5hR2V0UHVibGljS2V5EhEKCWFkZHJlc3NfbhgBIAMoDRIUCgxzaG93X2Rpc3BsYXkYAiABKAgiJQoPU29sYW5hUHVibGljS2V5EhIKCnB1YmxpY19rZXkYASACKAwiTQoQU29sYW5hR2V0QWRkcmVzcxIRCglhZGRyZXNzX24YASADKA0SFAoMc2hvd19kaXNwbGF5GAIgASgIEhAKCGNodW5raWZ5GAMgASgIIi0KDVNvbGFuYUFkZHJlc3MSDwoHYWRkcmVzcxgBIAIoCRILCgNtYWMYAiABKAwicgoYU29sYW5hVHhUb2tlbkFjY291bnRJbmZvEhQKDGJhc2VfYWRkcmVzcxgBIAIoCRIVCg10b2tlbl9wcm9ncmFtGAIgAigJEhIKCnRva2VuX21pbnQYAyACKAkSFQoNdG9rZW5fYWNjb3VudBgEIAIoCSKCAQoWU29sYW5hVHhBZGRpdGlvbmFsSW5mbxJRChR0b2tlbl9hY2NvdW50c19pbmZvcxgBIAMoCzIzLmh3LnRyZXpvci5tZXNzYWdlcy5zb2xhbmEuU29sYW5hVHhUb2tlbkFjY291bnRJbmZvEhUKDWVuY29kZWRfdG9rZW4YAiABKAwi1gEKDFNvbGFuYVNpZ25UeBIRCglhZGRyZXNzX24YASADKA0SFQoNc2VyaWFsaXplZF90eBgCIAIoDBJKCg9hZGRpdGlvbmFsX2luZm8YAyABKAsyMS5ody50cmV6b3IubWVzc2FnZXMuc29sYW5hLlNvbGFuYVR4QWRkaXRpb25hbEluZm8SPgoLcGF5bWVudF9yZXEYBCABKAsyKS5ody50cmV6b3IubWVzc2FnZXMuY29tbW9uLlBheW1lbnRSZXF1ZXN0EhAKCGNodW5raWZ5GAUgASgIIiYKEVNvbGFuYVR4U2lnbmF0dXJlEhEKCXNpZ25hdHVyZRgBIAIoDCI7ChdTb2xhbmFPZmZjaGFpbk1lc3NhZ2VWMRIPCgdtZXNzYWdlGAEgAigJEg8KB3NpZ25lcnMYAiADKAwigwEKEVNvbGFuYVNpZ25NZXNzYWdlEhEKCWFkZHJlc3NfbhgBIAMoDRIQCghjaHVua2lmeRgDIAEoCBJDCgdtZXNzYWdlGAQgAigLMjIuaHcudHJlem9yLm1lc3NhZ2VzLnNvbGFuYS5Tb2xhbmFPZmZjaGFpbk1lc3NhZ2VWMUoECAIQAyJAChZTb2xhbmFNZXNzYWdlU2lnbmF0dXJlEhEKCXNpZ25hdHVyZRgBIAIoDBITCgtzaWduZWRfZGF0YRgCIAEoDCKGAQoTU29sYW5hVmVyaWZ5TWVzc2FnZRIQCghjaHVua2lmeRgCIAEoCBJDCgdtZXNzYWdlGAMgAigLMjIuaHcudHJlem9yLm1lc3NhZ2VzLnNvbGFuYS5Tb2xhbmFPZmZjaGFpbk1lc3NhZ2VWMRISCgpzaWduYXR1cmVzGAQgAygMSgQIARACQjoKI2NvbS5zYXRvc2hpbGFicy50cmV6b3IubGliLnByb3RvYnVmQhNUcmV6b3JNZXNzYWdlU29sYW5h",
   [file_messages_common]
 );
 var SolanaGetPublicKeySchema = messageDesc(file_messages_solana, 0);
@@ -7923,9 +7924,10 @@ var SolanaTxTokenAccountInfoSchema = messageDesc(file_messages_solana, 4);
 var SolanaTxAdditionalInfoSchema = messageDesc(file_messages_solana, 5);
 var SolanaSignTxSchema = messageDesc(file_messages_solana, 6);
 var SolanaTxSignatureSchema = messageDesc(file_messages_solana, 7);
-var SolanaSignMessageSchema = messageDesc(file_messages_solana, 8);
-var SolanaMessageSignatureSchema = messageDesc(file_messages_solana, 9);
-var SolanaVerifyMessageSchema = messageDesc(file_messages_solana, 10);
+var SolanaOffchainMessageV1Schema = messageDesc(file_messages_solana, 8);
+var SolanaSignMessageSchema = messageDesc(file_messages_solana, 9);
+var SolanaMessageSignatureSchema = messageDesc(file_messages_solana, 10);
+var SolanaVerifyMessageSchema = messageDesc(file_messages_solana, 11);
 
 // ../hwk-trezor-protobuf/src/definitions/messages-stellar_pb.js
 var messages_stellar_pb_exports = {};
@@ -11274,7 +11276,8 @@ async function receive(receiver, protocol) {
   } catch (e) {
     console.warn("Protocol decode failed", {
       error: e.message,
-      payload: readResult.payload.toString("hex")
+      payloadLength: readResult.payload.length,
+      payloadHead: readResult.payload.subarray(0, 2).toString("hex")
     });
     return error({ code: PROTOCOL_MALFORMED, message: e.message });
   }
@@ -11999,6 +12002,9 @@ var normalizeCreateAppSessionOptions = (options = {}) => {
     passphraseMode
   };
 };
+function thpPairingRefused(message) {
+  return Object.assign(new Error(message), { code: "ThpPairingFailed" });
+}
 var TrezorDeviceSession = class {
   transport;
   connectionType;
@@ -12082,6 +12088,11 @@ var TrezorDeviceSession = class {
       this.log("error", "session.initialize.error", { error: errorToLog(error2) });
       throw error2;
     }
+    if (this.connectionType === "ble" && this.currentFeatures?.bootloader_mode !== true) {
+      this.core = void 0;
+      this.currentFeatures = void 0;
+      throw thpPairingRefused("Trezor Bluetooth requires the encrypted THP protocol");
+    }
     this.log("info", "session.initialize.done", {
       protocol: this.protocol,
       features: summarizeFeatures(this.currentFeatures)
@@ -12129,6 +12140,11 @@ var TrezorDeviceSession = class {
         requestData = {};
         continue;
       }
+      if ((response.type === "PinMatrixRequest" || response.type === "PassphraseRequest") && this.connectionType === "ble" && this.protocol === "v1") {
+        this.core = void 0;
+        this.currentFeatures = void 0;
+        throw thpPairingRefused("Trezor Bluetooth requires the encrypted THP protocol");
+      }
       if (response.type === "PinMatrixRequest") {
         const pin = await this.handlePinMatrixRequest(
           response.message
@@ -12249,6 +12265,36 @@ var TrezorDeviceSession = class {
     const response = await this.core.call("Initialize", {});
     this.currentFeatures = expectMessage(response, "Features").message;
     this.thpAppSessionActive = false;
+    if (passphraseMode === "empty") {
+      expectMessage(
+        await this.call("GetAddress", {
+          address_n: [2147483692, 2147483649, 2147483648, 0, 0],
+          coin_name: "Testnet",
+          script_type: "SPENDADDRESS",
+          show_display: false
+        }),
+        "Address"
+      );
+      expectMessage(await this.call("GetFeatures", {}), "Features");
+      if (this.currentFeatures?.passphrase_protection == null) {
+        throw new TrezorFailureError({
+          type: "Failure",
+          message: {
+            code: "Failure_DataError",
+            message: "Empty passphrase cannot be enforced: device did not report its passphrase setting"
+          }
+        });
+      }
+    }
+    if (passphraseMode === "empty" && this.currentFeatures?.passphrase_protection === true && this.currentFeatures?.passphrase_always_on_device === true) {
+      throw new TrezorFailureError({
+        type: "Failure",
+        message: {
+          code: "Failure_DataError",
+          message: "Empty passphrase cannot be enforced with PASSPHRASE_ALWAYS_ON_DEVICE enabled"
+        }
+      });
+    }
     this.log("info", "v1.appSession.create.done", {
       features: summarizeFeatures(this.currentFeatures)
     });
@@ -12376,7 +12422,8 @@ var TrezorThpSession = class {
     }
     const pairingMethods = getPairingMethods(
       properties.pairing_methods,
-      this.options.pairingMethods ?? ["CodeEntry", "QrCode", "NFC", "SkipPairing"]
+      // SkipPairing is for emulators and debug firmware only; production devices offer CodeEntry.
+      this.options.pairingMethods ?? ["CodeEntry", "QrCode", "NFC"]
     );
     if (pairingMethods.length === 0) {
       throw new Error("No compatible THP pairing method");
@@ -12443,12 +12490,16 @@ var TrezorThpSession = class {
       "ThpHandshakeCompletionResponse"
     );
     const completionState = completion.message.state;
+    if (completionState !== 0 && !handshakeCredentials.credentials) {
+      throw thpPairingRefused("Trezor reported a pairing that no stored credential confirms");
+    }
     this.thpState.setIsPaired(completionState !== 0);
     this.thpState.setPhase("pairing");
     if (!completionState && handshakeCredentials.credentials) {
       this.thpState.removePairingCredential(handshakeCredentials.credentials);
       await this.options.onPairingCredentialsChanged?.({
-        credentials: this.thpState.pairingCredentials
+        credentials: this.thpState.pairingCredentials,
+        removed: [handshakeCredentials.credentials]
       });
     }
     this.log("info", "thp.handshake.done", {
@@ -12482,6 +12533,9 @@ var TrezorThpSession = class {
       selected_pairing_method: selectedMethod
     });
     if (selectMethod.type === "ThpEndResponse") {
+      if (selectedMethod !== protocol_thp_exports.ThpPairingMethod.SkipPairing) {
+        throw thpPairingRefused("Trezor ended pairing without completing the selected method");
+      }
       this.thpState.setIsPaired(true);
       this.thpState.setPhase("paired");
       this.log("info", "thp.pair.done", { responseType: selectMethod.type });