@trezor/connect 9.4.3-beta.1 → 9.4.3-beta.2

package/lib/core/index.js

@@ -5,7 +5,6 @@ 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 utils_2 = require("@trezor/utils");
 const connect_common_1 = require("@trezor/connect-common");
 const DataManager_1 = require("../data/DataManager");
 const DeviceList_1 = require("../device/DeviceList");
@@ -39,7 +38,7 @@ const initDevice = async (context, devicePath) => {
     const origin = DataManager_1.DataManager.getSettings('origin');
     const useCoreInPopup = DataManager_1.DataManager.getSettings('useCoreInPopup');
     const { preferredDevice } = connect_common_1.storage.load().origin[origin] || {};
-    const preferredDeviceInList = preferredDevice && deviceList.getDevice(preferredDevice.path);
+    const preferredDeviceInList = preferredDevice && deviceList.getDeviceByPath(preferredDevice.path);
     if (preferredDevice && !preferredDeviceInList) {
         connect_common_1.storage.save(store => {
             store.origin[origin] = { ...store.origin[origin], preferredDevice: undefined };
@@ -47,16 +46,16 @@ const initDevice = async (context, devicePath) => {
         });
     }
     if (devicePath) {
-        device = deviceList.getDevice(devicePath);
+        device = deviceList.getDeviceByPath(devicePath);
         showDeviceSelection =
-            !device || !!(device === null || device === void 0 ? void 0 : device.unreadableError) || (device.isUnacquired() && !!isUsingPopup);
+            !device || device.isUnreadable() || (device.isUnacquired() && !!isUsingPopup);
     }
     else {
-        const devices = deviceList.asArray();
-        if (devices.length === 1 && (!isWebUsb || !isUsingPopup)) {
-            device = deviceList.getDevice(devices[0].path);
+        const onlyDevice = deviceList.getOnlyDevice();
+        if (onlyDevice && (!isWebUsb || !isUsingPopup)) {
+            device = onlyDevice;
             showDeviceSelection =
-                !!(device === null || device === void 0 ? void 0 : device.unreadableError) || device.isUnacquired() || !!useCoreInPopup;
+                device.isUnreadable() || device.isUnacquired() || !!useCoreInPopup;
         }
         else {
             showDeviceSelection = true;
@@ -66,18 +65,18 @@ const initDevice = async (context, devicePath) => {
         uiPromises.create(events_2.UI.RECEIVE_DEVICE);
         await waitForPopup(context);
         (0, DeviceList_1.assertDeviceListConnected)(deviceList);
-        const devices = deviceList.asArray();
-        if (devices.length === 1 &&
-            devices[0].type !== 'unreadable' &&
-            devices[0].features &&
+        const onlyDevice = deviceList.getOnlyDevice();
+        if (onlyDevice &&
+            !onlyDevice.isUnreadable() &&
+            !onlyDevice.isUnacquired() &&
             !isWebUsb &&
             !useCoreInPopup) {
-            device = deviceList.getDevice(devices[0].path);
+            device = onlyDevice;
         }
         else {
             sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.SELECT_DEVICE, {
                 webusb: isWebUsb,
-                devices: deviceList.asArray(),
+                devices: deviceList.getAllDevices().map(d => d.toMessageObject()),
             }));
             if (uiPromises.exists(events_2.UI.RECEIVE_DEVICE)) {
                 const { payload } = await uiPromises.get(events_2.UI.RECEIVE_DEVICE);
@@ -91,7 +90,7 @@ const initDevice = async (context, devicePath) => {
                         return store;
                     });
                 }
-                device = deviceList.getDevice(payload.device.path);
+                device = deviceList.getDeviceByPath(payload.device.path);
             }
         }
     }
@@ -150,7 +149,7 @@ const inner = async (context, method, device) => {
     }
     const unexpectedMode = device.hasUnexpectedMode(method.allowDeviceMode, method.requireDeviceMode);
     if (unexpectedMode) {
-        device.keepTransportSession = false;
+        device.releaseTransportSession();
         if (isUsingPopup) {
             await waitForPopup(context);
             sendCoreMessage((0, events_2.createUiMessage)(unexpectedMode, device.toMessageObject()));
@@ -159,7 +158,8 @@ const inner = async (context, method, device) => {
         }
         return Promise.reject(constants_1.ERRORS.TypedError('Device_ModeException', unexpectedMode));
     }
-    method.checkPermissions();
+    method.checkDeviceCapability();
+    method.checkPermissions({ origin: DataManager_1.DataManager.getSettings('origin') });
     if (!trustedHost && method.requiredPermissions.length > 0) {
         await waitForPopup(context);
         const uiPromise = uiPromises.create(events_2.UI.RECEIVE_PERMISSION, device);
@@ -169,7 +169,7 @@ const inner = async (context, method, device) => {
         }));
         const { granted, remember } = await uiPromise.promise.then(({ payload }) => payload);
         if (granted) {
-            method.savePermissions(!remember);
+            method.savePermissions(!remember, { origin: DataManager_1.DataManager.getSettings('origin') });
         }
         else {
             return Promise.reject(constants_1.ERRORS.TypedError('Method_PermissionsNotGranted'));
@@ -288,6 +288,11 @@ const onCall = async (context, message) => {
         sendCoreMessage((0, events_2.createResponseMessage)(responseID, false, { error }));
         return Promise.resolve();
     }
+    if (method.payload.__info) {
+        const response = method.getMethodInfo();
+        sendCoreMessage((0, events_2.createResponseMessage)(method.responseID, true, response));
+        return Promise.resolve();
+    }
     if (!method.useDevice) {
         try {
             if (method.useUi) {
@@ -304,7 +309,7 @@ const onCall = async (context, message) => {
         }
         return Promise.resolve();
     }
-    if (method.isManagementRestricted()) {
+    if (method.isManagementRestricted({ origin: DataManager_1.DataManager.getSettings('origin') })) {
         sendCoreMessage((0, events_2.createPopupMessage)(events_2.POPUP.CANCEL_POPUP_REQUEST));
         sendCoreMessage((0, events_2.createResponseMessage)(responseID, false, {
             error: constants_1.ERRORS.TypedError('Method_NotAllowed'),
@@ -314,7 +319,7 @@ const onCall = async (context, message) => {
     return await onCallDevice(context, message, method);
 };
 const onCallDevice = async (context, message, method) => {
-    var _a;
+    var _a, _b;
     const { deviceList, callMethods, getOverridePromise, setOverridePromise, sendCoreMessage } = context;
     const responseID = message.id;
     const { origin, env, useCoreInPopup } = DataManager_1.DataManager.getSettings();
@@ -416,6 +421,11 @@ const onCallDevice = async (context, message, method) => {
         if (getOverridePromise()) {
             await getOverridePromise();
         }
+        if (method.keepSession &&
+            method.deviceState &&
+            method.deviceState.sessionId !== ((_b = device.getState()) === null || _b === void 0 ? void 0 : _b.sessionId)) {
+            sendCoreMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CHANGED, device.toMessageObject()));
+        }
         const response = messageResponse;
         if (response) {
             if (method.name === 'rebootToBootloader' && response.success) {
@@ -423,7 +433,7 @@ const onCallDevice = async (context, message, method) => {
                 try {
                     await device.run(() => Promise.resolve(), { skipFinalReload: true });
                 }
-                catch (err) {
+                catch {
                 }
             }
             await device.cleanup();
@@ -523,9 +533,9 @@ const onPopupClosed = (context, customErrorMessage) => {
     const error = customErrorMessage
         ? constants_1.ERRORS.TypedError('Method_Cancel', customErrorMessage)
         : constants_1.ERRORS.TypedError('Method_Interrupted');
-    if (deviceList.isConnected() && deviceList.asArray().length > 0) {
-        deviceList.allDevices().forEach(d => {
-            d.keepTransportSession = false;
+    if (deviceList.isConnected() && deviceList.getDeviceCount() > 0) {
+        deviceList.getAllDevices().forEach(d => {
+            d.releaseTransportSession();
             if (d.isUsedHere()) {
                 setOverridePromise(d.interruptionFromUser(error));
             }
@@ -551,18 +561,18 @@ const handleDeviceSelectionChanges = (context, interruptDevice) => {
     const { uiPromises, deviceList, sendCoreMessage } = context;
     const promiseExists = uiPromises.exists(events_2.UI.RECEIVE_DEVICE);
     if (promiseExists && deviceList.isConnected()) {
-        const list = deviceList.asArray();
+        const onlyDevice = deviceList.getOnlyDevice();
         const isWebUsb = deviceList.transportType() === 'WebUsbTransport';
-        if (list.length === 1 && !isWebUsb) {
+        if (onlyDevice && !isWebUsb) {
             uiPromises.resolve({
                 type: events_2.UI.RECEIVE_DEVICE,
-                payload: { device: list[0] },
+                payload: { device: onlyDevice.toMessageObject() },
             });
         }
         else {
             sendCoreMessage((0, events_2.createUiMessage)(events_2.UI.SELECT_DEVICE, {
                 webusb: isWebUsb,
-                devices: list,
+                devices: deviceList.getAllDevices().map(d => d.toMessageObject()),
             }));
         }
     }
@@ -604,7 +614,7 @@ class Core extends events_1.default {
         this.abortController = new AbortController();
         this.callMethods = [];
         this.popupPromise = (0, popupPromiseManager_1.createPopupPromiseManager)();
-        this.methodSynchronize = (0, utils_2.getSynchronize)();
+        this.methodSynchronize = (0, utils_1.getSynchronize)();
         this.uiPromises = (0, uiPromiseManager_1.createUiPromiseManager)(() => startInteractionTimeout(this.getCoreContext()));
         this.waitForFirstMethod = (0, utils_1.createDeferred)();
     }
@@ -741,7 +751,7 @@ class Core extends events_1.default {
         const onCoreEventThrottled = (message) => throttlePromise.promise.then(() => onCoreEvent(message));
         try {
             await DataManager_1.DataManager.load(settings);
-            const { debug, priority, _sessionsBackgroundUrl } = DataManager_1.DataManager.getSettings();
+            const { debug, priority, _sessionsBackgroundUrl, manifest } = DataManager_1.DataManager.getSettings();
             const messages = DataManager_1.DataManager.getProtobufMessages();
             (0, debug_1.enableLog)(debug);
             this._interactionTimeout = new interactionTimeout_1.InteractionTimeout(settings.popup ? settings.interactionTimeout : 0);
@@ -750,6 +760,7 @@ class Core extends events_1.default {
                 messages,
                 priority,
                 _sessionsBackgroundUrl,
+                manifest,
             });
             initDeviceList(this.getCoreContext());
             this.on(events_2.CORE_EVENT, onCoreEventThrottled);

package/lib/core/onCallFirmwareUpdate.d.ts

@@ -1,6 +1,6 @@
 import { DeviceList } from '../device/DeviceList';
 import { CoreEventMessage } from '../events';
-import { CommonParams } from '../types';
+import { CommonParams, DeviceUniquePath } from '../types';
 import type { Log } from '../utils/debug';
 import type { Device } from '../device/Device';
 type PostMessage = (message: CoreEventMessage) => void;
@@ -13,7 +13,7 @@ export type Params = {
 type Context = {
     deviceList: DeviceList;
     postMessage: PostMessage;
-    initDevice: (path?: string) => Promise<Device>;
+    initDevice: (path?: DeviceUniquePath) => Promise<Device>;
     log: Log;
     abortSignal: AbortSignal;
 };

package/lib/core/onCallFirmwareUpdate.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onCallFirmwareUpdate = void 0;
 const crypto_1 = require("crypto");
 const utils_1 = require("@trezor/utils");
+const versionUtils_1 = require("@trezor/utils/lib/versionUtils");
 const events_1 = require("../events");
 const firmware_1 = require("../api/firmware");
 const firmwareInfo_1 = require("../data/firmwareInfo");
 const constants_1 = require("../constants");
-const versionUtils_1 = require("@trezor/utils/lib/versionUtils");
 const registerEvents = (device, postMessage) => {
     device.on(events_1.DEVICE.BUTTON, (_d, request) => {
         postMessage((0, events_1.createDeviceMessage)(events_1.DEVICE.BUTTON, {
@@ -44,10 +44,10 @@ const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, {
         }));
         await (0, utils_1.createTimeoutPromise)(2000);
         try {
-            const path = deviceList.getFirstDevicePath();
-            reconnectedDevice = deviceList.getDevice(path);
+            reconnectedDevice = deviceList.getOnlyDevice();
+        }
+        catch {
         }
-        catch { }
         i++;
         log.debug('onCallFirmwareUpdate', 'waiting for device to reconnect', i);
     } while (!abortSignal.aborted &&
@@ -167,7 +167,7 @@ const onCallFirmwareUpdate = async ({ params, context: { deviceList, postMessage
     if (!device.firmwareRelease) {
         throw constants_1.ERRORS.TypedError('Runtime', 'device.firmwareRelease is not set');
     }
-    if (deviceList.allDevices().length > 1) {
+    if (deviceList.getDeviceCount() > 1) {
         throw constants_1.ERRORS.TypedError('Device_MultipleNotSupported', 'Firmware update allowed with only 1 device connected');
     }
     log.debug('onCallFirmwareUpdate', 'device', device);

package/lib/data/DataManager.d.ts

@@ -10,187 +10,6 @@ export declare class DataManager {
     static getProtobufMessages(): Record<string, any>;
     static getSettings(key?: undefined): ConnectSettings;
     static getSettings<T extends keyof ConnectSettings>(key: T): ConnectSettings[T];
-    static getConfig(): {
-        webusb: {
-            vendorId: number;
-            productId: number;
-        }[];
-        whitelist: {
-            origin: string;
-            priority: number;
-        }[];
-        management: {
-            origin: string;
-        }[];
-        knownHosts: {
-            origin: string;
-            label: string;
-            icon: string;
-        }[];
-        onionDomains: {
-            'trezor.io': string;
-        };
-        assets: {
-            name: string;
-            url: string;
-        }[];
-        messages: string;
-        supportedBrowsers: {
-            chrome: {
-                version: number;
-                download: string;
-                update: string;
-            };
-            chromium: {
-                version: number;
-                download: string;
-                update: string;
-            };
-            electron: {
-                version: number;
-                download: string;
-                update: string;
-            };
-            firefox: {
-                version: number;
-                download: string;
-                update: string;
-            };
-            brave: {
-                version: number;
-                download: string;
-                update: string;
-            };
-            edge: {
-                version: number;
-                download: string;
-                update: string;
-            };
-            opera: {
-                version: number;
-                download: string;
-                update: string;
-            };
-        };
-        supportedFirmware: ({
-            coin: string[];
-            methods: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            max: undefined;
-            comment: string[];
-            capabilities?: undefined;
-        } | {
-            coin: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            comment: string[];
-            methods?: undefined;
-            max?: undefined;
-            capabilities?: undefined;
-        } | {
-            methods: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            comment: string[];
-            coin?: undefined;
-            max?: undefined;
-            capabilities?: undefined;
-        } | {
-            capabilities: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            comment: string[];
-            coin?: undefined;
-            methods?: undefined;
-            max?: undefined;
-        } | {
-            coin: string[];
-            methods: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            comment: string[];
-            max?: undefined;
-            capabilities?: undefined;
-        } | {
-            capabilities: string[];
-            methods: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            coin?: undefined;
-            max?: undefined;
-            comment?: undefined;
-        } | {
-            methods: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1: string;
-                T3B1: string;
-                T3T1: string;
-            };
-            coin?: undefined;
-            max?: undefined;
-            comment?: undefined;
-            capabilities?: undefined;
-        } | {
-            methods: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1?: undefined;
-                T3B1?: undefined;
-                T3T1?: undefined;
-            };
-            coin?: undefined;
-            max?: undefined;
-            comment?: undefined;
-            capabilities?: undefined;
-        } | {
-            capabilities: string[];
-            min: {
-                T1B1: string;
-                T2T1: string;
-                T2B1: string;
-                T3B1: string;
-                T3T1: string;
-            };
-            comment: string[];
-            coin?: undefined;
-            methods?: undefined;
-            max?: undefined;
-        })[];
-    };
 }
 export {};
 //# sourceMappingURL=DataManager.d.ts.map

package/lib/data/DataManager.js

@@ -5,20 +5,57 @@ const assets_1 = require("../utils/assets");
 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");
+const assets = [
+    {
+        name: 'coins',
+        url: './data/coins.json',
+    },
+    {
+        name: 'coinsEth',
+        url: './data/coins-eth.json',
+    },
+    {
+        name: 'bridge',
+        url: './data/bridge/releases.json',
+    },
+    {
+        name: 'firmware-t1b1',
+        url: './data/firmware/t1b1/releases.json',
+    },
+    {
+        name: 'firmware-t2t1',
+        url: './data/firmware/t2t1/releases.json',
+    },
+    {
+        name: 'firmware-t2b1',
+        url: './data/firmware/t2b1/releases.json',
+    },
+    {
+        name: 'firmware-t3b1',
+        url: './data/firmware/t3b1/releases.json',
+    },
+    {
+        name: 'firmware-t3t1',
+        url: './data/firmware/t3t1/releases.json',
+    },
+    {
+        name: 'firmware-t3tw1',
+        url: './data/firmware/t3w1/releases.json',
+    },
+];
 class DataManager {
     static async load(settings, withAssets = true) {
         const ts = settings.env === 'web' ? `?r=${settings.timestamp}` : '';
         this.settings = settings;
         if (!withAssets)
             return;
-        const assetPromises = config_1.config.assets.map(async (asset) => {
+        const assetPromises = assets.map(async (asset) => {
             const json = await (0, assets_1.httpRequest)(`${asset.url}${ts}`, 'json');
             this.assets[asset.name] = json;
         });
         await Promise.all(assetPromises);
-        this.messages = await (0, assets_1.httpRequest)(`${config_1.config.messages}${ts}`, 'json');
+        this.messages = await (0, assets_1.httpRequest)('./data/messages/messages.json', 'json');
         (0, transportInfo_1.parseBridgeJSON)(this.assets.bridge);
         (0, coinInfo_1.parseCoinsJson)({
             ...this.assets.coins,
@@ -43,9 +80,6 @@ class DataManager {
         }
         return this.settings;
     }
-    static getConfig() {
-        return config_1.config;
-    }
 }
 exports.DataManager = DataManager;
 DataManager.assets = {};

package/lib/data/analyticsInfo.js

@@ -6,7 +6,7 @@ const events_1 = require("../events");
 const enhanceMessageWithAnalytics = (message, data) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     switch (message.type) {
-        case events_1.UI_REQUEST.REQUEST_CONFIRMATION:
+        case events_1.UI_REQUEST.REQUEST_CONFIRMATION: {
             const { device } = data;
             return {
                 ...message,
@@ -29,6 +29,7 @@ const enhanceMessageWithAnalytics = (message, data) => {
                     },
                 },
             };
+        }
         default:
             return message;
     }

package/lib/data/coinInfo.d.ts

@@ -17,6 +17,7 @@ export declare const getBitcoinNetwork: (pathOrName: DerivationPath) => ({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -75,6 +76,7 @@ export declare const getEthereumNetwork: (pathOrName: DerivationPath) => ({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -108,6 +110,7 @@ export declare const getMiscNetwork: (pathOrName: DerivationPath) => ({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -165,6 +168,7 @@ export declare const fixCoinInfoNetwork: (ci: BitcoinNetworkInfo, path: number[]
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -223,6 +227,7 @@ export declare const getCoinInfoByHash: (hash: string, networkInfo: any) => {
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -281,6 +286,7 @@ export declare const getCoinInfo: (currency: string) => ({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -338,6 +344,7 @@ export declare const getCoinInfo: (currency: string) => ({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -370,6 +377,7 @@ export declare const getCoinInfo: (currency: string) => ({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -414,6 +422,7 @@ export declare const getUniqueNetworks: (networks: (CoinInfo | undefined)[]) =>
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -471,6 +480,7 @@ export declare const getUniqueNetworks: (networks: (CoinInfo | undefined)[]) =>
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -503,6 +513,7 @@ export declare const getUniqueNetworks: (networks: (CoinInfo | undefined)[]) =>
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -536,6 +547,7 @@ export declare const getAllNetworks: () => (({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -593,6 +605,7 @@ export declare const getAllNetworks: () => (({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;
@@ -625,6 +638,7 @@ export declare const getAllNetworks: () => (({
         T2B1: string | false;
         T3B1: string | false;
         T3T1: string | false;
+        T3W1: string | false;
         connect: boolean;
     };
     decimals: number;