@trezor/connect 9.4.7 → 9.4.8-beta.2

package/lib/core/index.js

@@ -3,22 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCoreState = exports.Core = void 0;
 const tslib_1 = require("tslib");
 const events_1 = tslib_1.__importDefault(require("events"));
+const connect_common_1 = require("@trezor/connect-common");
 const transport_1 = require("@trezor/transport");
 const utils_1 = require("@trezor/utils");
-const connect_common_1 = require("@trezor/connect-common");
+const constants_1 = require("../constants");
+const method_1 = require("./method");
+const onCallFirmwareUpdate_1 = require("./onCallFirmwareUpdate");
+const BlockchainLink_1 = require("../backend/BlockchainLink");
 const DataManager_1 = require("../data/DataManager");
-const DeviceList_1 = require("../device/DeviceList");
 const analyticsInfo_1 = require("../data/analyticsInfo");
-const constants_1 = require("../constants");
+const DeviceList_1 = require("../device/DeviceList");
+const StateStorage_1 = require("../device/StateStorage");
 const events_2 = require("../events");
-const method_1 = require("./method");
-const uiPromiseManager_1 = require("../utils/uiPromiseManager");
-const popupPromiseManager_1 = require("../utils/popupPromiseManager");
 const debug_1 = require("../utils/debug");
-const BlockchainLink_1 = require("../backend/BlockchainLink");
 const interactionTimeout_1 = require("../utils/interactionTimeout");
-const onCallFirmwareUpdate_1 = require("./onCallFirmwareUpdate");
-const StateStorage_1 = require("../device/StateStorage");
+const popupPromiseManager_1 = require("../utils/popupPromiseManager");
+const uiPromiseManager_1 = require("../utils/uiPromiseManager");
 const _log = (0, debug_1.initLog)('Core');
 const waitForPopup = ({ popupPromise, sendCoreMessage }) => {
     sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.REQUEST_UI_WINDOW));
@@ -31,7 +31,7 @@ const initDevice = async (context, methodCallDevice) => {
     var _a;
     const { uiPromises, deviceList, sendCoreMessage } = context;
     (0, DeviceList_1.assertDeviceListConnected)(deviceList);
-    const isWebUsb = deviceList.transportType() === 'WebUsbTransport';
+    const isWebUsb = deviceList.getActiveTransports().some(t => t.type === 'WebUsbTransport');
     let device;
     let showDeviceSelection = isWebUsb;
     const isUsingPopup = DataManager_1.DataManager.getSettings('popup');
@@ -326,9 +326,9 @@ const onCallDevice = async (context, message, method) => {
     var _a, _b, _c;
     const { deviceList, callMethods, getOverridePromise, setOverridePromise, sendCoreMessage } = context;
     const responseID = message.id;
-    const { origin, env, useCoreInPopup } = DataManager_1.DataManager.getSettings();
+    const { origin, env, useCoreInPopup, transports } = DataManager_1.DataManager.getSettings();
     if (!deviceList.isConnected() && !deviceList.pendingConnection()) {
-        deviceList.init();
+        deviceList.init({ transports });
     }
     await deviceList.pendingConnection();
     const shouldRetry = ['web', 'webextension'].includes(env);
@@ -397,6 +397,9 @@ const onCallDevice = async (context, message, method) => {
     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));
+    });
     if (useCoreInPopup && env === 'webextension' && origin) {
         device.initStorage(new StateStorage_1.WebextensionStateStorage(origin));
     }
@@ -566,7 +569,7 @@ const handleDeviceSelectionChanges = (context, interruptDevice) => {
     const promiseExists = uiPromises.exists(events_2.UI.RECEIVE_DEVICE);
     if (promiseExists && deviceList.isConnected()) {
         const onlyDevice = deviceList.getOnlyDevice();
-        const isWebUsb = deviceList.transportType() === 'WebUsbTransport';
+        const isWebUsb = deviceList.getActiveTransports().some(t => t.type === 'WebUsbTransport');
         if (onlyDevice && !isWebUsb) {
             uiPromises.resolve({
                 type: events_2.UI.RECEIVE_DEVICE,
@@ -593,23 +596,23 @@ const initDeviceList = (context) => {
     const { deviceList, sendCoreMessage } = context;
     deviceList.on(events_2.DEVICE.CONNECT, device => {
         handleDeviceSelectionChanges(context);
-        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT, device));
+        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT, device.toMessageObject()));
     });
     deviceList.on(events_2.DEVICE.CONNECT_UNACQUIRED, device => {
         handleDeviceSelectionChanges(context);
-        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT_UNACQUIRED, device));
+        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT_UNACQUIRED, device.toMessageObject()));
     });
     deviceList.on(events_2.DEVICE.DISCONNECT, device => {
         handleDeviceSelectionChanges(context);
-        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.DISCONNECT, device));
+        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.DISCONNECT, device.toMessageObject()));
     });
     deviceList.on(events_2.DEVICE.CHANGED, device => {
-        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CHANGED, device));
+        sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CHANGED, device.toMessageObject()));
     });
