@trezor/connect 9.1.3 → 9.1.4

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 9.1.4
+
+-   feat(connect-popup): add metamask extension id to known third party (f137b3e4d6)
+-   test(connect): composeTransaction fix doge fee (69a92483c6)
+-   refactor(connect): remove doge fee branch (c79f3f25d8)
+-   feat(transport): udp support for transport methods (65e617195c)
+-   fix(connect): accept signTransaction inputs/outputs with `address_n: string` (82910e0766)
+-   fix(connect-explorer, connect-popup): add favicon (cafb574ada, c6071123f3)
+-   feat(connect-popup): use trezor icons with display off from suite-data (1c806519a7)
+-   feat(connect): trezor color in device object (31535e2b0f)
+-   feat(connect): trezor name in device object (a0ecb66390)
+-   feat(connect-common): copy models.json from submodules (6d80197523)
+-   fix(connect-iframe): device event not propagating to host (d35e37863a)
+-   feat(connect, suite): unify no backup warning button text (375f3fa1a1)
+-   feat(connect): add suppressBackupWarning param to getPublicKey and getAccountInfo (2c2698d8af)
+-   fix(type-check): connect-web includes connect-iframe package.json (f9f576ab66)
+-   fix(connect-iframe): method.initAsync method superfluous call (37ace99a5d)
+-   fix(connect-iframe): define plugin in build to support analytics (c793ce358c)
+
 # 9.1.3
 
 -   fix(connect): correct import of internal connect dependency (https://github.com/trezor/trezor-suite/issues/9389)

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.1.3
+API version 9.1.4
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/connect-test.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/connect-test.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)
@@ -47,6 +47,8 @@ Version 9 is available as `@trezor/connect` and `@trezor/connect-web` npm packag
 
 New major version is released when there are breaking changes on API level. Previous major version will be maintained for 12 months and after this period it can be taken down without notice.
 
+Current major version 9 is being developed on top of `develop` branch. When there is a new major version a new branch should be created (`v-<major-version>`) and mantained separately.
+
 ### Minor version
 
 Minor versions are released when there are:

package/lib/api/bitcoin/TransactionComposer.js

