@trezor/connect 9.5.1 → 9.5.2-beta.2

package/CHANGELOG.md

@@ -1,16 +1,40 @@
 |             Package              | Stable |    Canary    |
 | :------------------------------: | :----: | :----------: |
-|       npm @trezor/connect        | 9.5.1  |      -       |
-|     npm @trezor/connect-web      | 9.5.1  |      -       |
-| npm @trezor/connect-webextension | 9.5.1  |      -       |
+|       npm @trezor/connect        | 9.5.1  | 9.5.2-beta.2 |
+|     npm @trezor/connect-web      | 9.5.1  | 9.5.2-beta.2 |
+| npm @trezor/connect-webextension | 9.5.1  | 9.5.2-beta.2 |
 |    npm @trezor/connect-mobile    |   -    | 0.0.1-beta.1 |
 
-|     Deployment     | Stable | Canary |
-| :----------------: | :----: | :----: |
-| connect.trezor.io/ | 9.5.1  |   -    |
+|     Deployment     | Stable |    Canary    |
+| :----------------: | :----: | :----------: |
+| connect.trezor.io/ | 9.5.1  | 9.5.2-beta.2 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
+# 9.5.2-beta.2
+
+Replace @solana/web3.js with @solana/kit
+
+# 9.5.2-beta.1
+
+## Feature
+
+-   feat(connect-web): forward device events in popup mode (8589d27). From now on you may listen for device events even if you are using core logic loaded into connect.trezor.io/9/popup.html. This feature was previously available only in @trezor/connect or in @trezor/connect-web using iframe.
+-   feat(connect-web): enable coreMode auto by default (061b28a). From now on (applies for @trezor/connect-web) if you don't pass `coreMode` in TrezorConnect.init, TrezorConnect would automatically fallback to loading connect-core into popup.html instead loading it into the injected iframe. This fallback happens
+    in cases when iframe can't be injected or trezor-bridge is not running.
+
+## Chores
+
+-   chore(connect): update device authenticity config (ecc04a4)
+-   chore(connect-common): add fw binaries for 2.8.9 (63a69af)
+-   stop exporting DeviceModelInternal enum (0ad5a37, 0bcf666, 465f40a). We believe that this was only used internally.
+-   chore(connect-popup): bump deprecation warning to 9.4.0 (2d8d78d)
+
+## Fixes
+
+-   feat(connect): add errorPayload to FW revision check other-error (afe36df)
+-   fix(connect): assign object instead of mutating (a09a669)
+
 # 9.5.1
 
 ## Feature

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.5.1
+API version 9.5.2-beta.2
 
 [![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/ethereum/api/ethereumSignTypedData.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const device_utils_1 = require("@trezor/device-utils");
 const protobuf_1 = require("@trezor/protobuf");
 const schema_utils_1 = require("@trezor/schema-utils");
 const constants_1 = require("../../../constants");
@@ -76,7 +77,7 @@ class EthereumSignTypedData extends AbstractMethod_1.AbstractMethod {
     async run() {
         const cmd = this.device.getCommands();
         const { address_n, definitions } = this.params;
-        if (this.device.features.internal_model === types_1.DeviceModelInternal.T1B1) {
+        if (this.device.features.internal_model === device_utils_1.DeviceModelInternal.T1B1) {
             (0, schema_utils_1.Assert)(schema_utils_1.Type.Object({
                 domain_separator_hash: schema_utils_1.Type.String(),
                 message_hash: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),

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

@@ -1,5 +1,6 @@
+import { VersionArray } from '@trezor/device-utils';
 import { GetInfoProps } from '../../data/firmwareInfo';
-import { IntermediaryVersion, VersionArray } from '../../types';
+import { IntermediaryVersion } from '../../types';
 interface GetBinaryForFirmwareUpgradeProps extends GetInfoProps {
     baseUrl: string;
     btcOnly?: boolean;

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

@@ -1,4 +1,4 @@
-import type { VersionArray } from '../../types/firmware';
+import type { VersionArray } from '@trezor/device-utils';
 export declare const parseFirmwareHeaders: (buff: Buffer) => {
     version: VersionArray;
 };

package/lib/api/firmware/uploadFirmware.js

@@ -5,7 +5,7 @@ const constants_1 = require("../../constants");
 const events_1 = require("../../events");
 const postConfirmationMessage = (device) => {
     if (device.features.firmware_present) {
-        device.emit(events_1.DEVICE.BUTTON, device, { code: 'ButtonRequest_FirmwareUpdate' });
+        device.emit(events_1.DEVICE.BUTTON, { device, payload: { code: 'ButtonRequest_FirmwareUpdate' } });
     }
 };
 const postProgressMessage = (device, progress, postMessage) => {

package/lib/api/getFeatures.d.ts

@@ -53,7 +53,7 @@ export default class GetFeatures extends AbstractMethod<'getFeatures'> {
         auto_lock_delay_ms: number | null;
         display_rotation: "North" | "East" | "South" | "West" | null;
         experimental_features: boolean | null;
-        internal_model: import("@trezor/protobuf").DeviceModelInternal;
+        internal_model: import("@trezor/protobuf/lib/messages-schema").DeviceModelInternal;
     }>;
 }
 //# sourceMappingURL=getFeatures.d.ts.map

package/lib/api/resetDevice.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_utils_1 = require("@trezor/schema-utils");
+const errors_groups_1 = require("@trezor/transport/lib/errors-groups");
 const utils_1 = require("@trezor/utils");
 const verifyEntropy_1 = require("../api/firmware/verifyEntropy");
 const constants_1 = require("../constants");
@@ -69,7 +70,8 @@ class ResetDevice extends AbstractMethod_1.AbstractMethod {
             xpubs,
         });
         if (res.error) {
-            await (0, prompts_1.cancelPrompt)(this.device);
+            await (0, prompts_1.cancelPrompt)(this.device).catch(() => {
+            });
             throw new Error(res.error);
         }
         return currentData;
@@ -79,18 +81,22 @@ class ResetDevice extends AbstractMethod_1.AbstractMethod {
         if (this.params.entropy_check && this.device.unavailableCapabilities['entropyCheck']) {
             this.params.entropy_check = false;
         }
-        let entropyData = await this.getEntropyData('ResetDevice');
-        if (this.params.entropy_check) {
-            const tries = (0, utils_1.getRandomInt)(1, 5);
-            for (let i = 0; i < tries; i++) {
-                try {
+        try {
+            let entropyData = await this.getEntropyData('ResetDevice');
+            if (this.params.entropy_check) {
+                const tries = (0, utils_1.getRandomInt)(1, 5);
+                for (let i = 0; i < tries; i++) {
                     entropyData = await this.entropyCheck(entropyData);
                 }
-                catch (error) {
-                    throw constants_1.ERRORS.TypedError('Failure_EntropyCheck', error.message);
-                }
+                await cmd.typedCall('EntropyCheckContinue', 'Success', { finish: true });
+            }
+        }
+        catch (error) {
+            if (error.cause === 'transport-error' &&
+                errors_groups_1.ERRORS_WITHOUT_DEVICE_INTERACTION.includes(error.message)) {
+                throw error;
             }
-            await cmd.typedCall('EntropyCheckContinue', 'Success', { finish: true });
+            throw constants_1.ERRORS.TypedError('Failure_EntropyCheck', error.message);
         }
         return { message: 'Success' };
     }

package/lib/api/solana/solanaUtils.d.ts

@@ -1,4 +1,4 @@
-import { type CompilableTransactionMessage } from '@solana/web3.js';
+import { type CompilableTransactionMessage } from '@solana/kit';
 import type { TokenAccount } from '@trezor/blockchain-link-types';
 import type { TokenProgramName } from '@trezor/blockchain-link-utils/lib/solana';
 import { BigNumber } from '@trezor/utils/lib/bigNumber';
@@ -24,9 +24,9 @@ export declare const buildTransferTransaction: (fromAddress: string, toAddress:
     serializeMessage(): string;
     serialize(): string;
 }>;
-export declare const buildTokenTransferInstruction: (from: string, to: string, owner: string, amount: BigNumber, mint: string, decimals: number, tokenProgramName: TokenProgramName) => Promise<import("@solana-program/token").TransferCheckedInstruction<import("@solana/web3.js").Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">, string, string, string, string, []> | import("@solana-program/token-2022").TransferCheckedInstruction<import("@solana/web3.js").Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">, string, string, string, string, []>>;
-export declare const getAssociatedTokenAccountAddress: (baseAddress: string, tokenMintAddress: string, tokenProgramName: TokenProgramName) => Promise<import("@solana/web3.js").Address<string>>;
-export declare const buildCreateAssociatedTokenAccountInstruction: (funderAddress: string, newOwnerAddress: string, tokenMintAddress: string, tokenProgramName: TokenProgramName) => Promise<readonly [import("@solana-program/token").CreateAssociatedTokenInstruction<import("@solana/web3.js").Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">, string, string, string, string, string, string, []>, import("@solana/web3.js").Address<string>]>;
+export declare const buildTokenTransferInstruction: (from: string, to: string, owner: string, amount: BigNumber, mint: string, decimals: number, tokenProgramName: TokenProgramName) => Promise<import("@solana-program/token").TransferCheckedInstruction<import("@solana/kit").Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">, string, string, string, string, []> | import("@solana-program/token-2022").TransferCheckedInstruction<import("@solana/kit").Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">, string, string, string, string, []>>;
+export declare const getAssociatedTokenAccountAddress: (baseAddress: string, tokenMintAddress: string, tokenProgramName: TokenProgramName) => Promise<import("@solana/kit").Address<string>>;
+export declare const buildCreateAssociatedTokenAccountInstruction: (funderAddress: string, newOwnerAddress: string, tokenMintAddress: string, tokenProgramName: TokenProgramName) => Promise<readonly [import("@solana-program/token").CreateAssociatedTokenInstruction<import("@solana/kit").Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">, string, string, string, string, string, string, []>, import("@solana/kit").Address<string>]>;
 type TokenTransferTxWithDestinationAddress = {
     transaction: {
         addSignature(signerPubKey: string, signatureHex: string): void;

package/lib/api/solana/solanaUtils.js

@@ -30,7 +30,7 @@ const ts_belt_1 = require("@mobily/ts-belt");
 const blockchain_link_utils_1 = require("@trezor/blockchain-link-utils");
 const bigNumber_1 = require("@trezor/utils/lib/bigNumber");
 const { SYSTEM_PROGRAM_PUBLIC_KEY, tokenProgramsInfo } = blockchain_link_utils_1.solanaUtils;
-const loadSolanaLib = async () => await Promise.resolve().then(() => __importStar(require('@solana/web3.js')));
+const loadSolanaLib = async () => await Promise.resolve().then(() => __importStar(require('@solana/kit')));
 const loadSolanaComputeBudgetProgramLib = async () => await Promise.resolve().then(() => __importStar(require('@solana-program/compute-budget')));
 const loadSolanaSystemProgramLib = async () => await Promise.resolve().then(() => __importStar(require('@solana-program/system')));
 const loadSolanaTokenProgramLib = async (tokenProgramName) => {

package/lib/api/wipeDevice.js

@@ -26,7 +26,10 @@ class WipeDevice extends AbstractMethod_1.AbstractMethod {
     async run() {
         const cmd = this.device.getCommands();
         if (this.device.isBootloader()) {
-            this.device.emit(events_1.DEVICE.BUTTON, this.device, { code: 'ButtonRequest_WipeDevice' });
+            this.device.emit(events_1.DEVICE.BUTTON, {
+                device: this.device,
+                payload: { code: 'ButtonRequest_WipeDevice' },
+            });
         }
         const response = await cmd.typedCall('WipeDevice', 'Success');
         return response.message;

package/lib/core/index.js

@@ -383,16 +383,7 @@ const onCallDevice = async (context, message, method) => {
     if (method.hasExpectedDeviceState) {
         device.setState(method.deviceState);
     }
-    device.on(events_2.DEVICE.BUTTON, onDeviceButtonHandler(context, method));
-    device.on(events_2.DEVICE.PIN, onDevicePinHandler(context));
-    device.on(events_2.DEVICE.WORD, onDeviceWordHandler(context));
-    device.on(events_2.DEVICE.PASSPHRASE, (method.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler)(context));
-    device.on(events_2.DEVICE.PASSPHRASE_ON_DEVICE, () => {
-        sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.REQUEST_PASSPHRASE_ON_DEVICE, { device: device.toMessageObject() }));
-    });
-    device.on(events_2.DEVICE.FIRMWARE_VERSION_CHANGED, payload => {
-        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.FIRMWARE_VERSION_CHANGED, payload));
-    });
+    registerDeviceEvents(context, method)(device);
     if (useCoreInPopup && env === 'webextension' && origin) {
         device.initStorage(new StateStorage_1.WebextensionStateStorage(origin));
     }
@@ -411,6 +402,9 @@ const onCallDevice = async (context, message, method) => {
         });
     }
     catch (error) {
+        if (error.cause) {
+            _log.debug('device.run error caught, caused by:', error.cause);
+        }
         if (error.code === 'Device_Disconnected') {
             deviceList.addAuthPenalty(device);
         }
@@ -466,14 +460,14 @@ const closePopup = ({ popupPromise, sendCoreMessage }) => {
     }
     sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.CLOSE_UI_WINDOW));
 };
-const onDeviceButtonHandler = (context, method) => async (...[device, request]) => {
+const onDeviceButtonHandler = (context, method) => async ({ device, payload: request }) => {
     const { sendCoreMessage } = context;
     const addressRequest = request.code === 'ButtonRequest_Address';
-    if (!addressRequest || (addressRequest && method.useUi)) {
+    if (!addressRequest || (addressRequest && method?.useUi)) {
         await waitForPopup(context);
     }
-    const data = typeof method.getButtonRequestData === 'function' && request.code
-        ? method.getButtonRequestData(request.code)
+    const data = typeof method?.getButtonRequestData === 'function' && request.code
+        ? method?.getButtonRequestData(request.code)
         : undefined;
     startInteractionTimeout(context);
     sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.BUTTON, { ...request, device: device.toMessageObject() }));
@@ -482,11 +476,11 @@ const onDeviceButtonHandler = (context, method) => async (...[device, request])
         device: device.toMessageObject(),
         data,
     }));
-    if (addressRequest && !method.useUi) {
+    if (addressRequest && !method?.useUi) {
         sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.ADDRESS_VALIDATION, data));
     }
 };
-const onDevicePinHandler = (context) => async (...[device, type, callback]) => {
+const onDevicePinHandler = (context) => async ({ device, type, callback }) => {
     const { uiPromises, sendCoreMessage } = context;
     await waitForPopup(context);
     const uiPromise = uiPromises.create(events_2.UI.RECEIVE_PIN, device);
@@ -499,7 +493,7 @@ const onDevicePinHandler = (context) => async (...[device, type, callback]) => {
         callback(null, error);
     }
 };
-const onDeviceWordHandler = (context) => async (...[device, type, callback]) => {
+const onDeviceWordHandler = (context) => async ({ device, type, callback }) => {
     const { uiPromises, sendCoreMessage } = context;
     await waitForPopup(context);
     const uiPromise = uiPromises.create(events_2.UI.RECEIVE_WORD, device);
@@ -512,7 +506,7 @@ const onDeviceWordHandler = (context) => async (...[device, type, callback]) =>
         callback(null, error);
     }
 };
-const onDevicePassphraseHandler = (context) => async (...[device, callback]) => {
+const onDevicePassphraseHandler = (context) => async ({ device, callback }) => {
     const { uiPromises, sendCoreMessage } = context;
     await waitForPopup(context);
     const uiPromise = uiPromises.create(events_2.UI.RECEIVE_PASSPHRASE, device);
@@ -525,9 +519,24 @@ const onDevicePassphraseHandler = (context) => async (...[device, callback]) =>
         callback(null, error);
     }
 };
-const onEmptyPassphraseHandler = () => (...[_, callback]) => {
+const onEmptyPassphraseHandler = () => ({ callback }) => {
     callback({ value: '' });
 };
+const registerDeviceEvents = (context, method) => (device) => {
+    device.removeAllListeners();
+    device.on(events_2.DEVICE.BUTTON, onDeviceButtonHandler(context, method));
+    device.on(events_2.DEVICE.PIN, onDevicePinHandler(context));
+    device.on(events_2.DEVICE.WORD, onDeviceWordHandler(context));
+    device.on(events_2.DEVICE.PASSPHRASE, (method?.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler)(context));
+    device.on(events_2.DEVICE.PASSPHRASE_ON_DEVICE, () => {
+        context.sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.REQUEST_PASSPHRASE_ON_DEVICE, {
+            device: device.toMessageObject(),
+        }));
+    });
+    device.on(events_2.DEVICE.FIRMWARE_VERSION_CHANGED, payload => {
+        context.sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.FIRMWARE_VERSION_CHANGED, payload));
+    });
+};
 const onPopupClosed = (context, customErrorMessage) => {
     const { uiPromises, popupPromise, deviceList, callMethods, resetWaitForFirstMethod, setOverridePromise, sendCoreMessage, } = context;
     const error = customErrorMessage
@@ -704,14 +713,16 @@ class Core extends events_1.default {
             case events_2.IFRAME.CALL:
                 if (message.payload.method === 'firmwareUpdate') {
                     (0, DeviceList_1.assertDeviceListConnected)(this.deviceList);
+                    const coreContext = this.getCoreContext();
                     (0, onCallFirmwareUpdate_1.onCallFirmwareUpdate)({
                         params: message.payload,
                         context: {
                             deviceList: this.deviceList,
                             postMessage: this.sendCoreMessage.bind(this),
-                            initDevice: path => initDevice(this.getCoreContext(), { path }),
+                            initDevice: path => initDevice(coreContext, { path }),
                             log: _log,
                             abortSignal: this.abortController.signal,
+                            registerEvents: registerDeviceEvents(coreContext),
                         },
                     })
                         .then(payload => {

package/lib/core/method.js

@@ -13,7 +13,7 @@ const getMethod = async (message) => {
     }
     const methodModule = getMethodModule(method);
     const methods = methodModule
-        ? await Promise.resolve(`${`../api/${methodModule}/api`}`).then(s => tslib_1.__importStar(require(s)))
+        ? await Promise.resolve(`${`../api/${methodModule}/api/index.ts`}`).then(s => tslib_1.__importStar(require(s)))
         : Methods;
     const MethodConstructor = methods[method];
     if (MethodConstructor) {

package/lib/core/onCallFirmwareUpdate.d.ts

@@ -13,6 +13,7 @@ export type Params = {
 } & CommonParams;
 type Context = {
     deviceList: DeviceList;
+    registerEvents: (device: Device) => void;
     postMessage: PostMessage;
     initDevice: (path?: DeviceUniquePath) => Promise<Device>;
     log: Log;
@@ -22,6 +23,6 @@ type OnCallFirmwareUpdateParams = {
     params: Params;
     context: Context;
 };
-export declare const onCallFirmwareUpdate: ({ params, context: { deviceList, postMessage, initDevice, log, abortSignal }, }: OnCallFirmwareUpdateParams) => Promise<FirmwareUpdateResponse>;
+export declare const onCallFirmwareUpdate: ({ params, context, }: OnCallFirmwareUpdateParams) => Promise<FirmwareUpdateResponse>;
 export {};
 //# sourceMappingURL=onCallFirmwareUpdate.d.ts.map

package/lib/core/onCallFirmwareUpdate.js

@@ -7,15 +7,7 @@ const firmware_1 = require("../api/firmware");
 const constants_1 = require("../constants");
 const firmwareInfo_1 = require("../data/firmwareInfo");
 const events_1 = require("../events");
-const registerEvents = (device, postMessage) => {
-    device.on(events_1.DEVICE.BUTTON, (_d, request) => {
-        postMessage((0, events_1.createDeviceMessage)(events_1.DEVICE.BUTTON, {
-            code: request.code,
-            device: device.toMessageObject(),
-        }));
-    });
-};
-const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, { deviceList, device, postMessage, log, abortSignal }) => {
+const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, { deviceList, device, registerEvents, postMessage, log, abortSignal }) => {
     const target = intermediary || !bootloader ? 'normal' : 'bootloader';
     let i = 0;
     if (method !== 'auto') {
@@ -52,6 +44,7 @@ const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, {
             reconnectedDevice.handshakeFinished) {
             log.debug('onCallFirmwareUpdate', 'we were unable to read device.features on the first interaction after seeing it, retrying...');
             try {
+                registerEvents(reconnectedDevice);
                 await reconnectedDevice.run(undefined, {
                     skipFirmwareChecks: true,
                     skipLanguageChecks: true,
@@ -78,7 +71,7 @@ const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, {
     if (!reconnectedDevice) {
         throw constants_1.ERRORS.TypedError('Method_Interrupted');
     }
-    registerEvents(reconnectedDevice, postMessage);
+    registerEvents(reconnectedDevice);
     await reconnectedDevice.waitForFirstRun();
     if (!reconnectedDevice.isUsedHere()) {
         await reconnectedDevice.acquire();
@@ -165,14 +158,15 @@ const getBinaryHelper = (device, params, log, postMessage, btcOnly) => {
         };
     });
 };
-const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage, initDevice, log, abortSignal }, }) => {
+const onCallFirmwareUpdate = async ({ params, context, }) => {
+    const { deviceList, registerEvents, postMessage, initDevice, log } = context;
     log.debug('onCallFirmwareUpdate with params: ', params);
     const device = await initDevice(params?.device?.path);
     if (deviceList.getDeviceCount() > 1) {
         throw constants_1.ERRORS.TypedError('Device_MultipleNotSupported', 'Firmware update allowed with only 1 device connected');
     }
     log.debug('onCallFirmwareUpdate', 'device', device);
-    registerEvents(device, postMessage);
+    registerEvents(device);
     const { manual, upgrade, language, btcOnly } = getInstallationParams(device, params);
     log.debug('onCallFirmwareUpdate', 'installation params', {
         manual,
@@ -190,7 +184,7 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
         await device.acquire();
     }
     else if (manual) {
-        reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'manual' }, { deviceList, device, log, postMessage, abortSignal });
+        reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'manual' }, { ...context, device });
     }
     else {
         const rebootParams = upgrade
@@ -230,7 +224,7 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
         if (device.features.major_version === 1) {
             await (0, utils_1.resolveAfter)(2000);
         }
-        reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'auto' }, { deviceList, device, log, postMessage, abortSignal });
+        reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'auto' }, { ...context, device });
     }
     const intermediary = !params.binary && device.firmwareRelease?.intermediaryVersion;
     const bootloaderVersion = reconnectedDevice.getVersion();
@@ -240,13 +234,13 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
     log.info('onCallFirmwareUpdate', 'firmware uploaded');
     if (intermediary) {
         log.info('onCallFirmwareUpdate', '...but it was the intermediary firmware, so one more go');
-        reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'manual', intermediary: true }, { deviceList, device: reconnectedDevice, log, postMessage, abortSignal });
+        reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'manual', intermediary: true }, { ...context, device: reconnectedDevice });
         binaryInfo = await getBinaryHelper(reconnectedDevice, params, log, postMessage, btcOnly);
         stripped = (0, firmware_1.stripFwHeaders)(binaryInfo.binary);
         await reconnectedDevice.initialize(false);
         await (0, firmware_1.uploadFirmware)(reconnectedDevice.getCommands().typedCall.bind(reconnectedDevice.getCommands()), postMessage, reconnectedDevice, { payload: stripped });
     }
-    reconnectedDevice = await waitForReconnectedDevice({ bootloader: false, method: 'wait' }, { deviceList, device: reconnectedDevice, log, postMessage, abortSignal });
+    reconnectedDevice = await waitForReconnectedDevice({ bootloader: false, method: 'wait' }, { ...context, device: reconnectedDevice });
     if (reconnectedDevice.atLeast('2.7.0') &&
         deviceInitiallyConnectedWithoutFirmware &&
         params.language) {

package/lib/data/DataManager.js

@@ -4,10 +4,10 @@ exports.DataManager = void 0;
 const tslib_1 = require("tslib");
 const coins_eth_json_1 = tslib_1.__importDefault(require("@trezor/connect-common/files/coins-eth.json"));
 const coins_json_1 = tslib_1.__importDefault(require("@trezor/connect-common/files/coins.json"));
+const device_utils_1 = require("@trezor/device-utils");
 const messages_json_1 = tslib_1.__importDefault(require("@trezor/protobuf/messages.json"));
 const coinInfo_1 = require("./coinInfo");
 const firmwareInfo_1 = require("./firmwareInfo");
-const types_1 = require("../types");
 const assetUtils_1 = require("../utils/assetUtils");
 class DataManager {
     static assets = {};
@@ -30,11 +30,11 @@ class DataManager {
             ...this.assets.coins,
             ...this.assets.coinsEth,
         });
-        for (const model in types_1.DeviceModelInternal) {
+        for (const model in device_utils_1.DeviceModelInternal) {
             const firmwareKey = `firmware-${model.toLowerCase()}`;
-            const modelType = types_1.DeviceModelInternal[model];
+            const modelType = device_utils_1.DeviceModelInternal[model];
             if (this.assets[firmwareKey]) {
-                (0, firmwareInfo_1.parseFirmware)(this.assets[firmwareKey], modelType);
+                (0, firmwareInfo_1.parseFirmwareReleases)(this.assets[firmwareKey], modelType);
             }
         }
     }

package/lib/data/deviceAuthenticityConfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deviceAuthenticityConfig = void 0;
 exports.deviceAuthenticityConfig = {
     version: 1,
-    timestamp: '2025-02-06T12:00:00.000Z',
+    timestamp: '2025-03-05T12:00:00.000Z',
     T2B1: {
         rootPubKeys: [
             '04ca97480ac0d7b1e6efafe518cd433cec2bf8ab9822d76eafd34363b55d63e60380bff20acc75cde03cffcb50ab6f8ce70c878e37ebc58ff7cca0a83b16b15fa5',
@@ -81,6 +81,9 @@ exports.deviceAuthenticityConfig = {
             '04476f0184085862bd38a7f39ef03be6915d7c1b0626c263f6f6c9bc5575c41f81f77d9c69eb16ce8ad7b0d11f3de937931adc9f35ea1f007b81a571ae036ef8c3',
             '046ecbbc4316c0a1247b91103a6f2a3bbd746c04bf47c9ea52dce3735c8ba04df088d3ce66cc8fea0063c344268e03f9d7cce35c8381747d4df4ba4491a178c382',
             '04c341d6af7e960f4c2926035d1f7f8164be244e87742924ef0dddf430e89521846673ed009884146042b79b02dd00c7a2d708f6dc33d43cc6d5073edc17a71376',
+            '04221f144939e3201538d02b61a4b419b12678dc27ccd3813bfda29f181ba7160807e7a3c6f3938b12e6a9e7e76314fd13757a39454b93e3d1a28c633cbf475c0f',
+            '0471515c2c4b94274ec0b3b1d799378730010fb6b5b738d9ef2087e930d0f75d53b1e5284ed51335f45b7b30973af848a40ad86dbe34962dfee6a019d32f5b21dd',
+            '04f9f46d57a7bb9d2ac2e9121eb85f6e9a2a7e2b395ec6e7f93660e5caac2f64483dae074bd5b7e7d8057b2732b3dff5d861eefc5ab86059483d3374d527c877f1',
         ],
         debug: {
             rootPubKeys: [],

package/lib/data/firmwareInfo.d.ts

@@ -1,6 +1,6 @@
+import { DeviceModelInternal, VersionArray } from '@trezor/device-utils';
 import type { Features, FirmwareRelease, ReleaseInfo } from '../types';
-import { DeviceModelInternal } from '../types';
-export declare const parseFirmware: (json: any, deviceModel: DeviceModelInternal) => void;
+export declare const parseFirmwareReleases: (json: any, deviceModel: DeviceModelInternal) => void;
 export declare const getReleases: (deviceModel: DeviceModelInternal) => FirmwareRelease[];
 export interface GetInfoProps {
     features: Features;
@@ -8,5 +8,6 @@ export interface GetInfoProps {
 }
 export declare const getInfo: ({ features, releases }: GetInfoProps) => ReleaseInfo | null;
 export declare const getFirmwareStatus: (features: Features) => "valid" | "outdated" | "required" | "unknown" | "custom" | "none";
-export declare const getRelease: (features: Features) => ReleaseInfo | null;
+export declare const getReleaseInfo: (features: Features) => ReleaseInfo | null;
+export declare const getRelease: (internalModel: DeviceModelInternal, firmwareVersion: VersionArray | undefined) => FirmwareRelease | undefined;
 //# sourceMappingURL=firmwareInfo.d.ts.map

package/lib/data/firmwareInfo.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRelease = exports.getFirmwareStatus = exports.getInfo = exports.getReleases = exports.parseFirmware = void 0;
+exports.getRelease = exports.getReleaseInfo = exports.getFirmwareStatus = exports.getInfo = exports.getReleases = exports.parseFirmwareReleases = void 0;
+const device_utils_1 = require("@trezor/device-utils");
 const utils_1 = require("@trezor/utils");
-const types_1 = require("../types");
 const firmwareUtils_1 = require("../utils/firmwareUtils");
-const releases = Object.values(types_1.DeviceModelInternal).reduce((acc, key) => ({ ...acc, [key]: [] }), {});
-const parseFirmware = (json, deviceModel) => {
+const releases = Object.values(device_utils_1.DeviceModelInternal).reduce((acc, key) => ({ ...acc, [key]: [] }), {});
+const parseFirmwareReleases = (json, deviceModel) => {
     Object.keys(json).forEach(key => {
         const release = json[key];
         releases[deviceModel]?.push({
@@ -13,7 +13,7 @@ const parseFirmware = (json, deviceModel) => {
         });
     });
 };
-exports.parseFirmware = parseFirmware;
+exports.parseFirmwareReleases = parseFirmwareReleases;
 const getReleases = (deviceModel) => releases[deviceModel] || [];
 exports.getReleases = getReleases;
 const getChangelog = (releases2, features) => {
@@ -143,9 +143,13 @@ const getFirmwareStatus = (features) => {
     return 'valid';
 };
 exports.getFirmwareStatus = getFirmwareStatus;
-const getRelease = (features) => (0, exports.getInfo)({
+const getReleaseInfo = (features) => (0, exports.getInfo)({
     features,
     releases: (0, exports.getReleases)(features?.internal_model),
 });
+exports.getReleaseInfo = getReleaseInfo;
+const getRelease = (internalModel, firmwareVersion) => (0, exports.getReleases)(internalModel).find(r => firmwareVersion &&
+    utils_1.versionUtils.isVersionArray(firmwareVersion) &&
+    utils_1.versionUtils.isEqual(r.version, firmwareVersion));
 exports.getRelease = getRelease;
 //# sourceMappingURL=firmwareInfo.js.map

package/lib/data/models.d.ts

@@ -1,4 +1,4 @@
-import { DeviceModelInternal } from '@trezor/protobuf';
+import { DeviceModelInternal } from '@trezor/device-utils';
 type ModelConfig = {
     name: string;
     colors: Record<string, string>;

package/lib/data/transportInfo.d.ts

@@ -1,4 +1,3 @@
 import type { BridgeInfo } from '../events/transport';
-export declare const getBridgeInfo: () => BridgeInfo;
 export declare const suggestBridgeInstaller: (platform?: string) => BridgeInfo;
 //# sourceMappingURL=transportInfo.d.ts.map

package/lib/data/transportInfo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suggestBridgeInstaller = exports.getBridgeInfo = void 0;
+exports.suggestBridgeInstaller = void 0;
 const info = {
     version: [2, 0, 27],
     packages: [
@@ -40,9 +40,8 @@ const info = {
     changelog: '',
 };
 const getBridgeInfo = () => info;
-exports.getBridgeInfo = getBridgeInfo;
 const suggestBridgeInstaller = (platform) => {
-    const info2 = (0, exports.getBridgeInfo)();
+    const info2 = getBridgeInfo();
     if (platform) {
         info2.packages = info2.packages.map(p => ({
             ...p,

package/lib/data/version.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "9.5.1";
+export declare const VERSION = "9.5.2-beta.2";
 export declare const DEFAULT_DOMAIN: string;
 export declare const CONTENT_SCRIPT_VERSION = 1;
 export declare const DEEPLINK_VERSION = 1;

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEEPLINK_VERSION = exports.CONTENT_SCRIPT_VERSION = exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.5.1';
+exports.VERSION = '9.5.2-beta.2';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 const isBeta = exports.VERSION.includes('beta');
 exports.DEFAULT_DOMAIN = isBeta