-    deviceList.on(transport_1.TRANSPORT.START, transportType => sendCoreMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.START, transportType)));
+    deviceList.on(transport_1.TRANSPORT.START, transport => sendCoreMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.START, transport)));
     deviceList.on(transport_1.TRANSPORT.ERROR, error => {
-        _log.warn('TRANSPORT.ERROR', error);
-        sendCoreMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
+        _log.warn('TRANSPORT.ERROR', error.error);
+        sendCoreMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, error));
     });
 };
 class Core extends events_1.default {
@@ -657,15 +660,14 @@ class Core extends events_1.default {
             resolveWaitForFirstMethod: () => {
                 this.waitForFirstMethod.resolve();
             },
-            getOverridePromise: () => {
-                return this.overridePromise;
-            },
+            getOverridePromise: () => this.overridePromise,
             setOverridePromise: (promise) => {
                 this.overridePromise = promise;
             },
         };
     }
     handleMessage(message) {
+        var _a;
         _log.debug('handleMessage', message);
         switch (message.type) {
             case events_2.POPUP.HANDSHAKE:
@@ -675,8 +677,19 @@ class Core extends events_1.default {
                 this.popupPromise.clear();
                 onPopupClosed(this.getCoreContext(), message.payload ? message.payload.error : null);
                 break;
-            case transport_1.TRANSPORT.DISABLE_WEBUSB:
-                disableWebUSBTransport(this.getCoreContext());
+            case transport_1.TRANSPORT.DISABLE_WEBUSB: {
+                const settings = DataManager_1.DataManager.getSettings();
+                const transports = (_a = settings.transports) === null || _a === void 0 ? void 0 : _a.filter(t => t !== 'WebUsbTransport');
+                if (transports && !transports.includes('BridgeTransport')) {
+                    transports.unshift('BridgeTransport');
+                }
+                settings.transports = transports;
+                resetTransports(this.getCoreContext());
+                break;
+            }
+            case transport_1.TRANSPORT.SET_TRANSPORTS:
+                DataManager_1.DataManager.getSettings().transports = message.payload.transports;
+                resetTransports(this.getCoreContext());
                 break;
             case transport_1.TRANSPORT.REQUEST_DEVICE:
                 if (this.deviceList.isConnected()) {
@@ -684,7 +697,7 @@ class Core extends events_1.default {
                 }
                 break;
             case transport_1.TRANSPORT.GET_INFO:
-                this.sendCoreMessage((0, events_2.createResponseMessage)(message.id, true, this.getTransportInfo()));
+                this.sendCoreMessage((0, events_2.createResponseMessage)(message.id, true, this.getActiveTransports()));
                 break;
             case events_2.UI.RECEIVE_DEVICE:
             case events_2.UI.RECEIVE_CONFIRMATION:
@@ -736,9 +749,9 @@ class Core extends events_1.default {
         await this.waitForFirstMethod.promise;
         return await this.methodSynchronize(() => this.callMethods[0]);
     }
-    getTransportInfo() {
+    getActiveTransports() {
         if (this.deviceList.isConnected()) {
-            return this.deviceList.getTransportInfo();
+            return this.deviceList.getActiveTransports();
         }
     }
     enumerate() {
@@ -776,15 +789,13 @@ class Core extends events_1.default {
         }
         const { transports, pendingTransportEvent, transportReconnect, coreMode } = DataManager_1.DataManager.getSettings();
         try {
-            this.deviceList.setTransports(transports);
+            this.deviceList.init({ transports, pendingTransportEvent, transportReconnect });
         }
         catch (error) {
-            _log.error('setTransports', error);
             this.sendCoreMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
             throttlePromise.reject(error);
             throw error;
         }
-        this.deviceList.init({ pendingTransportEvent, transportReconnect });
         if (!transportReconnect || coreMode === 'auto') {
             await this.deviceList.pendingConnection();
         }
@@ -794,25 +805,10 @@ class Core extends events_1.default {
     }
 }
 exports.Core = Core;
-const disableWebUSBTransport = async ({ deviceList, sendCoreMessage }) => {
-    if (!deviceList.isConnected())
-        return;
-    if (deviceList.transportType() !== 'WebUsbTransport')
-        return;
+const resetTransports = async ({ deviceList, sendCoreMessage }) => {
     const { transports, pendingTransportEvent, transportReconnect } = DataManager_1.DataManager.getSettings();
-    if (transports) {
-        const transportStr = transports === null || transports === void 0 ? void 0 : transports.filter(transport => typeof transport !== 'object');
-        if (transportStr.includes('WebUsbTransport')) {
-            transports.splice(transports.indexOf('WebUsbTransport'), 1);
-        }
-        if (!transportStr.includes('BridgeTransport')) {
-            transports.unshift('BridgeTransport');
-        }
-    }
     try {
-        deviceList.cleanup();
-        deviceList.setTransports(transports);
-        await deviceList.init({ pendingTransportEvent, transportReconnect });
+        await deviceList.init({ transports, pendingTransportEvent, transportReconnect });
     }
     catch (error) {
         sendCoreMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));

package/lib/core/onCallFirmwareUpdate.d.ts

@@ -1,8 +1,9 @@
+import type { Device } from '../device/Device';
 import { DeviceList } from '../device/DeviceList';
 import { CoreEventMessage } from '../events';
 import { CommonParams, DeviceUniquePath } from '../types';
+import { FirmwareUpdateResponse } from '../types/api/firmwareUpdate';
 import type { Log } from '../utils/debug';
-import type { Device } from '../device/Device';
 type PostMessage = (message: CoreEventMessage) => void;
 export type Params = {
     language?: string;
@@ -20,12 +21,6 @@ type Context = {
 export declare const onCallFirmwareUpdate: ({ params, context: { deviceList, postMessage, initDevice, log, abortSignal }, }: {
     params: Params;
     context: Context;
-}) => Promise<{
-    check: "other-error";
-    checkError: any;
-} | {
-    check: string;
-    checkError?: undefined;
-}>;
+}) => Promise<FirmwareUpdateResponse>;
 export {};
 //# sourceMappingURL=onCallFirmwareUpdate.d.ts.map

package/lib/core/onCallFirmwareUpdate.js

@@ -4,10 +4,10 @@ exports.onCallFirmwareUpdate = void 0;
 const crypto_1 = require("crypto");
 const utils_1 = require("@trezor/utils");
 const versionUtils_1 = require("@trezor/utils/lib/versionUtils");
-const events_1 = require("../events");
 const firmware_1 = require("../api/firmware");
-const firmwareInfo_1 = require("../data/firmwareInfo");
 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, {
@@ -48,8 +48,21 @@ const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, {
         }
         catch {
         }
+        if (reconnectedDevice &&
+            !reconnectedDevice.features &&
+            reconnectedDevice.handshakeFinished) {
+            log.debug('onCallFirmwareUpdate', 'we were unable to read device.features on the first interaction after seeing it, retrying...');
+            try {
+                await reconnectedDevice.run(undefined, {
+                    skipFirmwareChecks: true,
+                    skipLanguageChecks: true,
+                });
+            }
+            catch {
+            }
+        }
         i++;
-        log.debug('onCallFirmwareUpdate', 'waiting for device to reconnect', i);
+        log.debug('onCallFirmwareUpdate', '...still waiting for device to reconnect', i);
     } while (!abortSignal.aborted &&
         (!(reconnectedDevice === null || reconnectedDevice === void 0 ? void 0 : reconnectedDevice.features) ||
             bootloader === !reconnectedDevice.features.bootloader_mode ||
@@ -68,7 +81,9 @@ const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, {
     }
     registerEvents(reconnectedDevice, postMessage);
     await reconnectedDevice.waitForFirstRun();
-    await reconnectedDevice.acquire();
+    if (!reconnectedDevice.isUsedHere()) {
+        await reconnectedDevice.acquire();
+    }
     return reconnectedDevice;
 };
 const getInstallationParams = (device, params) => {
@@ -107,12 +122,20 @@ const getInstallationParams = (device, params) => {
     }
 };
 const getFwHeader = (binary) => Buffer.from(binary.slice(0, 6000)).toString('hex');
-const getBinaryHelper = (device, params, log, postMessage, btcOnly, intermediaryVersion) => {
+const getBinaryHelper = (device, params, log, postMessage, btcOnly) => {
     var _a;
+    if (params.binary) {
+        return {
+            binary: params.binary,
+            binaryVersion: (0, firmware_1.parseFirmwareHeaders)(Buffer.from(params.binary)).version,
+            releaseVersion: undefined,
+        };
+    }
     if (!device.firmwareRelease) {
         throw constants_1.ERRORS.TypedError('Runtime', 'device.firmwareRelease is not set');
     }
-    log.debug('onCallFirmwareUpdate loading binary', 'intermediaryVersion', intermediaryVersion, 'version', device.firmwareRelease.release.version, 'btcOnly', btcOnly);
+    const { intermediaryVersion, release: { version }, } = device.firmwareRelease;
+    log.debug('onCallFirmwareUpdate loading binary', 'intermediaryVersion', intermediaryVersion, 'version', version, 'btcOnly', btcOnly);
     postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_PROGRESS, {
         device: device.toMessageObject(),
         operation: 'downloading',
@@ -122,7 +145,7 @@ const getBinaryHelper = (device, params, log, postMessage, btcOnly, intermediary
         features: device.features,
         releases: (0, firmwareInfo_1.getReleases)((_a = device.features) === null || _a === void 0 ? void 0 : _a.internal_model),
         baseUrl: params.baseUrl || 'https://data.trezor.io',
-        version: device.firmwareRelease.release.version,
+        version,
         btcOnly,
         intermediaryVersion,
     })
@@ -138,7 +161,11 @@ const getBinaryHelper = (device, params, log, postMessage, btcOnly, intermediary
             operation: 'downloading',
             progress: 100,
         }));
-        return res;
+        return {
+            binary: res,
+            binaryVersion: (0, firmware_1.parseFirmwareHeaders)(Buffer.from(res)).version,
+            releaseVersion: version,
+        };
     });
 };
 const firmwareCheck = async (reconnectedDevice, device, stripped, postMessage) => {
@@ -161,12 +188,9 @@ const firmwareCheck = async (reconnectedDevice, device, stripped, postMessage) =
         getFirmwareHashResponse.message.hash === hash);
 };
 const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage, initDevice, log, abortSignal }, }) => {
-    var _a;
+    var _a, _b;
     log.debug('onCallFirmwareUpdate with params: ', params);
     const device = await initDevice((_a = params === null || params === void 0 ? void 0 : params.device) === null || _a === void 0 ? void 0 : _a.path);
-    if (!device.firmwareRelease) {
-        throw constants_1.ERRORS.TypedError('Runtime', 'device.firmwareRelease is not set');
-    }
     if (deviceList.getDeviceCount() > 1) {
         throw constants_1.ERRORS.TypedError('Device_MultipleNotSupported', 'Firmware update allowed with only 1 device connected');
     }
@@ -179,8 +203,8 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
         language,
         btcOnly,
     });
