@trezor/connect 9.6.3 → 9.6.4-beta.1

package/CHANGELOG.md

@@ -1,16 +1,25 @@
-|             Package              | Stable | Canary |
-| :------------------------------: | :----: | :----: |
-|       npm @trezor/connect        | 9.6.3  |   -    |
-|     npm @trezor/connect-web      | 9.6.3  |   -    |
-| npm @trezor/connect-webextension | 9.6.3  |   -    |
-|    npm @trezor/connect-mobile    | 9.6.3  |   -    |
+|             Package              | Stable |    Canary    |
+| :------------------------------: | :----: | :----------: |
+|       npm @trezor/connect        | 9.6.3  | 9.6.4-beta.1 |
+|     npm @trezor/connect-web      | 9.6.3  | 9.6.4-beta.1 |
+| npm @trezor/connect-webextension | 9.6.3  | 9.6.4-beta.1 |
+|    npm @trezor/connect-mobile    | 9.6.3  | 9.6.4-beta.1 |
 
-|     Deployment     | Stable | Canary |
-| :----------------: | :----: | :----: |
-| connect.trezor.io/ | 9.6.3  |   -    |
+|     Deployment     | Stable |    Canary    |
+| :----------------: | :----: | :----------: |
+| connect.trezor.io/ | 9.6.3  | 9.6.4-beta.1 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
+# 9.6.4-beta.1
+
+This release primarily introduces support for the new Trezor device and enhancements to the transport API, including a new API type:
+
+- feat(connect): Expose API type and ID on descriptor (ed650e3)
+- feat(connect): Add additional variants of DeviceStatus = 'busy' (34d888e)
+
+In addition, this release includes various bug fixes, refactorings, and chores.
+
 # 9.6.3
 
 We’ve added support for Cardano message signing based on the CIP-8 standard, available through the new cardanoSignMessage method.

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.6.3
+API version 9.6.4-beta.1
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)

