@trezor/connect 9.1.4 → 9.1.6

package/lib/api/{tezosGetAddress.js → tezos/api/tezosGetAddress.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const AbstractMethod_1 = require("../core/AbstractMethod");
-const paramsValidator_1 = require("./common/paramsValidator");
-const coinInfo_1 = require("../data/coinInfo");
-const pathUtils_1 = require("../utils/pathUtils");
-const constants_1 = require("../constants");
-const events_1 = require("../events");
+const AbstractMethod_1 = require("../../../core/AbstractMethod");
+const paramsValidator_1 = require("../../common/paramsValidator");
+const coinInfo_1 = require("../../../data/coinInfo");
+const pathUtils_1 = require("../../../utils/pathUtils");
+const constants_1 = require("../../../constants");
+const events_1 = require("../../../events");
 class TezosGetAddress extends AbstractMethod_1.AbstractMethod {
     constructor() {
         super(...arguments);

package/lib/api/{tezosGetPublicKey.d.ts → tezos/api/tezosGetPublicKey.d.ts}

@@ -1,11 +1,11 @@
-import { AbstractMethod } from '../core/AbstractMethod';
-import type { PROTO } from '../constants';
+import { AbstractMethod } from '../../../core/AbstractMethod';
+import type { PROTO } from '../../../constants';
 export default class TezosGetPublicKey extends AbstractMethod<'tezosGetPublicKey', PROTO.TezosGetPublicKey[]> {
     hasBundle?: boolean;
     confirmed?: boolean;
     init(): void;
     get info(): string;
     confirmation(): Promise<boolean>;
-    run(): Promise<import("..").PublicKey | import("..").PublicKey[]>;
+    run(): Promise<import("../../..").PublicKey | import("../../..").PublicKey[]>;
 }
 //# sourceMappingURL=tezosGetPublicKey.d.ts.map

package/lib/api/{tezosGetPublicKey.js → tezos/api/tezosGetPublicKey.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const AbstractMethod_1 = require("../core/AbstractMethod");
-const paramsValidator_1 = require("./common/paramsValidator");
-const coinInfo_1 = require("../data/coinInfo");
-const pathUtils_1 = require("../utils/pathUtils");
-const events_1 = require("../events");
+const AbstractMethod_1 = require("../../../core/AbstractMethod");
+const paramsValidator_1 = require("../../common/paramsValidator");
+const coinInfo_1 = require("../../../data/coinInfo");
+const pathUtils_1 = require("../../../utils/pathUtils");
+const events_1 = require("../../../events");
 class TezosGetPublicKey extends AbstractMethod_1.AbstractMethod {
     init() {
         this.requiredPermissions = ['read'];

package/lib/api/{tezosSignTransaction.d.ts → tezos/api/tezosSignTransaction.d.ts}

@@ -1,5 +1,5 @@
-import { AbstractMethod } from '../core/AbstractMethod';
-import type { PROTO } from '../constants';
+import { AbstractMethod } from '../../../core/AbstractMethod';
+import type { PROTO } from '../../../constants';
 export default class TezosSignTransaction extends AbstractMethod<'tezosSignTransaction', PROTO.TezosSignTx> {
     init(): void;
     get info(): string;

package/lib/api/{tezosSignTransaction.js → tezos/api/tezosSignTransaction.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const AbstractMethod_1 = require("../core/AbstractMethod");
-const paramsValidator_1 = require("./common/paramsValidator");
-const coinInfo_1 = require("../data/coinInfo");
-const pathUtils_1 = require("../utils/pathUtils");
-const helper = tslib_1.__importStar(require("./tezos/tezosSignTx"));
+const AbstractMethod_1 = require("../../../core/AbstractMethod");
+const paramsValidator_1 = require("../../common/paramsValidator");
+const coinInfo_1 = require("../../../data/coinInfo");
+const pathUtils_1 = require("../../../utils/pathUtils");
+const helper = tslib_1.__importStar(require("../tezosSignTx"));
 class TezosSignTransaction extends AbstractMethod_1.AbstractMethod {
     init() {
         this.requiredPermissions = ['read', 'write'];

package/lib/backend/Blockchain.js

@@ -16,6 +16,8 @@ const getWorker = (type) => {
             return workers_1.BlockfrostWorker;
         case 'electrum':
             return workers_1.ElectrumWorker;
+        case 'solana':
+            return workers_1.SolanaWorker;
         default:
             return null;
     }

package/lib/constants/cardano.js

@@ -7,10 +7,10 @@ var PROTOCOL_MAGICS;
     PROTOCOL_MAGICS[PROTOCOL_MAGICS["testnet_preprod"] = 1] = "testnet_preprod";
     PROTOCOL_MAGICS[PROTOCOL_MAGICS["testnet_preview"] = 2] = "testnet_preview";
     PROTOCOL_MAGICS[PROTOCOL_MAGICS["testnet_legacy"] = 1097911063] = "testnet_legacy";
-})(PROTOCOL_MAGICS = exports.PROTOCOL_MAGICS || (exports.PROTOCOL_MAGICS = {}));
+})(PROTOCOL_MAGICS || (exports.PROTOCOL_MAGICS = PROTOCOL_MAGICS = {}));
 var NETWORK_IDS;
 (function (NETWORK_IDS) {
     NETWORK_IDS[NETWORK_IDS["mainnet"] = 1] = "mainnet";
     NETWORK_IDS[NETWORK_IDS["testnet"] = 0] = "testnet";
-})(NETWORK_IDS = exports.NETWORK_IDS || (exports.NETWORK_IDS = {}));
+})(NETWORK_IDS || (exports.NETWORK_IDS = NETWORK_IDS = {}));
 //# sourceMappingURL=cardano.js.map

package/lib/constants/nem.js

@@ -6,7 +6,7 @@ var Networks;
     Networks[Networks["mainnet"] = 104] = "mainnet";
     Networks[Networks["testnet"] = 152] = "testnet";
     Networks[Networks["mijin"] = 96] = "mijin";
-})(Networks = exports.Networks || (exports.Networks = {}));
+})(Networks || (exports.Networks = Networks = {}));
 var TxType;
 (function (TxType) {
     TxType[TxType["TRANSFER"] = 257] = "TRANSFER";
@@ -18,11 +18,11 @@ var TxType;
     TxType[TxType["PROVISION_NAMESPACE"] = 8193] = "PROVISION_NAMESPACE";
     TxType[TxType["MOSAIC_CREATION"] = 16385] = "MOSAIC_CREATION";
     TxType[TxType["SUPPLY_CHANGE"] = 16386] = "SUPPLY_CHANGE";
-})(TxType = exports.TxType || (exports.TxType = {}));
+})(TxType || (exports.TxType = TxType = {}));
 var TxVersion;
 (function (TxVersion) {
     TxVersion[TxVersion["mainnet"] = 1744830464] = "mainnet";
     TxVersion[TxVersion["testnet"] = -1744830464] = "testnet";
     TxVersion[TxVersion["mijin"] = 1610612736] = "mijin";
-})(TxVersion = exports.TxVersion || (exports.TxVersion = {}));
+})(TxVersion || (exports.TxVersion = TxVersion = {}));
 //# sourceMappingURL=nem.js.map