@@ -121,14 +121,6 @@ class TransactionComposer {
         const changeAddress = addresses.change.find(a => !a.transfers) ||
             addresses.change[addresses.change.length - 1];
         const changeId = (0, pathUtils_1.getHDPath)(changeAddress.path).slice(-1)[0];
-        const enhancement = {
-            baseFee,
-            floorBaseFee: false,
-            dustOutputFee: 0,
-        };
-        if (coinInfo.shortcut === 'DOGE') {
-            enhancement.dustOutputFee = 1000000;
-        }
         return (0, utxo_lib_1.composeTx)({
             txType: account.type,
             utxos: this.utxos,
@@ -142,7 +134,7 @@ class TransactionComposer {
             changeId,
             changeAddress: changeAddress.address,
             dustThreshold: coinInfo.dustLimit,
-            ...enhancement,
+            baseFee,
         });
     }
     dispose() {

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

@@ -1,8 +1,8 @@
 import type { ComposedTxInput } from '@trezor/utxo-lib';
 import type { TypedRawTransaction } from '@trezor/blockchain-link';
-import type { BitcoinNetworkInfo } from '../../types';
+import type { BitcoinNetworkInfo, ProtoWithDerivationPath } from '../../types';
 import type { PROTO } from '../../constants';
-export declare const validateTrezorInputs: (inputs: PROTO.TxInputType[], coinInfo: BitcoinNetworkInfo) => PROTO.TxInputType[];
+export declare const validateTrezorInputs: (inputs: ProtoWithDerivationPath<PROTO.TxInputType>[], coinInfo: BitcoinNetworkInfo) => PROTO.TxInputType[];
 export declare const enhanceTrezorInputs: (inputs: PROTO.TxInputType[], rawTxs: TypedRawTransaction[]) => void;
 export declare const inputToTrezor: (input: ComposedTxInput, sequence: number) => PROTO.TxInputType;
 //# sourceMappingURL=inputs.d.ts.map

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

@@ -1,8 +1,8 @@
 import type { ComposeOutput as UtxoLibOutput, ComposedTxOutput } from '@trezor/utxo-lib';
 import { PROTO } from '../../constants';
-import type { BitcoinNetworkInfo } from '../../types';
+import type { BitcoinNetworkInfo, ProtoWithDerivationPath } from '../../types';
 import type { ComposeOutput } from '../../types/api/composeTransaction';
-export declare const validateTrezorOutputs: (outputs: PROTO.TxOutputType[], coinInfo: BitcoinNetworkInfo) => PROTO.TxOutputType[];
+export declare const validateTrezorOutputs: (outputs: ProtoWithDerivationPath<PROTO.TxOutputType>[], coinInfo: BitcoinNetworkInfo) => PROTO.TxOutputType[];
 export declare const validateHDOutput: (output: ComposeOutput, coinInfo: BitcoinNetworkInfo) => UtxoLibOutput;
 export declare const outputToTrezor: (output: ComposedTxOutput, _coinInfo: BitcoinNetworkInfo) => PROTO.TxOutputType;
 //# sourceMappingURL=outputs.d.ts.map

package/lib/api/cardanoGetPublicKey.d.ts

@@ -1,12 +1,16 @@
 import { PROTO } from '../constants';
 import { AbstractMethod } from '../core/AbstractMethod';
-export default class CardanoGetPublicKey extends AbstractMethod<'cardanoGetPublicKey', PROTO.CardanoGetPublicKey[]> {
+interface Params extends PROTO.CardanoGetPublicKey {
+    suppressBackupWarning?: boolean;
+}
+export default class CardanoGetPublicKey extends AbstractMethod<'cardanoGetPublicKey', Params[]> {
     hasBundle?: boolean;
     confirmed?: boolean;
     init(): void;
     get info(): string;
     confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    noBackupConfirmation(allowSuppression?: boolean): Promise<boolean>;
     run(): Promise<import("..").CardanoPublicKey | import("..").CardanoPublicKey[]>;
 }
+export {};
 //# sourceMappingURL=cardanoGetPublicKey.d.ts.map

package/lib/api/cardanoGetPublicKey.js

@@ -20,6 +20,7 @@ class CardanoGetPublicKey extends AbstractMethod_1.AbstractMethod {
                 { name: 'path', required: true },
                 { name: 'derivationType', type: 'number' },
                 { name: 'showOnTrezor', type: 'boolean' },
+                { name: 'suppressBackupWarning', type: 'boolean' },
             ]);
             const path = (0, pathUtils_1.validatePath)(batch.path, 3);
             return {
@@ -28,6 +29,7 @@ class CardanoGetPublicKey extends AbstractMethod_1.AbstractMethod {
                     ? batch.derivationType
                     : constants_1.PROTO.CardanoDerivationType.ICARUS_TREZOR,
                 show_display: typeof batch.showOnTrezor === 'boolean' ? batch.showOnTrezor : false,
+                suppress_backup_warning: batch.suppressBackupWarning,
             };
         });
     }
@@ -54,7 +56,11 @@ class CardanoGetPublicKey extends AbstractMethod_1.AbstractMethod {
         this.confirmed = uiResp.payload;
         return this.confirmed;
     }