-    const binary = params.binary ||
-        (await getBinaryHelper(device, params, log, postMessage, btcOnly, device.firmwareRelease.intermediaryVersion));
+    let binaryInfo = await getBinaryHelper(device, params, log, postMessage, btcOnly);
+    const { binary } = binaryInfo;
     const deviceInitiallyConnectedInBootloader = device.features.bootloader_mode;
     const deviceInitiallyConnectedWithoutFirmware = device.features.firmware_present === false;
     let reconnectedDevice = device;
@@ -200,7 +224,7 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
             : {};
         await device.acquire();
         const targetLanguage = params.language || device.features.language || 'en-US';
-        const languageBlob = language && targetLanguage !== 'en-US'
+        const languageBlob = device.firmwareRelease && language && targetLanguage !== 'en-US'
             ? await (0, firmware_1.getLanguage)({
                 language: targetLanguage,
                 version: device.firmwareRelease.release.version,
@@ -231,14 +255,16 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
         }
         reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'auto' }, { deviceList, device, log, postMessage, abortSignal });
     }
-    const intermediary = !params.binary && device.firmwareRelease.intermediaryVersion;
+    const intermediary = !params.binary && ((_b = device.firmwareRelease) === null || _b === void 0 ? void 0 : _b.intermediaryVersion);
+    const bootloaderVersion = reconnectedDevice.getVersion();
     await reconnectedDevice.initialize(false);
     let stripped = (0, firmware_1.stripFwHeaders)(binary);
     await (0, firmware_1.uploadFirmware)(reconnectedDevice.getCommands().typedCall.bind(reconnectedDevice.getCommands()), postMessage, reconnectedDevice, { payload: !intermediary && (0, firmware_1.shouldStripFwHeaders)(device.features) ? stripped : binary });
     await reconnectedDevice.release();
     if (intermediary) {
         reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'manual', intermediary: true }, { deviceList, device: reconnectedDevice, log, postMessage, abortSignal });