package/lib/constants/network.d.ts

@@ -8,6 +8,9 @@ export declare const TYPES: {
     readonly ripple: "Ripple";
     readonly tezos: "Tezos";
     readonly binance: "Binance";
+    readonly solana: "Solana";
 };
 export type NetworkType = keyof typeof TYPES;
+export declare const MODULES: readonly ["binance", "cardano", "eos", "ethereum", "nem", "ripple", "solana", "stellar", "tezos"];
+export type ModuleName = (typeof MODULES)[number];
 //# sourceMappingURL=network.d.ts.map

package/lib/constants/network.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TYPES = void 0;
+exports.MODULES = exports.TYPES = void 0;
 exports.TYPES = {
     bitcoin: 'Bitcoin',
     ethereum: 'Ethereum',
@@ -11,5 +11,17 @@ exports.TYPES = {
     ripple: 'Ripple',
     tezos: 'Tezos',
     binance: 'Binance',
+    solana: 'Solana',
 };
+exports.MODULES = [
+    'binance',
+    'cardano',
+    'eos',
+    'ethereum',
+    'nem',
+    'ripple',
+    'solana',
+    'stellar',
+    'tezos',
+];
 //# sourceMappingURL=network.js.map

package/lib/core/AbstractMethod.d.ts

@@ -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;

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 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,20 +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;
         }