package/lib/api/applyFlags.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class ApplyFlags extends AbstractMethod<'applyFlags', PROTO.ApplyFlags> {
     init(): void;

package/lib/api/applyFlags.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const protobuf_1 = require("@trezor/protobuf");
 const schema_utils_1 = require("@trezor/schema-utils");
-const constants_1 = require("../constants");
 const AbstractMethod_1 = require("../core/AbstractMethod");
 class ApplyFlags extends AbstractMethod_1.AbstractMethod {
     init() {
@@ -9,7 +9,7 @@ class ApplyFlags extends AbstractMethod_1.AbstractMethod {
         this.useDeviceState = false;
         this.skipFinalReload = false;
         const { payload } = this;
-        (0, schema_utils_1.Assert)(constants_1.PROTO.ApplyFlags, payload);
+        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.ApplyFlags, payload);
         this.params = {
             flags: payload.flags,
         };

package/lib/api/applySettings.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class ApplySettings extends AbstractMethod<'applySettings', PROTO.ApplySettings> {
     init(): void;

package/lib/api/authenticateDevice.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_utils_1 = require("@trezor/schema-utils");
 const AbstractMethod_1 = require("../core/AbstractMethod");
+const deviceAuthenticityBlacklist_1 = require("../data/deviceAuthenticityBlacklist");
 const events_1 = require("../events");
 const paramsValidator_1 = require("./common/paramsValidator");
 const deviceAuthenticityConfig_1 = require("../data/deviceAuthenticityConfig");
@@ -19,6 +20,7 @@ class AuthenticateDevice extends AbstractMethod_1.AbstractMethod {
         (0, schema_utils_1.Assert)(authenticateDevice_1.AuthenticateDeviceParams, payload);
         this.params = {
             config: payload.config,
+            blacklistConfig: payload.blacklistConfig,
             allowDebugKeys: payload.allowDebugKeys,
         };
     }
@@ -30,10 +32,12 @@ class AuthenticateDevice extends AbstractMethod_1.AbstractMethod {
             challenge: challenge.toString('hex'),
         });
         const config = this.params.config || deviceAuthenticityConfig_1.deviceAuthenticityConfig;
+        const blacklistConfig = this.params.blacklistConfig || deviceAuthenticityBlacklist_1.deviceAuthenticityBlacklist;
         const valid = await (0, verifyAuthenticityProof_1.verifyAuthenticityProof)({
             ...message,
             challenge,
             config,
+            blacklistConfig,
             allowDebugKeys: this.params.allowDebugKeys,
             deviceModel: this.device.features.internal_model,
         });

package/lib/api/authorizeCoinjoin.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class AuthorizeCoinjoin extends AbstractMethod<'authorizeCoinjoin', PROTO.AuthorizeCoinJoin> {
     init(): void;

package/lib/api/backupDevice.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class BackupDevice extends AbstractMethod<'backupDevice', PROTO.BackupDevice> {
     init(): void;

package/lib/api/backupDevice.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const protobuf_1 = require("@trezor/protobuf");
 const schema_utils_1 = require("@trezor/schema-utils");
-const constants_1 = require("../constants");
 const AbstractMethod_1 = require("../core/AbstractMethod");
 class BackupDevice extends AbstractMethod_1.AbstractMethod {
     init() {
@@ -9,7 +9,7 @@ class BackupDevice extends AbstractMethod_1.AbstractMethod {
         this.skipFinalReload = false;
         this.useDeviceState = false;
         const { payload } = this;
-        (0, schema_utils_1.Assert)(constants_1.PROTO.BackupDevice, payload);
+        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.BackupDevice, payload);
         this.params = {
             group_threshold: payload.group_threshold,
             groups: payload.groups,

package/lib/api/bitcoin/TransactionComposer.d.ts

@@ -34,8 +34,8 @@ export declare class TransactionComposer {
         fee: "0";
         disabled: true;
     } | {
-        blocks: number;
         name: string;
+        blocks: number;
         fee: string;
         feePerByte: string;
         minutes: number;

package/lib/api/bitcoin/inputs.d.ts

@@ -1,5 +1,5 @@
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { Transaction as BitcoinJsTransaction } from '@trezor/utxo-lib';
-import type { PROTO } from '../../constants';
 import type { BitcoinNetworkInfo, ProtoWithDerivationPath } from '../../types';
 import type { ComposeUtxo } from '../../types/api/composeTransaction';
 export declare const validateTrezorInputs: (inputs: ProtoWithDerivationPath<PROTO.TxInputType>[], coinInfo: BitcoinNetworkInfo) => PROTO.TxInputType[];

package/lib/api/bitcoin/transactionBytes.d.ts

@@ -1,5 +1,5 @@
 import { PROTO } from '../../constants';
-import { BitcoinNetworkInfo } from '../../exports';
-export declare function mapOutputScriptToKey(script_type: string): "p2pkh" | "p2sh" | "p2tr" | "p2wpkh" | undefined;
+import { BitcoinNetworkInfo } from '../../types';
+export declare function mapOutputScriptToKey(script_type: string): "p2tr" | "p2wpkh" | "p2sh" | "p2pkh" | undefined;
 export declare const getTransactionVbytes: (inputs: PROTO.TxInputType[], outputs: PROTO.TxOutputType[], coinInfo: BitcoinNetworkInfo) => number | undefined;
 //# sourceMappingURL=transactionBytes.d.ts.map

package/lib/api/bleUnpair.js

@@ -24,7 +24,7 @@ class BleUnpair extends AbstractMethod_1.AbstractMethod {
             return response.message;
         }
         catch (error) {
-            if (this.device.bluetoothProps &&
+            if (this.device.descriptor.apiType === 'bluetooth' &&
                 error.message === transport_1.TRANSPORT_ERROR.INTERFACE_DATA_TRANSFER) {
                 throw constants_1.ERRORS.TypedError('Device_Disconnected');
             }

package/lib/api/cancelCoinjoinAuthorization.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class CancelCoinjoinAuthorization extends AbstractMethod<'cancelCoinjoinAuthorization', PROTO.CancelAuthorization> {
     init(): void;

package/lib/api/cardano/api/cardanoSignTransaction.d.ts

@@ -56,8 +56,8 @@ export default class CardanoSignTransaction extends AbstractMethod<'cardanoSignT
         witnesses: {
             chainCode?: string | undefined;
             type: PROTO.CardanoTxWitnessType;
-            pubKey: string;
             signature: string;
+            pubKey: string;
         }[];
     } | {
         serializedTx: string;
@@ -70,8 +70,8 @@ export default class CardanoSignTransaction extends AbstractMethod<'cardanoSignT
         witnesses: {
             chainCode?: string | undefined;
             type: PROTO.CardanoTxWitnessType;
-            pubKey: string;
             signature: string;
+            pubKey: string;
         }[];
     }>;
 }

package/lib/api/cardano/cardanoInputs.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformReferenceInput = exports.transformCollateralInput = exports.transformInput = exports.InputWithPathParam = exports.InputWithPath = exports.Path = void 0;
 const schema_utils_1 = require("@trezor/schema-utils");
 const constants_1 = require("../../constants");
-const exports_1 = require("../../exports");
+const types_1 = require("../../types");
 const pathUtils_1 = require("../../utils/pathUtils");
 exports.Path = schema_utils_1.Type.Array(schema_utils_1.Type.Number());
 exports.InputWithPath = schema_utils_1.Type.Object({
@@ -13,7 +13,7 @@ exports.InputWithPath = schema_utils_1.Type.Object({
 exports.InputWithPathParam = schema_utils_1.Type.Composite([
     constants_1.PROTO.CardanoTxInput,
     schema_utils_1.Type.Object({
-        path: schema_utils_1.Type.Optional(exports_1.DerivationPath),
+        path: schema_utils_1.Type.Optional(types_1.DerivationPath),
     }),
 ]);
 const transformInput = (input) => {

package/lib/api/changePin.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class ChangePin extends AbstractMethod<'changePin', PROTO.ChangePin> {
     init(): void;

package/lib/api/changePin.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const protobuf_1 = require("@trezor/protobuf");
 const schema_utils_1 = require("@trezor/schema-utils");
-const constants_1 = require("../constants");
 const AbstractMethod_1 = require("../core/AbstractMethod");
 class ChangePin extends AbstractMethod_1.AbstractMethod {
     init() {
@@ -9,7 +9,7 @@ class ChangePin extends AbstractMethod_1.AbstractMethod {
         this.useDeviceState = false;
         this.skipFinalReload = false;
         const { payload } = this;
-        (0, schema_utils_1.Assert)(constants_1.PROTO.ChangePin, payload);
+        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.ChangePin, payload);
         this.params = {
             remove: payload.remove,
         };

package/lib/api/changeWipeCode.d.ts

@@ -1,4 +1,4 @@
-import type { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class ChangeWipeCode extends AbstractMethod<'changeWipeCode', PROTO.ChangeWipeCode> {
     init(): void;

package/lib/api/cipherKeyValue.d.ts

@@ -1,4 +1,4 @@
-import type { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class CipherKeyValue extends AbstractMethod<'cipherKeyValue', PROTO.CipherKeyValue[]> {
     hasBundle?: boolean;

package/lib/api/eos/api/eosGetPublicKey.d.ts

@@ -1,4 +1,4 @@
-import type { PROTO } from '../../../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 export default class EosGetPublicKey extends AbstractMethod<'eosGetPublicKey', PROTO.EosGetPublicKey[]> {
     hasBundle?: boolean;

package/lib/api/eos/api/eosSignTransaction.d.ts

@@ -1,4 +1,4 @@
-import type { PROTO } from '../../../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 type Params = {
     path: number[];

package/lib/api/eos/eosSignTx.d.ts

@@ -17,21 +17,17 @@ export declare const validate: (tx: EosSDKTransaction) => {
             data_chunk: string;
         } | undefined;
         transfer?: {
+            sender: string;
+            receiver: string;
             quantity: {
                 symbol: string;
                 amount: string | number;
             };
             memo: string;
-            receiver: string;
-            sender: string;
-        } | undefined;
-        refund?: {
-            owner: string;
         } | undefined;
         delegate?: {
-            transfer: boolean;
-            receiver: string;
             sender: string;
+            receiver: string;
             net_quantity: {
                 symbol: string;
                 amount: string | number;
@@ -40,10 +36,11 @@ export declare const validate: (tx: EosSDKTransaction) => {
                 symbol: string;
                 amount: string | number;
             };
+            transfer: boolean;
         } | undefined;
         undelegate?: {
-            receiver: string;
             sender: string;
+            receiver: string;
             net_quantity: {
                 symbol: string;
                 amount: string | number;
@@ -53,22 +50,25 @@ export declare const validate: (tx: EosSDKTransaction) => {
                 amount: string | number;
             };
         } | undefined;
+        refund?: {
+            owner: string;
+        } | undefined;
         buy_ram?: {
+            receiver: string;
             quantity: {
                 symbol: string;
                 amount: string | number;
             };
-            receiver: string;
             payer: string;
         } | undefined;
         buy_ram_bytes?: {
-            bytes: number;
             receiver: string;
             payer: string;
+            bytes: number;
         } | undefined;
         sell_ram?: {
-            bytes: number;
             account: string;
+            bytes: number;
         } | undefined;
         vote_producer?: {
             voter: string;
@@ -76,13 +76,13 @@ export declare const validate: (tx: EosSDKTransaction) => {
             producers: string[];
         } | undefined;
         update_auth?: {
-            account: string;
             permission: string;
+            account: string;
             parent: string;
             auth: {
                 keys: {
-                    address_n?: number[] | undefined;
                     type?: number | undefined;
+                    address_n?: number[] | undefined;
                     weight: number;
                     key: string;
                 }[];
@@ -90,8 +90,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
                 accounts: {
                     weight: number;
                     account: {
-                        permission: string;
                         actor: string;
+                        permission: string;
                     };
                 }[];
                 waits: {
@@ -101,8 +101,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
             };
         } | undefined;
         delete_auth?: {
-            account: string;
             permission: string;
+            account: string;
         } | undefined;
         link_auth?: {
             code: string;
@@ -119,8 +119,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
             name: string;
             owner: {
                 keys: {
-                    address_n?: number[] | undefined;
                     type?: number | undefined;
+                    address_n?: number[] | undefined;
                     weight: number;
                     key: string;
                 }[];
@@ -128,8 +128,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
                 accounts: {
                     weight: number;
                     account: {
-                        permission: string;
                         actor: string;
+                        permission: string;
                     };
                 }[];
                 waits: {
@@ -140,8 +140,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
             creator: string;
             active: {
                 keys: {
-                    address_n?: number[] | undefined;
                     type?: number | undefined;
+                    address_n?: number[] | undefined;
                     weight: number;
                     key: string;
                 }[];
@@ -149,8 +149,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
                 accounts: {
                     weight: number;
                     account: {
-                        permission: string;
                         actor: string;
+                        permission: string;
                     };
                 }[];
                 waits: {
@@ -163,8 +163,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
             name: string;
             account: string;
             authorization: {
-                permission: string;
                 actor: string;
+                permission: string;
             }[];
         };
     }[];

package/lib/api/ethereum/api/ethereumGetPublicKey.d.ts

@@ -1,4 +1,4 @@
-import type { PROTO } from '../../../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import type { EthereumNetworkInfo } from '../../../types';
 type Params = PROTO.EthereumGetPublicKey & {
@@ -22,9 +22,9 @@ export default class EthereumGetPublicKey extends AbstractMethod<'ethereumGetPub
         descriptorChecksum?: string | undefined;
         depth: number;
         fingerprint: number;
-        chainCode: string;
-        childNum: number;
         xpub: string;
+        childNum: number;
+        chainCode: string;
     }) | ({
         path: number[];
         publicKey: string;
@@ -35,9 +35,9 @@ export default class EthereumGetPublicKey extends AbstractMethod<'ethereumGetPub
         descriptorChecksum?: string | undefined;
         depth: number;
         fingerprint: number;
-        chainCode: string;
-        childNum: number;
         xpub: string;
+        childNum: number;
+        chainCode: string;
     })[]>;
 }
 export {};

package/lib/api/ethereum/api/ethereumSignMessage.d.ts

@@ -1,5 +1,4 @@
-import { MessagesSchema } from '@trezor/protobuf';
-import type { PROTO } from '../../../constants';
+import { MessagesSchema, MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { EthereumNetworkInfo } from '../../../types';
 type Params = PROTO.EthereumSignMessage & {

package/lib/api/ethereum/api/ethereumVerifyMessage.d.ts

@@ -1,4 +1,4 @@
-import type { PROTO } from '../../../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 export default class EthereumVerifyMessage extends AbstractMethod<'ethereumVerifyMessage', PROTO.EthereumVerifyMessage> {
     init(): void;

package/lib/api/evoluGetNode.d.ts

@@ -1,4 +1,4 @@
-import { PROTO } from '../constants';
+import { MessagesSchema as PROTO } from '@trezor/protobuf';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class EvoluGetNode extends AbstractMethod<'evoluGetNode', PROTO.EvoluGetNode> {
     hasBundle?: boolean;

package/lib/api/evoluGetNode.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const protobuf_1 = require("@trezor/protobuf");
 const schema_utils_1 = require("@trezor/schema-utils");
-const constants_1 = require("../constants");
 const AbstractMethod_1 = require("../core/AbstractMethod");
 const paramsValidator_1 = require("./common/paramsValidator");
 class EvoluGetNode extends AbstractMethod_1.AbstractMethod {
@@ -10,7 +10,7 @@ class EvoluGetNode extends AbstractMethod_1.AbstractMethod {
         this.requiredPermissions = ['read'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
         const { payload } = this;
-        (0, schema_utils_1.Assert)(constants_1.PROTO.EvoluGetNode, payload);
+        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.EvoluGetNode, payload);
         this.params = {};
     }
     get info() {

package/lib/api/firmware/calculateFirmwareHash.d.ts

@@ -1,6 +1,13 @@
-import { DeviceModelInternal } from '@trezor/device-utils';
-export declare const calculateFirmwareHash: (internal_model: DeviceModelInternal, fw: ArrayBuffer, key?: Buffer) => {
+import { DeviceModelInternal, VersionArray } from '@trezor/device-utils';
+type CalculateFirmwareHashParams = {
+    internal_model: DeviceModelInternal;
+    fw: ArrayBuffer;
+    firmwareVersion: VersionArray;
+    key?: Buffer;
+};
+export declare const calculateFirmwareHash: ({ internal_model, firmwareVersion, fw, key, }: CalculateFirmwareHashParams) => {
     hash: string;
     challenge: string;
 };
+export {};
 //# sourceMappingURL=calculateFirmwareHash.d.ts.map

package/lib/api/firmware/calculateFirmwareHash.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateFirmwareHash = void 0;
 const blakejs_1 = require("blakejs");
 const device_utils_1 = require("@trezor/device-utils");
+const utils_1 = require("@trezor/utils");
 const SIZE_T1B1 = (7 * 128 + 64) * 1024;
 const SIZE_T2T1 = 13 * 128 * 1024;
 const SIZE_T2B1 = 13 * 128 * 1024;
@@ -17,8 +18,17 @@ const firmwareSizeMap = {
     [device_utils_1.DeviceModelInternal.T3T1]: SIZE_T3T1,
     [device_utils_1.DeviceModelInternal.T3W1]: SIZE_T3W1,
 };
-const calculateFirmwareHash = (internal_model, fw, key) => {
+const getSizeForModel = ({ internal_model, firmwareVersion, }) => {
     const size = firmwareSizeMap[internal_model] ?? SIZE_T1B1;
+    if (firmwareVersion !== undefined &&
+        internal_model === device_utils_1.DeviceModelInternal.T3W1 &&
+        utils_1.versionUtils.isEqual(firmwareVersion, [2, 9, 3])) {
+        return size - 16 * 1024;
+    }
+    return size;
+};
+const calculateFirmwareHash = ({ internal_model, firmwareVersion, fw, key, }) => {
+    const size = getSizeForModel({ internal_model, firmwareVersion });
     const padding = size - fw.byteLength;
     if (padding < 0) {
         throw new Error('Firmware too big');

package/lib/api/firmware/verifyAuthenticityProof.d.ts

@@ -1,13 +1,15 @@
 import { PROTO } from '../../constants';
+import { DeviceAuthenticityBlacklistConfig } from '../../data/deviceAuthenticityBlacklistConfig';
 import { DeviceAuthenticityConfig } from '../../data/deviceAuthenticityConfigTypes';
 import { AuthenticateDeviceResult } from '../../types/api/authenticateDevice';
 interface AuthenticityProofData extends PROTO.AuthenticityProof {
     challenge: Buffer;
     config: DeviceAuthenticityConfig;
+    blacklistConfig: DeviceAuthenticityBlacklistConfig;
     allowDebugKeys?: boolean;
     deviceModel: keyof typeof PROTO.DeviceModelInternal;
 }
 export declare const getRandomChallenge: () => Buffer<ArrayBufferLike>;
-export declare const verifyAuthenticityProof: ({ certificates, signature, challenge, config, allowDebugKeys, deviceModel, }: AuthenticityProofData) => Promise<AuthenticateDeviceResult>;
+export declare const verifyAuthenticityProof: ({ optiga_certificates, optiga_signature, challenge, config, blacklistConfig, allowDebugKeys, deviceModel, }: AuthenticityProofData) => Promise<AuthenticateDeviceResult>;
 export {};
 //# sourceMappingURL=verifyAuthenticityProof.d.ts.map

package/lib/api/firmware/verifyAuthenticityProof.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyAuthenticityProof = exports.getRandomChallenge = void 0;
 const tslib_1 = require("tslib");
 const crypto = tslib_1.__importStar(require("crypto"));
+const crypto_utils_1 = require("@trezor/crypto-utils");
 const utils_1 = require("@trezor/utils");
 const x509certificate_1 = require("./x509certificate");
 const verifySignature = async (rawKey, data, signature) => {
     const signer = crypto.createVerify('sha256');
     signer.update(Buffer.from(data));
-    const SubtleCrypto = typeof window !== 'undefined' ? window.crypto.subtle : crypto.subtle;
-    if (!SubtleCrypto) {
-        throw new Error('SubtleCrypto not supported');
-    }
+    const SubtleCrypto = (0, crypto_utils_1.getSubtleCrypto)();
     const ecPubKey = await SubtleCrypto.importKey('raw', rawKey, { name: 'ECDSA', namedCurve: 'P-256' }, true, ['verify']);
     const spkiPubKey = await SubtleCrypto.exportKey('spki', ecPubKey);
     const key = `-----BEGIN PUBLIC KEY-----\n${Buffer.from(spkiPubKey).toString('base64')}\n-----END PUBLIC KEY-----`;
@@ -48,13 +46,14 @@ const validateCaCertExtensions = (cert, pathLen) => {
         throw new Error(`CA missing extensions keyUsage: ${hasKeyUsage}, basicConstraints: ${hasBasicConstraints}`);
     }
 };
-const verifyAuthenticityProof = async ({ certificates, signature, challenge, config, allowDebugKeys, deviceModel, }) => {
+const verifyAuthenticityProof = async ({ optiga_certificates, optiga_signature, challenge, config, blacklistConfig, allowDebugKeys, deviceModel, }) => {
     const modelConfig = config[deviceModel];
     if (!modelConfig) {
         throw new Error(`Pubkeys for ${deviceModel} not found in config`);
     }
-    const { caPubKeys, debug } = modelConfig;
-    const [deviceCert, caCert] = certificates.map((c, i) => {
+    const { debug } = modelConfig;
+    const { blacklistedCaPubKeys, debug: debugBlacklist } = blacklistConfig;
+    const [deviceCert, caCert] = optiga_certificates.map((c, i) => {
         const cert = (0, x509certificate_1.parseCertificate)(new Uint8Array(Buffer.from(c, 'hex')));
         if (i === 0) {
             return cert;
@@ -75,10 +74,8 @@ const verifyAuthenticityProof = async ({ certificates, signature, challenge, con
         throw new Error(`CA validity from ${caCertValidityFrom} cant't be in the future!`);
     }
     if (!rootPubKey) {
-        const configExpired = new Date(config.timestamp).getTime() < caCertValidityFrom;
         return {
             valid: false,
-            configExpired,
             caPubKey,
             error: 'ROOT_PUBKEY_NOT_FOUND',
         };
@@ -103,16 +100,14 @@ const verifyAuthenticityProof = async ({ certificates, signature, challenge, con
         utils_1.bufferUtils.getChunkSize(challenge.length),
         challenge,
     ]);
-    const isSignatureValid = await verifySignature(Buffer.from(deviceCert.tbsCertificate.subjectPublicKeyInfo.bits.bytes), prefixedChallenge, (0, x509certificate_1.fixSignature)(Buffer.from(signature, 'hex')));
+    const isSignatureValid = await verifySignature(Buffer.from(deviceCert.tbsCertificate.subjectPublicKeyInfo.bits.bytes), prefixedChallenge, (0, x509certificate_1.fixSignature)(Buffer.from(optiga_signature, 'hex')));
     if (rootPubKey && isDeviceCertValid && isSignatureValid) {
-        if ((!isDebugRootPubKey && !caPubKeys.includes(caPubKey)) ||
-            (isDebugRootPubKey && !debug?.caPubKeys.includes(caPubKey))) {
-            const configExpired = new Date(config.timestamp).getTime() < caCertValidityFrom;
+        if ((!isDebugRootPubKey && blacklistedCaPubKeys.includes(caPubKey)) ||
+            (isDebugRootPubKey && debugBlacklist?.blacklistedCaPubKeys.includes(caPubKey))) {
             return {
                 valid: false,
-                configExpired,
                 caPubKey,
-                error: 'CA_PUBKEY_NOT_FOUND',
+                error: 'CA_PUBKEY_BLACKLISTED',
             };
         }
         return {