-        stripped = (0, firmware_1.stripFwHeaders)(await getBinaryHelper(reconnectedDevice, params, log, postMessage, btcOnly));
+        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 });
         await reconnectedDevice.release();
@@ -256,6 +282,21 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
         }
     }
     const checkSupported = reconnectedDevice.atLeast(constants_1.FIRMWARE.FW_HASH_SUPPORTED_VERSIONS) && !params.binary;
+    let check;
+    const installedVersion = reconnectedDevice.getVersion();
+    if (!bootloaderVersion || !installedVersion) {
+        throw constants_1.ERRORS.TypedError('Runtime', 'reconnectedDevice.installedVersion is not set');
+    }
+    const { binaryVersion, releaseVersion } = binaryInfo;
+    const assertBinaryVersion = (0, versionUtils_1.isEqual)(installedVersion, binaryVersion);
+    const assertReleaseVersion = releaseVersion ? (0, versionUtils_1.isEqual)(installedVersion, releaseVersion) : true;
+    const versionDetails = {
+        versionCheck: assertBinaryVersion && assertReleaseVersion,
+        bootloaderVersion,
+        installedVersion,
+        binaryVersion,
+        releaseVersion,
+    };
     if (checkSupported) {
         try {
             log.debug('onCallFirmwareUpdate', 'getFirmwareHash supported, proceed with check', stripped);
@@ -263,20 +304,21 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
             await reconnectedDevice.release();
             if (isValid) {
                 log.debug('onCallFirmwareUpdate', 'installed fw hash and calculated hash match');
-                return { check: 'valid' };
+                check = 'valid';
             }
             else {
-                return { check: 'mismatch' };
+                check = 'mismatch';
             }
         }
         catch (err) {
-            return { check: 'other-error', checkError: err.message };
+            return { check: 'other-error', checkError: err.message, ...versionDetails };
         }
     }
     else {
         await reconnectedDevice.release();
-        return { check: 'omitted' };
+        check = 'omitted';
     }