+        const version = device.getVersion().join('.');
         if (device.firmwareStatus === 'required' ||
-            !utils_1.versionUtils.isNewerOrEqual(version.join('.'), range.min)) {
+            !utils_1.versionUtils.isNewerOrEqual(version, range.min)) {
             return events_1.UI.FIRMWARE_OLD;
         }
-        if (range.max !== '0' && utils_1.versionUtils.isNewer(version.join('.'), range.max)) {
+        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,18 @@
 /// <reference types="node" />
 import EventEmitter from 'events';
 import { TransportInfo, CoreMessage } from '../events';
+import { AbstractMethod } from './AbstractMethod';
+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(): Promise<AbstractMethod<any, undefined>>;
     getTransportInfo(): TransportInfo | undefined;
+    enumerate(): void;
 }
-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

@@ -19,11 +19,12 @@ let _core;
 let _deviceList;
 let _popupPromise;
 const _uiPromises = [];
-const _callMethods = [];
 let _preferredDevice;
+const _callMethods = [];
 let _interactionTimeout;
 let _deviceListInitTimeout;
 let _overridePromise;
+let _getMethodPromise;
 const _log = (0, debug_1.initLog)('Core');
 const postMessage = (message) => {
     if (message.event === events_2.RESPONSE_EVENT) {
@@ -103,6 +104,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;
@@ -164,7 +166,10 @@ const onCall = async (message) => {
     let method;
     let messageResponse;
     try {
-        method = (0, method_1.getMethod)(message);
+        _log.debug('loading method...');
+        _getMethodPromise = (0, method_1.getMethod)(message);
+        method = await _getMethodPromise;
+        _log.debug('method selected', method.name);
         method.postMessage = postMessage;
         method.getPopupPromise = getPopupPromise;
         method.createUiPromise = createUiPromise;
@@ -339,7 +344,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();
@@ -393,7 +398,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();
@@ -617,8 +626,11 @@ class Core extends events_1.default {
             await _deviceList.dispose();
         }
     }
-    getCurrentMethod() {
-        return _callMethods;
+    async getCurrentMethod() {
+        if (_getMethodPromise) {
+            await _getMethodPromise;
+        }
+        return _callMethods[0];
     }
     getTransportInfo() {
         if (!_deviceList) {
@@ -626,9 +638,18 @@ class Core extends events_1.default {
         }
         return _deviceList.getTransportInfo();
     }
+    enumerate() {
+        if (!_deviceList) {
+            return;
+        }
+        _deviceList.enumerate();
+    }
 }
 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'));

package/lib/core/method.d.ts

@@ -1,6 +1,6 @@
-import * as Methods from '../api';
 import type { IFrameCallMessage } from '../events';
+import type { AbstractMethod } from './AbstractMethod';
 export declare const getMethod: (message: IFrameCallMessage & {
     id?: number;
-}) => 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;
+}) => Promise<AbstractMethod<any>>;
 //# sourceMappingURL=method.d.ts.map

package/lib/core/method.js

@@ -4,12 +4,18 @@ exports.getMethod = void 0;
 const tslib_1 = require("tslib");
 const Methods = tslib_1.__importStar(require("../api"));
 const errors_1 = require("../constants/errors");
-const getMethod = (message) => {
+const network_1 = require("../constants/network");
+const getMethodModule = (method) => network_1.MODULES.find(module => method.startsWith(module));
+const getMethod = async (message) => {
     const { method } = message.payload;
     if (typeof method !== 'string') {
         throw (0, errors_1.TypedError)('Method_InvalidParameter', 'Message method is not set');
     }
-    const MethodConstructor = Methods[method];
+    const methodModule = getMethodModule(method);
+    const methods = methodModule
+        ? await Promise.resolve(`${`../api/${methodModule}/api`}`).then(s => tslib_1.__importStar(require(s)))
+        : Methods;
+    const MethodConstructor = methods[method];
     if (MethodConstructor) {
         return new MethodConstructor(message);
     }

package/lib/core/method.native.d.ts

@@ -0,0 +1,5 @@
+import type { IFrameCallMessage } from '../events';
+export declare const getMethod: (message: IFrameCallMessage & {
+    id?: number;
+}) => Promise<any>;
+//# sourceMappingURL=method.native.d.ts.map

package/lib/core/method.native.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMethod = void 0;
+const tslib_1 = require("tslib");
+const Methods = tslib_1.__importStar(require("../api"));
+const errors_1 = require("../constants/errors");
+const network_1 = require("../constants/network");
+const moduleMethods = {
+    binance: require('../api/binance/api'),
+    cardano: require('../api/cardano/api'),
+    eos: require('../api/eos/api'),
+    ethereum: require('../api/ethereum/api'),
+    nem: require('../api/nem/api'),
+    ripple: require('../api/ripple/api'),
+    solana: require('../api/solana/api'),
+    stellar: require('../api/stellar/api'),
+    tezos: require('../api/tezos/api'),
+};
+const getMethodModule = (method) => network_1.MODULES.find(module => method.startsWith(module));
+const getMethod = async (message) => {
+    const { method } = message.payload;
+    if (typeof method !== 'string') {
+        throw (0, errors_1.TypedError)('Method_InvalidParameter', 'Message method is not set');
+    }
+    const methodModule = getMethodModule(method);
+    const methods = methodModule ? moduleMethods[methodModule] : Methods;
+    const MethodConstructor = methods[method];
+    if (MethodConstructor) {
+        return new MethodConstructor(message);
+    }
+    throw (0, errors_1.TypedError)('Method_InvalidParameter', `Method ${method} not found`);
+};
+exports.getMethod = getMethod;
+//# sourceMappingURL=method.native.js.map

package/lib/data/DataManager.d.ts

@@ -1,4 +1,4 @@
-import type { ConnectSettings } from '../types';
+import { ConnectSettings } from '../types';
 type AssetCollection = {
     [key: string]: JSON;
 };
@@ -60,27 +60,43 @@ export declare class DataManager {
         supportedFirmware: ({
             coin: string[];
             methods: string[];
-            min: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
             max: undefined;
             comment: string[];
             capabilities?: undefined;
         } | {
             coin: string[];
-            min: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
             comment: string[];
             methods?: undefined;
             max?: undefined;
             capabilities?: undefined;
         } | {
             methods: string[];
-            min: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
             comment: string[];
             coin?: undefined;
             max?: undefined;
             capabilities?: undefined;
         } | {
             capabilities: string[];
-            min: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
             comment: string[];
             coin?: undefined;
             methods?: undefined;
@@ -88,17 +104,58 @@ export declare class DataManager {
         } | {
             coin: string[];
             methods: string[];
-            min: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
             comment: string[];
             max?: undefined;
             capabilities?: undefined;
         } | {
             capabilities: string[];
             methods: string[];
-            min: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
             coin?: undefined;
             max?: undefined;
             comment?: undefined;
+        } | {
+            methods: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1: string;
+            };
+            comment: string[];
+            coin?: undefined;
+            max?: undefined;
+            capabilities?: undefined;
+        } | {
+            methods: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1?: undefined;
+            };
+            coin?: undefined;
+            max?: undefined;
+            comment?: undefined;
+            capabilities?: undefined;
+        } | {
+            methods: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1: string;
+            };
+            coin?: undefined;
+            max?: undefined;
+            comment?: undefined;
+            capabilities?: undefined;
         })[];
     };
 }

package/lib/data/DataManager.js

@@ -6,6 +6,7 @@ const coinInfo_1 = require("./coinInfo");
 const firmwareInfo_1 = require("./firmwareInfo");
 const transportInfo_1 = require("./transportInfo");
 const config_1 = require("./config");
+const types_1 = require("../types");
 class DataManager {
     static async load(settings, withAssets = true) {
         const ts = settings.env === 'web' ? `?r=${settings.timestamp}` : '';
@@ -23,8 +24,9 @@ class DataManager {
             ...this.assets.coins,
             eth: this.assets.coinsEth,
         });
-        (0, firmwareInfo_1.parseFirmware)(this.assets['firmware-t1'], 1);
-        (0, firmwareInfo_1.parseFirmware)(this.assets['firmware-t2'], 2);
+        (0, firmwareInfo_1.parseFirmware)(this.assets['firmware-t1b1'], types_1.DeviceModelInternal.T1B1);
+        (0, firmwareInfo_1.parseFirmware)(this.assets['firmware-t2t1'], types_1.DeviceModelInternal.T2T1);
+        (0, firmwareInfo_1.parseFirmware)(this.assets['firmware-t2b1'], types_1.DeviceModelInternal.T2B1);
     }
     static getProtobufMessages() {
         return this.messages;