@trezor/connect 9.1.3 → 9.1.5

package/lib/api/firmware/x509certificate.js

@@ -0,0 +1,203 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCertificate = exports.parseName = void 0;
+const derToAsn1 = (byteArray) => {
+    let position = 0;
+    function getTag() {
+        let tag = byteArray[0] & 0x1f;
+        position += 1;
+        if (tag === 0x1f) {
+            tag = 0;
+            while (byteArray[position] >= 0x80) {
+                tag = tag * 128 + byteArray[position] - 0x80;
+                position += 1;
+            }
+            tag = tag * 128 + byteArray[position] - 0x80;
+            position += 1;
+        }
+        return tag;
+    }
+    function getLength() {
+        let length = 0;
+        if (byteArray[position] < 0x80) {
+            length = byteArray[position];
+            position += 1;
+        }
+        else {
+            const numberOfDigits = byteArray[position] & 0x7f;
+            position += 1;
+            length = 0;
+            for (let i = 0; i < numberOfDigits; i++) {
+                length = length * 256 + byteArray[position];
+                position += 1;
+            }
+        }
+        return length;
+    }
+    const cls = (byteArray[0] & 0xc0) / 64;
+    const structured = (byteArray[0] & 0x20) === 0x20;
+    const tag = getTag();
+    let length = getLength();
+    let byteLength;
+    let contents;
+    if (length === 0x80) {
+        length = 0;
+        while (byteArray[position + length] !== 0 || byteArray[position + length + 1] !== 0) {
+            length += 1;
+        }
+        byteLength = position + length + 2;
+        contents = byteArray.subarray(position, position + length);
+    }
+    else {
+        byteLength = position + length;
+        contents = byteArray.subarray(position, byteLength);
+    }
+    const raw = byteArray.subarray(0, byteLength);
+    return {
+        cls,
+        tag,
+        structured,
+        byteLength,
+        contents,
+        raw,
+    };
+};
+const derToAsn1List = (byteArray) => {
+    const result = [];
+    let nextPosition = 0;
+    while (nextPosition < byteArray.length) {
+        const nextPiece = derToAsn1(byteArray.subarray(nextPosition));
+        result.push(nextPiece);
+        nextPosition += nextPiece.byteLength;
+    }
+    return result;
+};
+const derBitStringValue = (byteArray) => ({
+    unusedBits: byteArray[0],
+    bytes: byteArray.subarray(1),
+});
+const parseSignatureValue = (asn1) => {
+    if (asn1.cls !== 0 || asn1.tag !== 3 || asn1.structured) {
+        throw new Error('Bad signature value. Not a BIT STRING.');
+    }
+    return {
+        asn1,
+        bits: derBitStringValue(asn1.contents),
+    };
+};
+const derObjectIdentifierValue = (byteArray) => {
+    let oid = `${Math.floor(byteArray[0] / 40)}.${byteArray[0] % 40}`;
+    let position = 1;
+    while (position < byteArray.length) {
+        let nextInteger = 0;
+        while (byteArray[position] >= 0x80) {
+            nextInteger = nextInteger * 0x80 + (byteArray[position] & 0x7f);
+            position += 1;
+        }
+        nextInteger = nextInteger * 0x80 + byteArray[position];
+        position += 1;
+        oid += `.${nextInteger}`;
+    }
+    return oid;
+};
+const parseAlgorithmIdentifier = (asn1) => {
+    if (asn1.cls !== 0 || asn1.tag !== 16 || !asn1.structured) {
+        throw new Error('Bad algorithm identifier. Not a SEQUENCE.');
+    }
+    const pieces = derToAsn1List(asn1.contents);
+    if (pieces.length > 2) {
+        throw new Error('Bad algorithm identifier. Contains too many child objects.');
+    }
+    const encodedAlgorithm = pieces[0];
+    if (encodedAlgorithm.cls !== 0 || encodedAlgorithm.tag !== 6 || encodedAlgorithm.structured) {
+        throw new Error('Bad algorithm identifier. Does not begin with an OBJECT IDENTIFIER.');
+    }
+    const algorithm = derObjectIdentifierValue(encodedAlgorithm.contents);
+    return {
+        asn1,
+        algorithm,
+        parameters: pieces.length === 2 ? { asn1: pieces[1] } : null,
+    };
+};
+const parseName = (asn1) => derToAsn1List(asn1.contents).map(item => {
+    const attrSet = derToAsn1(item.contents);
+    return parseAlgorithmIdentifier(attrSet);
+});
+exports.parseName = parseName;
+const parseSubjectPublicKeyInfo = (asn1) => {
+    if (asn1.cls !== 0 || asn1.tag !== 16 || !asn1.structured) {
+        throw new Error('Bad SPKI. Not a SEQUENCE.');
+    }
+    const pieces = derToAsn1List(asn1.contents);
+    if (pieces.length !== 2) {
+        throw new Error('Bad SubjectPublicKeyInfo. Wrong number of child objects.');
+    }
+    return {
+        asn1,
+        algorithm: parseAlgorithmIdentifier(pieces[0]),
+        bits: derBitStringValue(pieces[1].contents),
+    };
+};
+const parseUtcTime = (time) => {
+    let offset = 4;
+    let yearOffset = 0;
+    if (time.tag === 23) {
+        offset = 2;
+        yearOffset = 2000;
+    }
+    const utc = Buffer.from(time.contents).toString();
+    const year = yearOffset + Number(utc.substring(0, offset));
+    const month = Number(utc.substring(offset, offset + 2)) - 1;
+    const day = Number(utc.substring(offset + 2, offset + 4));
+    const hour = Number(utc.substring(offset + 4, offset + 6));
+    const minute = Number(utc.substring(offset + 6, offset + 8));
+    const date = new Date();
+    date.setUTCFullYear(year, month, day);
+    date.setUTCHours(hour, minute, 0);
+    return date;
+};
+const parseValidity = (asn1) => {
+    const [from, to] = derToAsn1List(asn1.contents);
+    return {
+        from: parseUtcTime(from),
+        to: parseUtcTime(to),
+    };
+};
+const parseTBSCertificate = (asn1) => {
+    if (asn1.cls !== 0 || asn1.tag !== 16 || !asn1.structured) {
+        throw new Error("This can't be a TBSCertificate. Wrong data type.");
+    }
+    const pieces = derToAsn1List(asn1.contents);
+    if (pieces.length < 7) {
+        throw new Error('Bad TBS Certificate. There are fewer than the seven required children.');
+    }
+    return {
+        asn1,
+        version: pieces[0],
+        serialNumber: pieces[1],
+        signature: parseAlgorithmIdentifier(pieces[2]),
+        issuer: pieces[3],
+        validity: parseValidity(pieces[4]),
+        subject: (0, exports.parseName)(pieces[5]),
+        subjectPublicKeyInfo: parseSubjectPublicKeyInfo(pieces[6]),
+        extensions: pieces[7],
+    };
+};
+const parseCertificate = (byteArray) => {
+    const asn1 = derToAsn1(byteArray);
+    if (asn1.cls !== 0 || asn1.tag !== 16 || !asn1.structured) {
+        throw new Error("This can't be an X.509 certificate. Wrong data type.");
+    }
+    const pieces = derToAsn1List(asn1.contents);
+    if (pieces.length !== 3) {
+        throw new Error('Certificate contains more than the three specified children.');
+    }
+    return {
+        asn1,
+        tbsCertificate: parseTBSCertificate(pieces[0]),
+        signatureAlgorithm: parseAlgorithmIdentifier(pieces[1]),
+        signatureValue: parseSignatureValue(pieces[2]),
+    };
+};
+exports.parseCertificate = parseCertificate;
+//# sourceMappingURL=x509certificate.js.map

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");
@@ -54,6 +53,7 @@ class FirmwareUpdate extends AbstractMethod_1.AbstractMethod {
         return uiResp.payload;
     }
     async run() {
+        var _a;
         const { device, params } = this;
         let binary;
         try {
@@ -63,7 +63,7 @@ class FirmwareUpdate extends AbstractMethod_1.AbstractMethod {
             else {
                 binary = await (0, firmware_1.getBinary)({
                     features: device.features,
-                    releases: (0, firmwareInfo_1.getReleases)(device.features.major_version),
+                    releases: (0, firmwareInfo_1.getReleases)((_a = device.features) === null || _a === void 0 ? void 0 : _a.internal_model),
                     version: params.version,
                     btcOnly: params.btcOnly,
                     baseUrl: params.baseUrl,
@@ -76,7 +76,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, {
@@ -132,13 +136,9 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
         if (isUsingPopup || this.params.length === 1) {
             return super.checkFirmwareRange(isUsingPopup);
         }
-        const defaultRange = {
-            1: { min: '1.0.0', max: '0' },
-            2: { min: '2.0.0', max: '0' },
-        };
         const invalid = [];
         for (let i = 0; i < this.params.length; i++) {
-            this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, this.params[i].coinInfo, defaultRange);
+            this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, this.params[i].coinInfo, AbstractMethod_1.DEFAULT_FIRMWARE_RANGE);
             const exception = await super.checkFirmwareRange(false);
             if (exception) {
                 invalid.push({

package/lib/api/getFirmwareHash.js

@@ -11,10 +11,7 @@ class GetFirmwareHash extends AbstractMethod_1.AbstractMethod {
         this.allowDeviceMode = [events_1.UI.INITIALIZE];
         const { payload } = this;
         (0, paramsValidator_1.validateParams)(payload, [{ name: 'challenge', type: 'string' }]);
-        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, {
-            1: { min: '1.11.1', max: '0' },
-            2: { min: '2.5.1', max: '0' },
-        });
+        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
         this.params = {
             challenge: payload.challenge,
         };

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/index.d.ts

@@ -1,5 +1,6 @@
 export { default as applyFlags } from './applyFlags';
 export { default as applySettings } from './applySettings';
+export { default as authenticateDevice } from './authenticateDevice';
 export { default as authorizeCoinjoin } from './authorizeCoinjoin';
 export { default as cancelCoinjoinAuthorization } from './cancelCoinjoinAuthorization';
 export { default as showDeviceTutorial } from './showDeviceTutorial';

package/lib/api/index.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.authenticateDevice = 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 = exports.rebootToBootloader = 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 authenticateDevice_1 = require("./authenticateDevice");
+Object.defineProperty(exports, "authenticateDevice", { enumerable: true, get: function () { return __importDefault(authenticateDevice_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");

package/lib/api/rebootToBootloader.js

@@ -10,10 +10,7 @@ class RebootToBootloader extends AbstractMethod_1.AbstractMethod {
         this.keepSession = false;
         this.requiredPermissions = ['management'];
         this.useDeviceState = false;
-        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, {
-            1: { min: '1.10.0', max: '0' },
-            2: { min: '2.6.0', max: '0' },
-        });
+        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
     }
     get info() {
         return 'Reboot to bootloader';

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, {
@@ -9,6 +9,7 @@ export type Payload<M> = Extract<CallMethodPayload, {
     override?: boolean;
 };
 export type MethodReturnType<M extends CallMethodPayload['method']> = CallMethodResponse<M>;
+export declare const DEFAULT_FIRMWARE_RANGE: FirmwareRange;
 export declare abstract class AbstractMethod<Name extends CallMethodPayload['method'], Params = undefined> {
     responseID: number;
     device: Device;
@@ -37,11 +38,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

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractMethod = void 0;
+exports.AbstractMethod = exports.DEFAULT_FIRMWARE_RANGE = 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");
+exports.DEFAULT_FIRMWARE_RANGE = {
+    T1B1: { min: '1.0.0', max: '0' },
+    T2T1: { min: '2.0.0', max: '0' },
+    T2B1: { min: '2.6.1', max: '0' },
+};
 class AbstractMethod {
     get info() {
         return '';
@@ -44,10 +49,7 @@ class AbstractMethod {
                 this.network = key;
             }
         });
-        this.firmwareRange = {
-            '1': { min: '1.0.0', max: '0' },
-            '2': { min: '2.0.0', max: '0' },
-        };
+        this.firmwareRange = exports.DEFAULT_FIRMWARE_RANGE;
         this.requiredPermissions = [];
         this.useDevice = true;
         this.useDeviceState = true;
@@ -130,19 +132,19 @@ class AbstractMethod {
         const { device } = this;
         if (!device.features)
             return;
-        const version = device.getVersion();
-        const model = version[0];
-        const range = this.firmwareRange[model];
+        const range = this.firmwareRange[device.features.internal_model];
         if (device.firmwareStatus === 'none') {
             return events_1.UI.FIRMWARE_NOT_INSTALLED;
         }
         if (range.min === '0') {
             return events_1.UI.FIRMWARE_NOT_SUPPORTED;
         }
-        if (device.firmwareStatus === 'required' || (0, versionUtils_1.versionCompare)(version, range.min) < 0) {
+        const version = device.getVersion().join('.');
+        if (device.firmwareStatus === 'required' ||
+            !utils_1.versionUtils.isNewerOrEqual(version, 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, range.max)) {
             if (isUsingPopup) {
                 await this.getPopupPromise().promise;
                 const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);

package/lib/core/index.d.ts

@@ -1,15 +1,16 @@
 /// <reference types="node" />
 import EventEmitter from 'events';
 import { TransportInfo, CoreMessage } from '../events';
+import { LogWriter } from '../utils/debug';
 import type { ConnectSettings } from '../types';
 export declare const handleMessage: (message: CoreMessage) => void;
 export declare const onCall: (message: CoreMessage) => Promise<void>;
 export declare class Core extends EventEmitter {
     handleMessage(message: any): void;
     dispose(): Promise<void>;
-    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)[];
+    getCurrentMethod(): (import("../api").applyFlags | import("../api").applySettings | import("../api").authenticateDevice | 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: (settings: ConnectSettings) => Promise<Core>;
+export declare const initCore: (settings: ConnectSettings, logWriterFactory?: () => LogWriter | undefined) => Promise<Core>;
 export declare const initTransport: (settings: ConnectSettings) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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);
@@ -100,6 +103,7 @@ const initDevice = async (method) => {
     if (!_deviceList) {
         throw constants_1.ERRORS.TypedError('Transport_Missing');
     }
+    await _deviceList.transportFirstEventPromise;
     const isWebUsb = _deviceList.transportType() === 'WebUsbTransport';
     let device;
     let showDeviceSelection = isWebUsb;
@@ -292,7 +296,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'));
                 }
@@ -336,7 +340,7 @@ const onCall = async (message) => {
                 }
             }
             catch (error) {
-                if (error.message === 'PIN invalid' && PIN_TRIES < MAX_PIN_TRIES) {
+                if (error.message.includes('PIN invalid') && PIN_TRIES < MAX_PIN_TRIES) {
                     PIN_TRIES++;
                     postMessage((0, events_2.createUiMessage)(events_2.UI.INVALID_PIN, { device: device.toMessageObject() }));
                     return inner();
@@ -390,7 +394,11 @@ const onCall = async (message) => {
         if (response) {
             if (method.name === 'rebootToBootloader' && response.success) {
                 await (0, promiseUtils_1.resolveAfter)(1000).promise;
-                await device.run(() => Promise.resolve(), { skipFinalReload: true });
+                try {
+                    await device.run(() => Promise.resolve(), { skipFinalReload: true });
+                }
+                catch (err) {
+                }
             }
             await device.cleanup();
             closePopup();
@@ -410,7 +418,7 @@ const onCall = async (message) => {
 exports.onCall = onCall;
 const cleanup = () => {
     _popupPromise = undefined;
-    _uiPromises = [];
+    _uiPromises.splice(0);
     _interactionTimeout.stop();
     _log.debug('Cleanup...');
 };
@@ -498,7 +506,7 @@ const onPopupClosed = (customErrorMessage) => {
             _uiPromises.forEach(p => {
                 p.reject(error);
             });
-            _uiPromises = [];
+            _uiPromises.splice(0);
         }
         if (_popupPromise) {
             _popupPromise.reject(error);
@@ -530,7 +538,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 });
                 }
@@ -625,7 +633,10 @@ class Core extends events_1.default {
     }
 }
 exports.Core = Core;
-const initCore = async (settings) => {
+const initCore = async (settings, logWriterFactory) => {
+    if (logWriterFactory) {
+        (0, debug_1.setLogWriter)(logWriterFactory);
+    }
     try {
         await DataManager_1.DataManager.load(settings);
         (0, debug_1.enableLog)(DataManager_1.DataManager.getSettings('debug'));