@trezor/connect 9.0.11 → 9.1.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 9.1.1
+
+-   feat(connect-popup): added device model_internal in features
+-   feat(connect): add cancelCoinjoinAuthorization method
+-   feat(connect): added nodeusb transport. TrezorConnect is now capable of communicating with Trezor devices without using TrezorBridge (in node.js environment).
+-   feat(connect-popup): when a call to TrezorConnect returns `success: false` popup remains opened and displays error page instead.
+-   feat(connect-popup): add no-backup warning to getPublicKey method
+-   fix(connect): respect useEmptyPassphrase param in cipherKeyValue method
+
 # 9.0.11
 
 -   fix(connect-web): fix imports from connect

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.0.11
+API version 9.1.1
 
 [![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)
@@ -34,7 +34,7 @@ import TrezorConnect from '@trezor/connect';
 
 For more instructions [refer to this document](https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/index.md)
 
-## Version 9 (stable)
+## Versioning
 
 Since version 9 we are adopting a new versioning strategy. With every release, we are going to update two urls
 
@@ -43,6 +43,21 @@ Since version 9 we are adopting a new versioning strategy. With every release, w
 
 Version 9 is available as `@trezor/connect` and `@trezor/connect-web` npm packages.
 
+### Major version
+
+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.
+
+### Minor version
+
+Minor versions are released when there are:
+
+-   considerable additions to API
+-   changes in npm package
+
+### Patch version
+
+Everything else that does not fall under major or minor version.
+
 ## Version 8 (legacy)
 
 Legacy version 8 is accessible from url https://connect.trezor.io/8/trezor-connect.js.
@@ -57,6 +72,8 @@ With regards to this repo - All updates should go to current version branch, the
 
 For deployment process of trezor-connect v8 refer to [trezor/connect repository](https://github.com/trezor/connect/blob/develop/docs/deployment/index.md)
 
+Version 8 will go offline by the end of 2023.
+
 ## Docs
 
 Interactive API explorer is available on https://connect.trezor.io/9/#/

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

@@ -23,6 +23,7 @@ export declare const createPendingTransaction: (tx: BitcoinJsTransaction, { addr
         isAddress: boolean;
         addresses: string[];
         value: string;
+        sequence: number | undefined;
     }[];
     vout: {
         n: number;

package/lib/api/bitcoin/createPendingTx.js

@@ -32,6 +32,7 @@ const createPendingTransaction = (tx, { addresses, inputs, outputs, }) => {
             isAddress: true,
             addresses: findAddress(ins),
             value: ins.amount.toString(),
+            sequence: ins.sequence,
         })),
         vout: outputs.map((out, n) => {
             let transformedAddresses = [];

package/lib/api/cancelCoinjoinAuthorization.d.ts

@@ -0,0 +1,7 @@
+import { AbstractMethod } from '../core/AbstractMethod';
+import { PROTO } from '../constants';
+export default class CancelCoinjoinAuthorization extends AbstractMethod<'cancelCoinjoinAuthorization', PROTO.CancelAuthorization> {
+    init(): void;
+    run(): Promise<PROTO.Success>;
+}
+//# sourceMappingURL=cancelCoinjoinAuthorization.d.ts.map

package/lib/api/cancelCoinjoinAuthorization.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AbstractMethod_1 = require("../core/AbstractMethod");
+const paramsValidator_1 = require("./common/paramsValidator");
+class CancelCoinjoinAuthorization extends AbstractMethod_1.AbstractMethod {
+    init() {
+        const { payload } = this;
+        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
+        this.preauthorized =
+            typeof payload.preauthorized === 'boolean' ? payload.preauthorized : true;
+        this.info = 'Cancel Coinjoin Authorization';
+    }
+    async run() {
+        const cmd = this.device.getCommands();
+        if (!this.preauthorized) {
+            if (!(await cmd.preauthorize(false))) {
+                return { message: 'Not authorized' };
+            }
+        }
+        const response = await cmd.typedCall('CancelAuthorization', 'Success');
+        return response.message;
+    }
+}
+exports.default = CancelCoinjoinAuthorization;
+//# sourceMappingURL=cancelCoinjoinAuthorization.js.map

package/lib/api/cardanoGetPublicKey.d.ts

@@ -5,6 +5,7 @@ export default class CardanoGetPublicKey extends AbstractMethod<'cardanoGetPubli
     confirmed?: boolean;
     init(): void;
     confirmation(): Promise<boolean>;
+    noBackupConfirmation(): Promise<boolean>;
     run(): Promise<import("..").CardanoPublicKey | import("..").CardanoPublicKey[]>;
 }
 //# sourceMappingURL=cardanoGetPublicKey.d.ts.map

package/lib/api/cardanoGetPublicKey.js

@@ -52,6 +52,15 @@ class CardanoGetPublicKey extends AbstractMethod_1.AbstractMethod {
         this.confirmed = uiResp.payload;
         return this.confirmed;
     }
+    async noBackupConfirmation() {
+        await this.getPopupPromise().promise;
+        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
+        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+            view: 'get-public-key-no-backup',
+        }));
+        const uiResp = await uiPromise.promise;
+        return uiResp.payload;
+    }
     async run() {
         const responses = [];
         const cmd = this.device.getCommands();

package/lib/api/cipherKeyValue.js

@@ -8,12 +8,13 @@ class CipherKeyValue extends AbstractMethod_1.AbstractMethod {
     init() {
         this.requiredPermissions = ['read', 'write'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
-        this.info = 'Cypher key value';
-        this.useEmptyPassphrase = true;
+        this.info = 'Cipher key value';
         this.hasBundle = !!this.payload.bundle;
         const payload = !this.payload.bundle
             ? { ...this.payload, bundle: [this.payload] }
             : this.payload;
+        this.useEmptyPassphrase =
+            typeof payload.useEmptyPassphrase === 'boolean' ? payload.useEmptyPassphrase : true;
         (0, paramsValidator_1.validateParams)(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = payload.bundle.map(batch => {
             (0, paramsValidator_1.validateParams)(batch, [

package/lib/api/getAccountInfo.d.ts

@@ -28,6 +28,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
             unconfirmed: number;
             transactions?: import("packages/blockchain-link-types/lib/common").Transaction[] | undefined;
             txids?: string[] | undefined;
+            addrTxCount?: number | undefined;
         };
         misc?: {
             nonce?: string | undefined;
@@ -67,6 +68,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
             unconfirmed: number;
             transactions?: import("packages/blockchain-link-types/lib/common").Transaction[] | undefined;
             txids?: string[] | undefined;
+            addrTxCount?: number | undefined;
         };
         misc?: {
             nonce?: string | undefined;

package/lib/api/getPublicKey.d.ts

@@ -10,6 +10,7 @@ export default class GetPublicKey extends AbstractMethod<'getPublicKey', Params[
     confirmed?: boolean;
     init(): void;
     confirmation(): Promise<boolean>;
+    noBackupConfirmation(): Promise<boolean>;
     run(): Promise<import("../types/api/getPublicKey").HDNodeResponse | import("../types/api/getPublicKey").HDNodeResponse[]>;
 }
 export {};

package/lib/api/getPublicKey.js

@@ -78,6 +78,15 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
         this.confirmed = uiResp.payload;
         return this.confirmed;
     }
+    async noBackupConfirmation() {
+        await this.getPopupPromise().promise;
+        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
+        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+            view: 'get-public-key-no-backup',
+        }));
+        const uiResp = await uiPromise.promise;
+        return uiResp.payload;
+    }
     async run() {
         const responses = [];
         const cmd = this.device.getCommands();

package/lib/api/index.d.ts

@@ -1,6 +1,8 @@
 export { default as applyFlags } from './applyFlags';
 export { default as applySettings } from './applySettings';
 export { default as authorizeCoinjoin } from './authorizeCoinjoin';
+export { default as cancelCoinjoinAuthorization } from './cancelCoinjoinAuthorization';
+export { default as showDeviceTutorial } from './showDeviceTutorial';
 export { default as backupDevice } from './backupDevice';
 export { default as binanceGetAddress } from './binanceGetAddress';
 export { default as binanceGetPublicKey } from './binanceGetPublicKey';

package/lib/api/index.js

@@ -3,14 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestLogin = exports.recoveryDevice = exports.rebootToBootloader = exports.pushTransaction = exports.nemSignTransaction = exports.nemGetAddress = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.firmwareUpdate = exports.ethereumVerifyMessage = exports.ethereumSignTypedData = exports.ethereumSignTransaction = exports.ethereumSignMessage = exports.ethereumGetPublicKey = exports.ethereumGetAddress = exports.eosSignTransaction = exports.eosGetPublicKey = exports.composeTransaction = exports.cipherKeyValue = exports.changePin = exports.cardanoSignTransaction = exports.cardanoGetPublicKey = exports.cardanoGetNativeScriptHash = exports.cardanoGetAddress = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.binanceSignTransaction = exports.binanceGetPublicKey = exports.binanceGetAddress = exports.backupDevice = exports.authorizeCoinjoin = exports.applySettings = exports.applyFlags = void 0;
-exports.checkFirmwareAuthenticity = exports.wipeDevice = exports.verifyMessage = exports.unlockPath = exports.tezosSignTransaction = exports.tezosGetPublicKey = exports.tezosGetAddress = exports.stellarSignTransaction = exports.stellarGetAddress = exports.signTransaction = exports.signMessage = exports.setProxy = exports.setBusy = exports.rippleSignTransaction = exports.rippleGetAddress = exports.resetDevice = void 0;
+exports.rebootToBootloader = exports.pushTransaction = exports.nemSignTransaction = exports.nemGetAddress = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.firmwareUpdate = exports.ethereumVerifyMessage = exports.ethereumSignTypedData = exports.ethereumSignTransaction = exports.ethereumSignMessage = exports.ethereumGetPublicKey = exports.ethereumGetAddress = exports.eosSignTransaction = exports.eosGetPublicKey = exports.composeTransaction = exports.cipherKeyValue = exports.changePin = exports.cardanoSignTransaction = exports.cardanoGetPublicKey = exports.cardanoGetNativeScriptHash = exports.cardanoGetAddress = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.binanceSignTransaction = exports.binanceGetPublicKey = exports.binanceGetAddress = exports.backupDevice = exports.showDeviceTutorial = exports.cancelCoinjoinAuthorization = exports.authorizeCoinjoin = exports.applySettings = exports.applyFlags = void 0;
+exports.checkFirmwareAuthenticity = exports.wipeDevice = exports.verifyMessage = exports.unlockPath = exports.tezosSignTransaction = exports.tezosGetPublicKey = exports.tezosGetAddress = exports.stellarSignTransaction = exports.stellarGetAddress = exports.signTransaction = exports.signMessage = exports.setProxy = exports.setBusy = exports.rippleSignTransaction = exports.rippleGetAddress = exports.resetDevice = exports.requestLogin = exports.recoveryDevice = void 0;
 var applyFlags_1 = require("./applyFlags");
 Object.defineProperty(exports, "applyFlags", { enumerable: true, get: function () { return __importDefault(applyFlags_1).default; } });
 var applySettings_1 = require("./applySettings");
 Object.defineProperty(exports, "applySettings", { enumerable: true, get: function () { return __importDefault(applySettings_1).default; } });
 var authorizeCoinjoin_1 = require("./authorizeCoinjoin");
 Object.defineProperty(exports, "authorizeCoinjoin", { enumerable: true, get: function () { return __importDefault(authorizeCoinjoin_1).default; } });
+var cancelCoinjoinAuthorization_1 = require("./cancelCoinjoinAuthorization");
+Object.defineProperty(exports, "cancelCoinjoinAuthorization", { enumerable: true, get: function () { return __importDefault(cancelCoinjoinAuthorization_1).default; } });
+var showDeviceTutorial_1 = require("./showDeviceTutorial");
+Object.defineProperty(exports, "showDeviceTutorial", { enumerable: true, get: function () { return __importDefault(showDeviceTutorial_1).default; } });
 var backupDevice_1 = require("./backupDevice");
 Object.defineProperty(exports, "backupDevice", { enumerable: true, get: function () { return __importDefault(backupDevice_1).default; } });
 var binanceGetAddress_1 = require("./binanceGetAddress");

package/lib/api/rebootToBootloader.js

@@ -13,7 +13,7 @@ class RebootToBootloader extends AbstractMethod_1.AbstractMethod {
         this.useDeviceState = false;
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, {
             1: { min: '1.10.0', max: '0' },
-            2: { min: '0', max: '0' },
+            2: { min: '2.6.0', max: '0' },
         });
     }
     async confirmation() {

package/lib/api/showDeviceTutorial.d.ts

@@ -0,0 +1,7 @@
+import { AbstractMethod } from '../core/AbstractMethod';
+import { PROTO } from '../constants';
+export default class ShowDeviceTutorial extends AbstractMethod<'showDeviceTutorial', PROTO.ShowDeviceTutorial> {
+    init(): void;
+    run(): Promise<PROTO.Success>;
+}
+//# sourceMappingURL=showDeviceTutorial.d.ts.map

package/lib/api/showDeviceTutorial.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AbstractMethod_1 = require("../core/AbstractMethod");
+const paramsValidator_1 = require("./common/paramsValidator");
+const events_1 = require("../events");
+class ShowDeviceTutorial extends AbstractMethod_1.AbstractMethod {
+    init() {
+        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
+        this.info = 'Show device tutorial';
+        this.useEmptyPassphrase = true;
+        this.useDeviceState = false;
+        this.allowDeviceMode = [events_1.UI.INITIALIZE];
+    }
+    async run() {
+        const cmd = this.device.getCommands();
+        const response = await cmd.typedCall('ShowDeviceTutorial', 'Success');
+        return response.message;
+    }
+}
+exports.default = ShowDeviceTutorial;
+//# sourceMappingURL=showDeviceTutorial.js.map

package/lib/constants/errors.d.ts

@@ -41,8 +41,5 @@ export declare class TrezorError extends Error {
 }
 export declare const TypedError: (id: keyof typeof ERROR_CODES, message?: string) => TrezorError;
 export declare const serializeError: (payload: any) => any;
-export declare const WRONG_PREVIOUS_SESSION_ERROR_MESSAGE = "wrong previous session";
-export declare const INVALID_PIN_ERROR_MESSAGE = "PIN invalid";
-export declare const WEBUSB_ERROR_MESSAGE = "NetworkError: Unable to claim interface.";
 export declare const LIBUSB_ERROR_MESSAGE = "LIBUSB_ERROR";
 //# sourceMappingURL=errors.d.ts.map

package/lib/constants/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LIBUSB_ERROR_MESSAGE = exports.WEBUSB_ERROR_MESSAGE = exports.INVALID_PIN_ERROR_MESSAGE = exports.WRONG_PREVIOUS_SESSION_ERROR_MESSAGE = exports.serializeError = exports.TypedError = exports.TrezorError = exports.ERROR_CODES = void 0;
+exports.LIBUSB_ERROR_MESSAGE = exports.serializeError = exports.TypedError = exports.TrezorError = exports.ERROR_CODES = void 0;
 exports.ERROR_CODES = {
     Init_NotInitialized: 'TrezorConnect not initialized',
     Init_AlreadyInitialized: 'TrezorConnect has been already initialized',
@@ -54,8 +54,5 @@ const serializeError = (payload) => {
     return payload;
 };
 exports.serializeError = serializeError;
-exports.WRONG_PREVIOUS_SESSION_ERROR_MESSAGE = 'wrong previous session';
-exports.INVALID_PIN_ERROR_MESSAGE = 'PIN invalid';
-exports.WEBUSB_ERROR_MESSAGE = 'NetworkError: Unable to claim interface.';
 exports.LIBUSB_ERROR_MESSAGE = 'LIBUSB_ERROR';
 //# sourceMappingURL=errors.js.map

package/lib/core/index.d.ts

@@ -2,15 +2,14 @@
 import EventEmitter from 'events';
 import { TransportInfo, CoreMessage } from '../events';
 import type { ConnectSettings } from '../types';
-export declare const handleMessage: (message: CoreMessage, isTrustedOrigin?: boolean) => void;
+export declare const handleMessage: (message: CoreMessage) => void;
 export declare const onCall: (message: CoreMessage) => Promise<void>;
 export declare class Core extends EventEmitter {
-    handleMessage(message: any, isTrustedOrigin: boolean): void;
+    handleMessage(message: any): void;
     dispose(): Promise<void>;
-    getCurrentMethod(): (import("../api").applyFlags | import("../api").applySettings | import("../api").authorizeCoinjoin | import("../api").backupDevice | import("../api").binanceGetAddress | import("../api").binanceGetPublicKey | import("../api").binanceSignTransaction | import("../api").blockchainDisconnect | import("../api").blockchainEstimateFee | import("../api").blockchainGetAccountBalanceHistory | import("../api").blockchainGetCurrentFiatRates | import("../api").blockchainGetFiatRatesForTimestamps | import("../api").blockchainGetTransactions | import("../api").blockchainSetCustomBackend | import("../api").blockchainSubscribe | import("../api").blockchainSubscribeFiatRates | import("../api").blockchainUnsubscribe | import("../api").blockchainUnsubscribeFiatRates | import("../api").cardanoGetAddress | import("../api").cardanoGetNativeScriptHash | import("../api").cardanoGetPublicKey | import("../api").cardanoSignTransaction | import("../api").changePin | import("../api").cipherKeyValue | import("../api").composeTransaction | import("../api").eosGetPublicKey | import("../api").eosSignTransaction | import("../api").ethereumGetAddress | import("../api").ethereumGetPublicKey | import("../api").ethereumSignMessage | import("../api").ethereumSignTransaction | import("../api").ethereumSignTypedData | import("../api").ethereumVerifyMessage | import("../api").firmwareUpdate | import("../api").getAccountInfo | import("../api").getAddress | import("../api").getCoinInfo | import("../api").getDeviceState | import("../api").getFeatures | import("../api").getFirmwareHash | import("../api").getOwnershipId | import("../api").getOwnershipProof | import("../api").getPublicKey | import("../api").getSettings | import("../api").nemGetAddress | import("../api").nemSignTransaction | import("../api").pushTransaction | import("../api").rebootToBootloader | import("../api").recoveryDevice | import("../api").requestLogin | import("../api").resetDevice | import("../api").rippleGetAddress | import("../api").rippleSignTransaction | import("../api").setBusy | import("../api").setProxy | import("../api").signMessage | import("../api").signTransaction | import("../api").stellarGetAddress | import("../api").stellarSignTransaction | import("../api").tezosGetAddress | import("../api").tezosGetPublicKey | import("../api").tezosSignTransaction | import("../api").unlockPath | import("../api").verifyMessage | import("../api").wipeDevice | import("../api").checkFirmwareAuthenticity)[];
-    getTransportInfo(): TransportInfo;
+    getCurrentMethod(): (import("../api").applyFlags | import("../api").applySettings | import("../api").authorizeCoinjoin | import("../api").cancelCoinjoinAuthorization | import("../api").showDeviceTutorial | import("../api").backupDevice | import("../api").binanceGetAddress | import("../api").binanceGetPublicKey | import("../api").binanceSignTransaction | import("../api").blockchainDisconnect | import("../api").blockchainEstimateFee | import("../api").blockchainGetAccountBalanceHistory | import("../api").blockchainGetCurrentFiatRates | import("../api").blockchainGetFiatRatesForTimestamps | import("../api").blockchainGetTransactions | import("../api").blockchainSetCustomBackend | import("../api").blockchainSubscribe | import("../api").blockchainSubscribeFiatRates | import("../api").blockchainUnsubscribe | import("../api").blockchainUnsubscribeFiatRates | import("../api").cardanoGetAddress | import("../api").cardanoGetNativeScriptHash | import("../api").cardanoGetPublicKey | import("../api").cardanoSignTransaction | import("../api").changePin | import("../api").cipherKeyValue | import("../api").composeTransaction | import("../api").eosGetPublicKey | import("../api").eosSignTransaction | import("../api").ethereumGetAddress | import("../api").ethereumGetPublicKey | import("../api").ethereumSignMessage | import("../api").ethereumSignTransaction | import("../api").ethereumSignTypedData | import("../api").ethereumVerifyMessage | import("../api").firmwareUpdate | import("../api").getAccountInfo | import("../api").getAddress | import("../api").getCoinInfo | import("../api").getDeviceState | import("../api").getFeatures | import("../api").getFirmwareHash | import("../api").getOwnershipId | import("../api").getOwnershipProof | import("../api").getPublicKey | import("../api").getSettings | import("../api").nemGetAddress | import("../api").nemSignTransaction | import("../api").pushTransaction | import("../api").rebootToBootloader | import("../api").recoveryDevice | import("../api").requestLogin | import("../api").resetDevice | import("../api").rippleGetAddress | import("../api").rippleSignTransaction | import("../api").setBusy | import("../api").setProxy | import("../api").signMessage | import("../api").signTransaction | import("../api").stellarGetAddress | import("../api").stellarSignTransaction | import("../api").tezosGetAddress | import("../api").tezosGetPublicKey | import("../api").tezosSignTransaction | import("../api").unlockPath | import("../api").verifyMessage | import("../api").wipeDevice | import("../api").checkFirmwareAuthenticity)[];
+    getTransportInfo(): TransportInfo | undefined;
 }
-export declare const initCore: () => Core;
-export declare const init: (settings: ConnectSettings) => Promise<Core>;
+export declare const initCore: (settings: ConnectSettings) => Promise<Core>;
 export declare const initTransport: (settings: ConnectSettings) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/lib/core/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initTransport = exports.init = exports.initCore = exports.Core = exports.onCall = exports.handleMessage = void 0;
+exports.initTransport = exports.initCore = exports.Core = exports.onCall = exports.handleMessage = void 0;
 const tslib_1 = require("tslib");
 const events_1 = tslib_1.__importDefault(require("events"));
+const transport_1 = require("@trezor/transport");
 const DataManager_1 = require("../data/DataManager");
 const DeviceList_1 = require("../device/DeviceList");
 const analyticsInfo_1 = require("../data/analyticsInfo");
@@ -22,6 +23,7 @@ const _callMethods = [];
 let _preferredDevice;
 let _interactionTimeout;
 let _deviceListInitTimeout;
+let _overridePromise;
 const _log = (0, debug_1.initLog)('Core');
 const postMessage = (message) => {
     if (message.event === events_2.RESPONSE_EVENT) {
@@ -54,17 +56,8 @@ const findUiPromise = (promiseEvent) => _uiPromises.find(p => p.id === promiseEv
 const removeUiPromise = (promise) => {
     _uiPromises = _uiPromises.filter(p => p !== promise);
 };
-const handleMessage = (message, isTrustedOrigin = false) => {
-    _log.debug('handleMessage', isTrustedOrigin, message);
-    const safeMessages = [
-        events_2.IFRAME.CALL,
-        events_2.POPUP.CLOSED,
-        events_2.UI.LOGIN_CHALLENGE_RESPONSE,
-        events_2.TRANSPORT.DISABLE_WEBUSB,
-    ];
-    if (!isTrustedOrigin && safeMessages.indexOf(message.type) === -1) {
-        return;
-    }
+const handleMessage = (message) => {
+    _log.debug('handleMessage', message);
     switch (message.type) {
         case events_2.POPUP.HANDSHAKE:
             getPopupPromise(false).resolve();
@@ -72,10 +65,10 @@ const handleMessage = (message, isTrustedOrigin = false) => {
         case events_2.POPUP.CLOSED:
             onPopupClosed(message.payload ? message.payload.error : null);
             break;
-        case events_2.TRANSPORT.DISABLE_WEBUSB:
+        case transport_1.TRANSPORT.DISABLE_WEBUSB:
             disableWebUSBTransport();
             break;
-        case events_2.TRANSPORT.REQUEST_DEVICE:
+        case transport_1.TRANSPORT.REQUEST_DEVICE:
             _deviceList === null || _deviceList === void 0 ? void 0 : _deviceList.enumerate();
             break;
         case events_2.UI.RECEIVE_DEVICE:
@@ -230,7 +223,8 @@ const onCall = async (message) => {
             call.overridden = true;
         });
         const overrideError = constants_1.ERRORS.TypedError('Method_Override');
-        await device.override(overrideError);
+        _overridePromise = device.override(overrideError);
+        await _overridePromise;
         if (method.overridden) {
             postMessage((0, events_2.createResponseMessage)(method.responseID, false, { error: overrideError }));
             throw overrideError;
@@ -337,8 +331,7 @@ const onCall = async (message) => {
                 }
             }
             catch (error) {
-                if (error.message === constants_1.ERRORS.INVALID_PIN_ERROR_MESSAGE &&
-                    PIN_TRIES < MAX_PIN_TRIES) {
+                if (error.message === 'PIN invalid' && PIN_TRIES < MAX_PIN_TRIES) {
                     PIN_TRIES++;
                     postMessage((0, events_2.createUiMessage)(events_2.UI.INVALID_PIN, { device: device.toMessageObject() }));
                     return inner();
@@ -360,6 +353,9 @@ const onCall = async (message) => {
                 return Promise.reject(error);
             }
         };
+        if (_overridePromise) {
+            await _overridePromise;
+        }
         await device.run(inner, {
             keepSession: method.keepSession,
             useEmptyPassphrase: method.useEmptyPassphrase,
@@ -372,13 +368,16 @@ const onCall = async (message) => {
             _deviceList.addAuthPenalty(device);
         }
         if (method) {
-            if (_deviceList && error.message === constants_1.ERRORS.WRONG_PREVIOUS_SESSION_ERROR_MESSAGE) {
-                _deviceList.enumerate();
+            if (_deviceList && error.message === transport_1.TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS) {
+                await _deviceList.enumerate();
             }
             messageResponse = (0, events_2.createResponseMessage)(method.responseID, false, { error });
         }
     }
     finally {
+        if (_overridePromise) {
+            await _overridePromise;
+        }
         const response = messageResponse;
         if (response) {
             if (method.name === 'rebootToBootloader' && response.success) {
@@ -469,7 +468,7 @@ const onPopupClosed = (customErrorMessage) => {
         _deviceList.allDevices().forEach(d => {
             d.keepSession = false;
             if (d.isUsedHere()) {
-                d.interruptionFromUser(error);
+                _overridePromise = d.interruptionFromUser(error);
             }
             else {
                 const uiPromise = findUiPromise(events_2.DEVICE.DISCONNECT);
@@ -557,30 +556,31 @@ const initDeviceList = async (settings) => {
         _deviceList.on(events_2.DEVICE.CHANGED, device => {
             postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CHANGED, device));
         });
-        _deviceList.on(events_2.TRANSPORT.ERROR, async (error) => {
+        _deviceList.on(transport_1.TRANSPORT.ERROR, error => {
             _log.warn('TRANSPORT.ERROR', error);
             if (_deviceList) {
                 _deviceList.disconnectDevices();
                 _deviceList.dispose();
             }
             _deviceList = undefined;
-            postMessage((0, events_2.createTransportMessage)(events_2.TRANSPORT.ERROR, { error }));
+            postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
             if (settings.transportReconnect) {
                 const { promise, timeout } = (0, promiseUtils_1.resolveAfter)(1000, null);
                 _deviceListInitTimeout = timeout;
-                await promise;
-                initDeviceList(settings);
+                promise.then(() => {
+                    initDeviceList(settings);
+                });
             }
         });
-        _deviceList.on(events_2.TRANSPORT.START, transportType => postMessage((0, events_2.createTransportMessage)(events_2.TRANSPORT.START, transportType)));
-        await _deviceList.init();
+        _deviceList.on(transport_1.TRANSPORT.START, transportType => postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.START, transportType)));
+        _deviceList.init();
         if (_deviceList) {
             await _deviceList.waitForTransportFirstEvent();
         }
     }
     catch (error) {
         _deviceList = undefined;
-        postMessage((0, events_2.createTransportMessage)(events_2.TRANSPORT.ERROR, { error }));
+        postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
         if (!settings.transportReconnect) {
             throw error;
         }
@@ -593,8 +593,8 @@ const initDeviceList = async (settings) => {
     }
 };
 class Core extends events_1.default {
-    handleMessage(message, isTrustedOrigin) {
-        (0, exports.handleMessage)(message, isTrustedOrigin);
+    handleMessage(message) {
+        (0, exports.handleMessage)(message);
     }
     async dispose() {
         (0, BlockchainLink_1.dispose)();
@@ -610,27 +610,18 @@ class Core extends events_1.default {
         return _callMethods;
     }
     getTransportInfo() {
-        if (_deviceList) {
-            return _deviceList.getTransportInfo();
+        if (!_deviceList) {
+            return undefined;
         }
-        return {
-            type: '',
-            version: '',
-            outdated: true,
-        };
+        return _deviceList.getTransportInfo();
     }
 }
 exports.Core = Core;
-const initCore = () => {
-    _core = new Core();
-    return _core;
-};
-exports.initCore = initCore;
-const init = async (settings) => {
+const initCore = async (settings) => {
     try {
         await DataManager_1.DataManager.load(settings);
         (0, debug_1.enableLog)(DataManager_1.DataManager.getSettings('debug'));
-        (0, exports.initCore)();
+        _core = new Core();
         _interactionTimeout = new interactionTimeout_1.InteractionTimeout(settings.popup ? settings.interactionTimeout : 0);
         return _core;
     }
@@ -639,7 +630,7 @@ const init = async (settings) => {
         throw error;
     }
 };
-exports.init = init;
+exports.initCore = initCore;
 const initTransport = async (settings) => {
     try {
         if (!settings.transportReconnect) {
@@ -656,17 +647,20 @@ const initTransport = async (settings) => {
 };
 exports.initTransport = initTransport;
 const disableWebUSBTransport = async () => {
-    var _a, _b;
+    var _a;
     if (!_deviceList)
         return;
     if (_deviceList.transportType() !== 'WebUsbTransport')
         return;
     const settings = DataManager_1.DataManager.getSettings();
-    if ((_a = settings.transports) === null || _a === void 0 ? void 0 : _a.includes('WebUsbTransport')) {
-        settings.transports.splice(settings.transports.indexOf('WebUsbTransport'), 1);
-    }
-    if (!((_b = settings.transports) === null || _b === void 0 ? void 0 : _b.includes('BridgeTransport'))) {
-        settings.transports.unshift('BridgeTransport');
+    if (settings.transports) {
+        const transportStr = (_a = settings.transports) === null || _a === void 0 ? void 0 : _a.filter(transport => typeof transport !== 'object');
+        if (transportStr.includes('WebUsbTransport')) {
+            settings.transports.splice(settings.transports.indexOf('WebUsbTransport'), 1);
+        }
+        if (!transportStr.includes('BridgeTransport')) {
+            settings.transports.unshift('BridgeTransport');
+        }
     }
     try {
         await _deviceList.dispose();

package/lib/core/method.d.ts

@@ -2,5 +2,5 @@ import * as Methods from '../api';
 import type { IFrameCallMessage } from '../events';
 export declare const getMethod: (message: IFrameCallMessage & {
     id?: number;
-}) => Methods.applyFlags | Methods.applySettings | Methods.authorizeCoinjoin | Methods.backupDevice | Methods.binanceGetAddress | Methods.binanceGetPublicKey | Methods.binanceSignTransaction | Methods.blockchainDisconnect | Methods.blockchainEstimateFee | Methods.blockchainGetAccountBalanceHistory | Methods.blockchainGetCurrentFiatRates | Methods.blockchainGetFiatRatesForTimestamps | Methods.blockchainGetTransactions | Methods.blockchainSetCustomBackend | Methods.blockchainSubscribe | Methods.blockchainSubscribeFiatRates | Methods.blockchainUnsubscribe | Methods.blockchainUnsubscribeFiatRates | Methods.cardanoGetAddress | Methods.cardanoGetNativeScriptHash | Methods.cardanoGetPublicKey | Methods.cardanoSignTransaction | Methods.changePin | Methods.cipherKeyValue | Methods.composeTransaction | Methods.eosGetPublicKey | Methods.eosSignTransaction | Methods.ethereumGetAddress | Methods.ethereumGetPublicKey | Methods.ethereumSignMessage | Methods.ethereumSignTransaction | Methods.ethereumSignTypedData | Methods.ethereumVerifyMessage | Methods.firmwareUpdate | Methods.getAccountInfo | Methods.getAddress | Methods.getCoinInfo | Methods.getDeviceState | Methods.getFeatures | Methods.getFirmwareHash | Methods.getOwnershipId | Methods.getOwnershipProof | Methods.getPublicKey | Methods.getSettings | Methods.nemGetAddress | Methods.nemSignTransaction | Methods.pushTransaction | Methods.rebootToBootloader | Methods.recoveryDevice | Methods.requestLogin | Methods.resetDevice | Methods.rippleGetAddress | Methods.rippleSignTransaction | Methods.setBusy | Methods.setProxy | Methods.signMessage | Methods.signTransaction | Methods.stellarGetAddress | Methods.stellarSignTransaction | Methods.tezosGetAddress | Methods.tezosGetPublicKey | Methods.tezosSignTransaction | Methods.unlockPath | Methods.verifyMessage | Methods.wipeDevice | Methods.checkFirmwareAuthenticity;
+}) => Methods.applyFlags | Methods.applySettings | Methods.authorizeCoinjoin | Methods.cancelCoinjoinAuthorization | Methods.showDeviceTutorial | Methods.backupDevice | Methods.binanceGetAddress | Methods.binanceGetPublicKey | Methods.binanceSignTransaction | Methods.blockchainDisconnect | Methods.blockchainEstimateFee | Methods.blockchainGetAccountBalanceHistory | Methods.blockchainGetCurrentFiatRates | Methods.blockchainGetFiatRatesForTimestamps | Methods.blockchainGetTransactions | Methods.blockchainSetCustomBackend | Methods.blockchainSubscribe | Methods.blockchainSubscribeFiatRates | Methods.blockchainUnsubscribe | Methods.blockchainUnsubscribeFiatRates | Methods.cardanoGetAddress | Methods.cardanoGetNativeScriptHash | Methods.cardanoGetPublicKey | Methods.cardanoSignTransaction | Methods.changePin | Methods.cipherKeyValue | Methods.composeTransaction | Methods.eosGetPublicKey | Methods.eosSignTransaction | Methods.ethereumGetAddress | Methods.ethereumGetPublicKey | Methods.ethereumSignMessage | Methods.ethereumSignTransaction | Methods.ethereumSignTypedData | Methods.ethereumVerifyMessage | Methods.firmwareUpdate | Methods.getAccountInfo | Methods.getAddress | Methods.getCoinInfo | Methods.getDeviceState | Methods.getFeatures | Methods.getFirmwareHash | Methods.getOwnershipId | Methods.getOwnershipProof | Methods.getPublicKey | Methods.getSettings | Methods.nemGetAddress | Methods.nemSignTransaction | Methods.pushTransaction | Methods.rebootToBootloader | Methods.recoveryDevice | Methods.requestLogin | Methods.resetDevice | Methods.rippleGetAddress | Methods.rippleSignTransaction | Methods.setBusy | Methods.setProxy | Methods.signMessage | Methods.signTransaction | Methods.stellarGetAddress | Methods.stellarSignTransaction | Methods.tezosGetAddress | Methods.tezosGetPublicKey | Methods.tezosSignTransaction | Methods.unlockPath | Methods.verifyMessage | Methods.wipeDevice | Methods.checkFirmwareAuthenticity;
 //# sourceMappingURL=method.d.ts.map

package/lib/data/coinInfo.d.ts

@@ -1,5 +1,4 @@
 import type { CoinInfo, BitcoinNetworkInfo, EthereumNetworkInfo, MiscNetworkInfo } from '../types/coinInfo';
-export declare function cloneCoinInfo<T>(info: T): T;
 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;