-    async noBackupConfirmation() {
+    async noBackupConfirmation(allowSuppression) {
+        if (allowSuppression &&
+            this.params.every(batch => batch.suppressBackupWarning || !batch.show_display)) {
+            return true;
+        }
         await this.getPopupPromise().promise;
         const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
         this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {

package/lib/api/checkFirmwareAuthenticity.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const randombytes_1 = tslib_1.__importDefault(require("randombytes"));
+const crypto_1 = require("crypto");
 const AbstractMethod_1 = require("../core/AbstractMethod");
 const firmware_1 = require("./firmware");
 const firmwareInfo_1 = require("../data/firmwareInfo");
@@ -28,7 +27,7 @@ class CheckFirmwareAuthenticity extends AbstractMethod_1.AbstractMethod {
         if (!fw) {
             throw constants_1.ERRORS.TypedError('Runtime', 'checkFirmwareAuthenticity: firmware binary not found');
         }
-        const { hash: expectedFirmwareHash, challenge } = (0, firmware_1.calculateFirmwareHash)(device.features.major_version, (0, firmware_1.stripFwHeaders)(fw), (0, randombytes_1.default)(32));
+        const { hash: expectedFirmwareHash, challenge } = (0, firmware_1.calculateFirmwareHash)(device.features.major_version, (0, firmware_1.stripFwHeaders)(fw), (0, crypto_1.randomBytes)(32));
         const result = await this.device
             .getCommands()
             .typedCall('GetFirmwareHash', 'FirmwareHash', {

package/lib/api/common/paramsValidator.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirmwareRange = exports.validateCoinPath = exports.validateParams = void 0;
+const utils_1 = require("@trezor/utils");
 const constants_1 = require("../../constants");
 const pathUtils_1 = require("../../utils/pathUtils");
-const versionUtils_1 = require("../../utils/versionUtils");
 const config_1 = require("../../data/config");
 const invalidParameter = (message) => constants_1.ERRORS.TypedError('Method_InvalidParameter', message);
 function validateParams(params, schema) {
@@ -73,13 +73,13 @@ const getFirmwareRange = (method, coinInfo, currentRange) => {
         if (!coinInfo.support || typeof coinInfo.support.trezor1 !== 'string') {
             current['1'].min = '0';
         }
-        else if ((0, versionUtils_1.versionCompare)(coinInfo.support.trezor1, current['1'].min) > 0) {
+        else if (utils_1.versionUtils.isNewer(coinInfo.support.trezor1, current['1'].min)) {
             current['1'].min = coinInfo.support.trezor1;
         }
         if (!coinInfo.support || typeof coinInfo.support.trezor2 !== 'string') {
             current['2'].min = '0';
         }
-        else if ((0, versionUtils_1.versionCompare)(coinInfo.support.trezor2, current['2'].min) > 0) {
+        else if (utils_1.versionUtils.isNewer(coinInfo.support.trezor2, current['2'].min)) {
             current['2'].min = coinInfo.support.trezor2;
         }
     }
@@ -111,12 +111,12 @@ const getFirmwareRange = (method, coinInfo, currentRange) => {
             const [t1, t2] = min;
             if (t1 === '0' ||
                 current['1'].min === '0' ||
-                (0, versionUtils_1.versionCompare)(current['1'].min, t1) < 0) {
+                !utils_1.versionUtils.isNewerOrEqual(current['1'].min, t1)) {
                 current['1'].min = t1;
             }
             if (t2 === '0' ||
                 current['2'].min === '0' ||
-                (0, versionUtils_1.versionCompare)(current['2'].min, t2) < 0) {
+                !utils_1.versionUtils.isNewerOrEqual(current['2'].min, t2)) {
                 current['2'].min = t2;
             }
         }
@@ -124,12 +124,12 @@ const getFirmwareRange = (method, coinInfo, currentRange) => {
             const [t1, t2] = max;
             if (t1 === '0' ||
                 current['1'].max === '0' ||
-                (0, versionUtils_1.versionCompare)(current['1'].max, t1) < 0) {
+                !utils_1.versionUtils.isNewerOrEqual(current['1'].max, t1)) {
                 current['1'].max = t1;
             }
             if (t2 === '0' ||
                 current['2'].max === '0' ||
-                (0, versionUtils_1.versionCompare)(current['2'].max, t2) < 0) {
+                !utils_1.versionUtils.isNewerOrEqual(current['2'].max, t2)) {
                 current['2'].max = t2;
             }
         }

package/lib/api/eos/eosSignTx.js

@@ -102,7 +102,7 @@ const parseAuth = (a) => {
         const key = Buffer.from(bs58.decode(pk.substring(len)));
         return {
             type: 0,
-            key: key.slice(0, key.length - 4).toString('hex'),
+            key: key.subarray(0, key.length - 4).toString('hex'),
         };
     };
     return {

package/lib/api/firmwareUpdate.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const randombytes_1 = tslib_1.__importDefault(require("randombytes"));
+const crypto_1 = require("crypto");
 const AbstractMethod_1 = require("../core/AbstractMethod");
 const constants_1 = require("../constants");
 const events_1 = require("../events");
@@ -76,7 +75,7 @@ class FirmwareUpdate extends AbstractMethod_1.AbstractMethod {
         }
         const stripped = (0, firmware_1.stripFwHeaders)(binary);
         await (0, firmware_1.uploadFirmware)(this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: (0, firmware_1.shouldStripFwHeaders)(device.features) ? stripped : binary });
-        return (0, firmware_1.calculateFirmwareHash)(device.features.major_version, stripped, (0, randombytes_1.default)(32));
+        return (0, firmware_1.calculateFirmwareHash)(device.features.major_version, stripped, (0, crypto_1.randomBytes)(32));
     }
 }
 exports.default = FirmwareUpdate;

package/lib/api/getAccountInfo.d.ts

@@ -13,7 +13,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
     init(): void;
     get info(): string;
     confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    noBackupConfirmation(allowSuppression?: boolean): Promise<boolean>;
     checkFirmwareRange(isUsingPopup: boolean): Promise<"ui-device_firmware_old" | "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined>;
     run(): Promise<AccountInfo | (AccountInfo | null)[] | {
         utxo: AccountUtxo[] | undefined;

package/lib/api/getAccountInfo.js

@@ -41,6 +41,7 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
                 { name: 'marker', type: 'object' },
                 { name: 'defaultAccountType', type: 'string' },
                 { name: 'derivationType', type: 'number' },
+                { name: 'suppressBackupWarning', type: 'boolean' },
             ]);
             const coinInfo = (0, coinInfo_1.getCoinInfo)(batch.coin);
             if (!coinInfo) {
@@ -119,7 +120,10 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
         const uiResp = await uiPromise.promise;
         return uiResp.payload;
     }
-    async noBackupConfirmation() {
+    async noBackupConfirmation(allowSuppression) {
+        if (allowSuppression && this.params.every(batch => batch.suppressBackupWarning)) {
+            return true;
+        }
         await this.getPopupPromise().promise;
         const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
         this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {

package/lib/api/getPublicKey.d.ts

@@ -3,6 +3,7 @@ import type { BitcoinNetworkInfo } from '../types';
 import type { PROTO } from '../constants';
 type Params = PROTO.GetPublicKey & {
     coinInfo?: BitcoinNetworkInfo;
+    suppressBackupWarning?: boolean;
     unlockPath?: PROTO.UnlockPath;
 };
 export default class GetPublicKey extends AbstractMethod<'getPublicKey', Params[]> {
@@ -11,7 +12,7 @@ export default class GetPublicKey extends AbstractMethod<'getPublicKey', Params[
     init(): void;
     get info(): string;
     confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    noBackupConfirmation(allowSuppression?: boolean): Promise<boolean>;
     run(): Promise<import("../types/api/getPublicKey").HDNodeResponse | import("../types/api/getPublicKey").HDNodeResponse[]>;
 }
 export {};

package/lib/api/getPublicKey.js

@@ -24,6 +24,7 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
                 { name: 'ignoreXpubMagic', type: 'boolean' },
                 { name: 'ecdsaCurveName', type: 'boolean' },
                 { name: 'unlockPath', type: 'object' },
+                { name: 'suppressBackupWarning', type: 'boolean' },
             ]);
             if (batch.unlockPath) {
                 (0, paramsValidator_1.validateParams)(batch.unlockPath, [
@@ -54,6 +55,7 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
                 ecdsa_curve_name: batch.ecdsaCurveName,
                 coinInfo,
                 unlockPath: batch.unlockPath,
+                suppress_backup_warning: batch.suppressBackupWarning,
             };
         });
     }
@@ -80,7 +82,11 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
         this.confirmed = uiResp.payload;
         return this.confirmed;
     }
-    async noBackupConfirmation() {
+    async noBackupConfirmation(allowSuppression) {
+        if (allowSuppression &&
+            this.params.every(batch => batch.suppressBackupWarning || !batch.show_display)) {
+            return true;
+        }
         await this.getPopupPromise().promise;
         const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
         this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {

package/lib/api/signTransaction.js

@@ -70,7 +70,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
         }
         this.params = {
             inputs,
-            outputs: payload.outputs,
+            outputs,
             paymentRequests: payload.paymentRequests || [],
             refTxs,
             addresses: payload.account ? payload.account.addresses : undefined,

package/lib/core/AbstractMethod.d.ts

@@ -1,6 +1,6 @@
+import { Deferred } from '@trezor/utils';
 import { NETWORK } from '../constants';
-import { CallMethodPayload, CallMethodResponse, UiRequestButtonData, UiPromise, UiPromiseResponse, PostMessage } from '../events';
-import { Deferred } from '../utils/deferred';
+import { CallMethodPayload, CallMethodResponse, UiRequestButtonData, UiPromiseCreator, PostMessage } from '../events';
 import type { Device } from '../device/Device';
 import type { FirmwareRange } from '../types';
 export type Payload<M> = Extract<CallMethodPayload, {
@@ -37,11 +37,11 @@ export declare abstract class AbstractMethod<Name extends CallMethodPayload['met
     network: NETWORK.NetworkType;
     useCardanoDerivation: boolean;
     confirmation?(): Promise<boolean | undefined>;
-    noBackupConfirmation?(): Promise<boolean>;
+    noBackupConfirmation?(allowSuppression?: boolean): Promise<boolean>;
     getButtonRequestData?(code: string): UiRequestButtonData | undefined;
     postMessage: PostMessage;
     getPopupPromise: () => Deferred<void>;
-    createUiPromise: <T extends UiPromiseResponse['type']>(promiseId: T, device?: Device) => UiPromise<T>;
+    createUiPromise: UiPromiseCreator;
     removeUiPromise: (promise: Deferred<any>) => void;
     initAsync?(): Promise<void>;
     initAsyncPromise?: Promise<void>;

package/lib/core/AbstractMethod.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractMethod = void 0;
 const connect_common_1 = require("@trezor/connect-common");
+const utils_1 = require("@trezor/utils");
 const DataManager_1 = require("../data/DataManager");
 const constants_1 = require("../constants");
 const events_1 = require("../events");
-const versionUtils_1 = require("../utils/versionUtils");
 const urlUtils_1 = require("../utils/urlUtils");
 class AbstractMethod {
     get info() {
@@ -139,10 +139,11 @@ class AbstractMethod {
         if (range.min === '0') {
             return events_1.UI.FIRMWARE_NOT_SUPPORTED;
         }
-        if (device.firmwareStatus === 'required' || (0, versionUtils_1.versionCompare)(version, range.min) < 0) {
+        if (device.firmwareStatus === 'required' ||
+            !utils_1.versionUtils.isNewerOrEqual(version.join('.'), range.min)) {
             return events_1.UI.FIRMWARE_OLD;
         }
-        if (range.max !== '0' && (0, versionUtils_1.versionCompare)(version, range.max) > 0) {
+        if (range.max !== '0' && utils_1.versionUtils.isNewer(version.join('.'), range.max)) {
             if (isUsingPopup) {
                 await this.getPopupPromise().promise;
                 const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);

package/lib/core/index.js

@@ -4,13 +4,13 @@ exports.initTransport = exports.initCore = exports.Core = exports.onCall = expor
 const tslib_1 = require("tslib");
 const events_1 = tslib_1.__importDefault(require("events"));
 const transport_1 = require("@trezor/transport");
+const utils_1 = require("@trezor/utils");
 const DataManager_1 = require("../data/DataManager");
 const DeviceList_1 = require("../device/DeviceList");
 const analyticsInfo_1 = require("../data/analyticsInfo");
 const constants_1 = require("../constants");
 const events_2 = require("../events");
 const method_1 = require("./method");
-const deferred_1 = require("../utils/deferred");
 const promiseUtils_1 = require("../utils/promiseUtils");
 const debug_1 = require("../utils/debug");
 const BlockchainLink_1 = require("../backend/BlockchainLink");
@@ -18,7 +18,7 @@ const interactionTimeout_1 = require("../utils/interactionTimeout");
 let _core;
 let _deviceList;
 let _popupPromise;
-let _uiPromises = [];
+const _uiPromises = [];
 const _callMethods = [];
 let _preferredDevice;
 let _interactionTimeout;
@@ -39,7 +39,7 @@ const getPopupPromise = (requestWindow = true) => {
         postMessage((0, events_2.createUiMessage)(events_2.UI.REQUEST_UI_WINDOW));
     }
     if (!_popupPromise) {
-        _popupPromise = (0, deferred_1.create)();
+        _popupPromise = (0, utils_1.createDeferred)();
     }
     return _popupPromise;
 };
@@ -47,14 +47,17 @@ const interactionTimeout = () => _interactionTimeout.start(() => {
     onPopupClosed('Interaction timeout');
 });
 const createUiPromise = (promiseEvent, device) => {
-    const uiPromise = (0, deferred_1.create)(promiseEvent, device);
+    const uiPromise = {
+        ...(0, utils_1.createDeferred)(promiseEvent),
+        device,
+    };
     _uiPromises.push(uiPromise);
     interactionTimeout();
     return uiPromise;
 };
 const findUiPromise = (promiseEvent) => _uiPromises.find(p => p.id === promiseEvent);
 const removeUiPromise = (promise) => {
-    _uiPromises = _uiPromises.filter(p => p !== promise);
+    _uiPromises.splice(0).push(..._uiPromises.filter(p => p !== promise));
 };
 const handleMessage = (message) => {
     _log.debug('handleMessage', message);
@@ -292,7 +295,7 @@ const onCall = async (message) => {
             }
             const deviceNeedsBackup = device.features.needs_backup;
             if (deviceNeedsBackup && typeof method.noBackupConfirmation === 'function') {
-                const permitted = await method.noBackupConfirmation();
+                const permitted = await method.noBackupConfirmation(!isUsingPopup);
                 if (!permitted) {
                     return Promise.reject(constants_1.ERRORS.TypedError('Method_PermissionsNotGranted'));
                 }
@@ -410,7 +413,7 @@ const onCall = async (message) => {
 exports.onCall = onCall;
 const cleanup = () => {
     _popupPromise = undefined;
-    _uiPromises = [];
+    _uiPromises.splice(0);
     _interactionTimeout.stop();
     _log.debug('Cleanup...');
 };
@@ -498,7 +501,7 @@ const onPopupClosed = (customErrorMessage) => {
             _uiPromises.forEach(p => {
                 p.reject(error);
             });
-            _uiPromises = [];
+            _uiPromises.splice(0);
         }
         if (_popupPromise) {
             _popupPromise.reject(error);
@@ -530,7 +533,7 @@ const handleDeviceSelectionChanges = (interruptDevice) => {
         const { path } = interruptDevice;
         let shouldClosePopup = false;
         _uiPromises.forEach(p => {
-            if (p.data && p.data.getDevicePath() === path) {
+            if (p.device && p.device.getDevicePath() === path) {
                 if (p.id === events_2.DEVICE.DISCONNECT) {
                     p.resolve({ type: events_2.DEVICE.DISCONNECT });
                 }

package/lib/data/coinInfo.d.ts

@@ -1,7 +1,7 @@
-import type { CoinInfo, BitcoinNetworkInfo, EthereumNetworkInfo, MiscNetworkInfo } from '../types/coinInfo';
-export declare const getBitcoinNetwork: (pathOrName: number[] | string) => BitcoinNetworkInfo | undefined;
-export declare const getEthereumNetwork: (pathOrName: number[] | string) => EthereumNetworkInfo | undefined;
-export declare const getMiscNetwork: (pathOrName: number[] | string) => MiscNetworkInfo | undefined;
+import type { CoinInfo, BitcoinNetworkInfo, EthereumNetworkInfo, MiscNetworkInfo, DerivationPath } from '../types';
+export declare const getBitcoinNetwork: (pathOrName: DerivationPath) => BitcoinNetworkInfo | undefined;
+export declare const getEthereumNetwork: (pathOrName: DerivationPath) => EthereumNetworkInfo | undefined;
+export declare const getMiscNetwork: (pathOrName: DerivationPath) => MiscNetworkInfo | undefined;
 export declare const getSegwitNetwork: (coin: BitcoinNetworkInfo) => {
     bip32: {
         public: number;
@@ -35,7 +35,7 @@ export declare const ethereumNetworkInfoBase: {
     minFee: number;
     maxFee: number;
     dustLimit: number;
-    defaultFees: import("..").FeeLevel[];
+    defaultFees: import("../types").FeeLevel[];
     type: "ethereum";
     decimals: number;
 };

package/lib/data/coinInfo.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllNetworks = exports.getUniqueNetworks = exports.parseCoinsJson = exports.ethereumNetworkInfoBase = exports.getCoinName = exports.getCoinInfo = exports.getCoinInfoByHash = exports.fixCoinInfoNetwork = exports.getBech32Network = exports.getSegwitNetwork = exports.getMiscNetwork = exports.getEthereumNetwork = exports.getBitcoinNetwork = void 0;
+const utils_1 = require("@trezor/utils");
 const defaultFeeLevels_1 = require("./defaultFeeLevels");
 const constants_1 = require("../constants");
 const pathUtils_1 = require("../utils/pathUtils");
-const utils_1 = require("@trezor/utils");
 const bitcoinNetworks = [];
 const ethereumNetworks = [];
 const miscNetworks = [];

package/lib/data/config.js

@@ -21,19 +21,18 @@ exports.config = {
             icon: '',
         },
         { origin: 'niebkpllfhmpfbffbfifagfgoamhpflf', label: 'Trezor Password Manager', icon: '' },
-        { origin: 'trezor-connect@trezor.io', label: 'Trezor Connect FF Extension', icon: '' },
         {
-            origin: 'efbfhenfhihgdcmnfdkhaphjdnopihlf',
-            label: 'Trezor Connect Chrome Extension',
+            origin: 'mnpfhpndmjholfdlhpkjfmjkgppmodaf',
+            label: 'MetaMask',
             icon: '',
         },
         {
-            origin: 'mnpfhpndmjholfdlhpkjfmjkgppmodaf',
+            origin: 'webextension@metamask.io',
             label: 'MetaMask',
             icon: '',
         },
         {
-            origin: 'webextension@metamask.io',
+            origin: 'nkbihfbeogaeaoehlefnkodbefgpgknn',
             label: 'MetaMask',
             icon: '',
         },

package/lib/data/firmwareInfo.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getReleases = exports.getRelease = exports.getFirmwareStatus = exports.getInfo = exports.parseFirmware = void 0;
 const utils_1 = require("@trezor/utils");
 const firmwareUtils_1 = require("../utils/firmwareUtils");
-const versionUtils_1 = require("../utils/versionUtils");
 const releases = {};
 releases[1] = [];
 releases[2] = [];
@@ -77,12 +76,12 @@ const getIntermediaryVersion = (releases, features, offerLatest) => {
 const getSafeReleases = ({ features, releases }) => {
     const { bootloader_mode, major_version, minor_version, patch_version, fw_major, fw_minor, fw_patch, } = features;
     const firmwareVersion = [major_version, minor_version, patch_version];
-    if (!(0, versionUtils_1.isVersionArray)(firmwareVersion)) {
+    if (!utils_1.versionUtils.isVersionArray(firmwareVersion)) {
         return [];
     }
     if (major_version === 2 && bootloader_mode) {
         const fwVersion = [fw_major, fw_minor, fw_patch];
-        if ((0, versionUtils_1.isVersionArray)(fwVersion)) {
+        if (utils_1.versionUtils.isVersionArray(fwVersion)) {
             return (0, firmwareUtils_1.filterSafeListByFirmware)(releases, fwVersion);
         }
         return (0, firmwareUtils_1.filterSafeListByBootloader)(releases, firmwareVersion);

package/lib/data/models.d.ts

@@ -0,0 +1,18 @@
+export declare const models: {
+    T1B1: {
+        name: string;
+        colors: {};
+    };
+    T2T1: {
+        name: string;
+        colors: {};
+    };
+    T2B1: {
+        name: string;
+        colors: {
+            '0': string;
+            '1': string;
+        };
+    };
+};
+//# sourceMappingURL=models.d.ts.map

package/lib/data/models.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.models = void 0;
+exports.models = {
+    T1B1: {
+        name: 'Trezor Model One',
+        colors: {},
+    },
+    T2T1: {
+        name: 'Trezor Model T',
+        colors: {},
+    },
+    T2B1: {
+        name: 'Trezor Model R',
+        colors: {
+            '0': 'Black',
+            '1': 'White',
+        },
+    },
+};
+//# sourceMappingURL=models.js.map

package/lib/data/version.d.ts

@@ -1,3 +1,3 @@
-export declare const VERSION = "9.1.3";
+export declare const VERSION = "9.1.4";
 export declare const DEFAULT_DOMAIN: string;
 //# sourceMappingURL=version.d.ts.map

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.1.3';
+exports.VERSION = '9.1.4';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 exports.DEFAULT_DOMAIN = `https://connect.trezor.io/${versionN[0]}/`;
 //# sourceMappingURL=version.js.map

package/lib/device/Device.d.ts

@@ -1,8 +1,8 @@
 import { TypedEmitter } from '@trezor/utils/lib/typedEventEmitter';
+import { Deferred } from '@trezor/utils';
 import { DeviceCommands } from './DeviceCommands';
 import { PROTO, NETWORK } from '../constants';
 import { DEVICE, DeviceButtonRequestPayload } from '../events';
-import { Deferred } from '../utils/deferred';
 import type { Transport, Descriptor } from '@trezor/transport';
 import { Device as DeviceTyped, DeviceFirmwareStatus, Features, ReleaseInfo, UnavailableCapabilities, FirmwareType } from '../types';
 export type RunOptions = {
@@ -32,7 +32,7 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
     featuresNeedsReload: boolean;
     acquirePromise?: ReturnType<Transport['acquire']>;
     releasePromise?: ReturnType<Transport['release']>;
-    runPromise?: Deferred<void> | null;
+    runPromise?: Deferred<void>;
     loaded: boolean;
     inconsistent: boolean;
     firstRunPromise: Deferred<boolean>;
@@ -45,6 +45,8 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
     unavailableCapabilities: UnavailableCapabilities;
     networkTypeState: NETWORK.NetworkType[];
     firmwareType?: FirmwareType;
+    name: string;
+    color?: string;
     constructor(transport: Transport, descriptor: Descriptor);
     static fromDescriptor(transport: Transport, originalDescriptor: Descriptor): Device;
     static createUnacquired(transport: Transport, descriptor: Descriptor, unreadableError?: string): Device;