+    return { check, ...versionDetails };
 };
 exports.onCallFirmwareUpdate = onCallFirmwareUpdate;
 //# sourceMappingURL=onCallFirmwareUpdate.js.map

package/lib/data/DataManager.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataManager = void 0;
 const tslib_1 = require("tslib");
-const coins_json_1 = tslib_1.__importDefault(require("@trezor/connect-common/files/coins.json"));
 const coins_eth_json_1 = tslib_1.__importDefault(require("@trezor/connect-common/files/coins-eth.json"));
-const releases_json_1 = tslib_1.__importDefault(require("@trezor/connect-common/files/bridge/releases.json"));
+const coins_json_1 = tslib_1.__importDefault(require("@trezor/connect-common/files/coins.json"));
 const messages_json_1 = tslib_1.__importDefault(require("@trezor/protobuf/messages.json"));
 const coinInfo_1 = require("./coinInfo");
 const firmwareInfo_1 = require("./firmwareInfo");
-const transportInfo_1 = require("./transportInfo");
 const types_1 = require("../types");
 const assetUtils_1 = require("../utils/assetUtils");
 class DataManager {
@@ -19,14 +17,12 @@ class DataManager {
         const assetsMap = {
             coins: coins_json_1.default,
             coinsEth: coins_eth_json_1.default,
-            bridge: releases_json_1.default,
             ...Object.fromEntries(Object.entries(assetUtils_1.firmwareAssets).map(([key, value]) => [
                 `firmware-${key.toLowerCase()}`,
                 value,
             ])),
         };
         Object.assign(this.assets, assetsMap);
-        (0, transportInfo_1.parseBridgeJSON)(this.assets.bridge);
         (0, coinInfo_1.parseCoinsJson)({
             ...this.assets.coins,
             ...this.assets.coinsEth,