@trezor/connect 9.6.3 → 9.6.4

package/lib/core/onCallFirmwareUpdate.js

@@ -8,6 +8,7 @@ const constants_1 = require("../constants");
 const firmwareInfo_1 = require("../data/firmwareInfo");
 const events_1 = require("../events");
 const types_1 = require("../types");
+const firmwareUtils_1 = require("../utils/firmwareUtils");
 const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, { deviceList, device, registerEvents, postMessage, log, abortSignal, uiPromises, }) => {
     const target = intermediary || !bootloader ? 'normal' : 'bootloader';
     let i = 0;
@@ -93,43 +94,24 @@ const waitForReconnectedDevice = async ({ bootloader, method, intermediary }, {
     }
     return reconnectedDevice;
 };
-const getRebootMethod = async ({ deviceList, device, log, postMessage, }) => {
-    let method = 'wait';
-    if (!device.bluetoothProps) {
-        return method;
-    }
-    const ctrl = new AbortController();
-    const disconnectedPromise = new Promise(resolve => {
-        const handleDisconnect = () => {
-            log.info(`waitForBluetoothReboot device-disconnected. aborted: ${ctrl.signal.aborted}`);
-            if (!ctrl.signal.aborted) {
-                ctrl.abort();
-                method = 'auto';
-            }
-            resolve();
-        };
-        deviceList.once('device-disconnect', handleDisconnect);
-        ctrl.signal.addEventListener('abort', () => {
-            deviceList.off('device-disconnect', handleDisconnect);
-            resolve();
-        });
-    });
-    await device.release();
-    const restartPromise = new Promise(resolve => {
-        (0, utils_1.resolveAfter)(4000).then(() => {
-            log.info(`waitForBluetoothReboot restartPromise. aborted: ${ctrl.signal.aborted}`);
-            if (!ctrl.signal.aborted) {
-                ctrl.abort();
-                postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_DISCONNECT, {
-                    device: device.toMessageObject(),
-                }));
-            }
+const waitForBluetoothReboot = ({ device, target, postMessage }) => new Promise(resolve => {
+    postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_RECONNECT, {
+        device: device.toMessageObject(),
+        disconnected: false,
+        method: 'auto',
+        target,
+        i: 0,
+    }));
+    const handler = () => {
+        const deviceIsReady = (target === 'bootloader' && device.features?.bootloader_mode) ||
+            (target === 'normal' && device.getThpState()?.properties);
+        if (deviceIsReady) {
+            device.lifecycle.off('device-changed', handler);
             resolve();
-        });
-    });
-    await Promise.race([disconnectedPromise, restartPromise]);
-    return method;
-};
+        }
+    };
+    device.lifecycle.on('device-changed', handler);
+});
 const getInstallationParams = (device, params) => {
     const btcOnly = params.btcOnly ?? device.firmwareType === types_1.FirmwareType.BitcoinOnly;
     if (!device.features.bootloader_mode) {
@@ -245,13 +227,18 @@ const onCallFirmwareUpdate = async ({ params, context, }) => {
         operation: 'downloading',
         progress: 100,
     }));
-    postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_DOWNLOADED, {
-        binary: finalBinaryInfo.binary,
-        binaryVersion: finalBinaryInfo.binaryVersion,
-        releaseVersion: finalBinaryInfo.releaseVersion,
-        firmwareType: device.firmwareType,
-        internalModel: device.features.internal_model,
-    }));
+    const finalBinaryRelease = device?.firmwareReleaseConfigInfo?.release;
+    if ((0, firmwareUtils_1.isFirmwareCacheUsedForSelectedSource)()) {
+        const message = (0, events_1.createUiMessage)(events_1.UI.FIRMWARE_DOWNLOADED, {
+            binary: finalBinaryInfo.binary,
+            binaryVersion: finalBinaryInfo.binaryVersion,
+            releaseVersion: finalBinaryInfo.releaseVersion,
+            firmwareType: device.firmwareType,
+            internalModel: device.features.internal_model,
+            release: finalBinaryRelease,
+        });
+        postMessage(message);
+    }
     const deviceInitiallyConnectedInBootloader = device.features.bootloader_mode;
     let reconnectedDevice = device;
     if (deviceInitiallyConnectedInBootloader) {
@@ -274,15 +261,15 @@ const onCallFirmwareUpdate = async ({ params, context, }) => {
         });
         await device.getCommands().typedCall('RebootToBootloader', 'Success', rebootParams);
         log.info('onCallFirmwareUpdate', 'waiting for disconnected event after rebootToBootloader...');
-        if (device.bluetoothProps) {
+        if (device.descriptor.apiType === 'bluetooth') {
             await device.release();
-            postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_DISCONNECT, {
-                device: device.toMessageObject(),
-            }));
+            await waitForBluetoothReboot({ device, target: 'bootloader', postMessage });
         }
-        await disconnectedPromise;
-        if (device.features.major_version === 1) {
-            await (0, utils_1.resolveAfter)(2000);
+        else {
+            await disconnectedPromise;
+            if (device.features.major_version === 1) {
+                await (0, utils_1.resolveAfter)(2000);
+            }
         }
         reconnectedDevice = await waitForReconnectedDevice({ bootloader: true, method: 'auto' }, { ...context, device });
     }
@@ -311,7 +298,11 @@ const onCallFirmwareUpdate = async ({ params, context, }) => {
             updateFlowType,
         });
     }
-    const method = await getRebootMethod({ deviceList, device, log, postMessage });
+    let method = 'wait';
+    if (device.descriptor.apiType === 'bluetooth') {
+        await waitForBluetoothReboot({ device, target: 'normal', postMessage });
+        method = 'auto';
+    }
     reconnectedDevice = await waitForReconnectedDevice({ bootloader: false, method }, { ...context, device: reconnectedDevice });
     const installedVersion = reconnectedDevice.getVersion();
     if (!bootloaderVersion || !installedVersion) {

package/lib/data/coinInfo.d.ts

@@ -1,15 +1,26 @@
-import type { BitcoinNetworkInfo, DerivationPath } from '../types';
+import type { BitcoinNetworkInfo } from '../types/coinInfo';
+import type { DerivationPath } from '../types/params';
 export declare const getBitcoinNetwork: (pathOrName: DerivationPath) => Readonly<{
     blockchainLink?: {
         type: string;
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -23,21 +34,11 @@ export declare const getBitcoinNetwork: (pathOrName: DerivationPath) => Readonly
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
+    taproot?: boolean | undefined;
     cashAddrPrefix?: string | undefined;
     xPubMagicSegwitNative?: number | undefined;
     xPubMagicSegwit?: number | undefined;
-    taproot?: boolean | undefined;
     type: "bitcoin";
     dustLimit: number;
     curveName: string;
@@ -69,11 +70,21 @@ export declare const getEthereumNetwork: (pathOrNetworkSymbol: DerivationPath) =
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -87,16 +98,6 @@ export declare const getEthereumNetwork: (pathOrNetworkSymbol: DerivationPath) =
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
     network?: undefined;
     type: "ethereum";
@@ -108,11 +109,21 @@ export declare const getMiscNetwork: (pathOrName: DerivationPath) => Readonly<{
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -126,16 +137,6 @@ export declare const getMiscNetwork: (pathOrName: DerivationPath) => Readonly<{
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
     network?: undefined;
     type: "nem" | "misc";
@@ -171,11 +172,21 @@ export declare const fixCoinInfoNetwork: (ci: BitcoinNetworkInfo, path: number[]
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -189,21 +200,11 @@ export declare const fixCoinInfoNetwork: (ci: BitcoinNetworkInfo, path: number[]
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
+    taproot?: boolean | undefined;
     cashAddrPrefix?: string | undefined;
     xPubMagicSegwitNative?: number | undefined;
     xPubMagicSegwit?: number | undefined;
-    taproot?: boolean | undefined;
     type: "bitcoin";
     dustLimit: number;
     curveName: string;
@@ -235,11 +236,21 @@ export declare const getCoinInfo: (currency: string) => Readonly<{
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -253,21 +264,11 @@ export declare const getCoinInfo: (currency: string) => Readonly<{
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
+    taproot?: boolean | undefined;
     cashAddrPrefix?: string | undefined;
     xPubMagicSegwitNative?: number | undefined;
     xPubMagicSegwit?: number | undefined;
-    taproot?: boolean | undefined;
     type: "bitcoin";
     dustLimit: number;
     curveName: string;
@@ -308,11 +309,21 @@ export declare const getAllNetworks: () => (({
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -326,21 +337,11 @@ export declare const getAllNetworks: () => (({
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
+    taproot?: boolean | undefined;
     cashAddrPrefix?: string | undefined;
     xPubMagicSegwitNative?: number | undefined;
     xPubMagicSegwit?: number | undefined;
-    taproot?: boolean | undefined;
     type: "bitcoin";
     dustLimit: number;
     curveName: string;
@@ -371,11 +372,21 @@ export declare const getAllNetworks: () => (({
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -389,16 +400,6 @@ export declare const getAllNetworks: () => (({
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
     network?: undefined;
     type: "ethereum";
@@ -409,11 +410,21 @@ export declare const getAllNetworks: () => (({
         url: string[];
     } | undefined;
     label: string;
+    name: string;
     blockTime: number;
     minFee: number;
     maxFee: number;
     minPriorityFee: number;
-    name: string;
+    defaultFees: {
+        feePerTx?: string | undefined;
+        feeLimit?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        label: "normal" | "custom" | "high" | "economy" | "low";
+        blocks: number;
+        feePerUnit: string;
+    }[];
     shortcut: string;
     slip44: number;
     support: {
@@ -427,16 +438,6 @@ export declare const getAllNetworks: () => (({
         connect: boolean;
     };
     decimals: number;
-    defaultFees: {
-        feePerTx?: string | undefined;
-        feeLimit?: string | undefined;
-        baseFeePerGas?: string | undefined;
-        maxFeePerGas?: string | undefined;
-        maxPriorityFeePerGas?: string | undefined;
-        label: "normal" | "custom" | "high" | "economy" | "low";
-        blocks: number;
-        feePerUnit: string;
-    }[];
 } & {
     network?: undefined;
     type: "nem" | "misc";

package/lib/data/config.js

@@ -32,6 +32,14 @@ exports.config = {
             origin: 'nkbihfbeogaeaoehlefnkodbefgpgknn',
             label: 'MetaMask',
         },
+        {
+            origin: 'bfibaipbbpipfifeecgfehbpmfhdakgo',
+            label: 'Nightly DEV',
+        },
+        {
+            origin: 'fiikommddbeccaoicoejoniammnalkfa',
+            label: 'Nightly',
+        },
         {
             origin: 'bpcdaglidgnlggelgbjfagekoapjmccp',
             label: 'Rainbow DEV',
@@ -122,7 +130,7 @@ exports.config = {
             ],
         },
         {
-            coin: ['eth', 'tsep', 'thol'],
+            coin: ['eth', 'tsep', 'thod'],
             min: { T1B1: '1.8.0', T2T1: '2.1.0' },
             comment: ['There were protobuf backwards incompatible changes.'],
         },

package/lib/data/defaultFeeLevels.d.ts

@@ -1,4 +1,4 @@
-import { FeeInfo, FeeLevel } from '../types';
+import type { FeeInfo, FeeLevel } from '../types/fees';
 export declare const DEFAULT_BITCOIN_LONGTERM_FEE_RATE = "1";
 interface CoinsJsonData {
     shortcut: string;

package/lib/data/defaultFeeLevels.js

@@ -6,7 +6,7 @@ const BLOCKS_FOR_FEE_LEVEL = {
     btc: {
         high: 1,
         normal: 3,
-        economy: 12,
+        economy: 6,
         low: 36,
     },
 };

package/lib/data/deviceAuthenticityBlacklist.d.ts

@@ -0,0 +1,3 @@
+import { DeviceAuthenticityBlacklistConfig } from './deviceAuthenticityBlacklistConfig';
+export declare const deviceAuthenticityBlacklist: DeviceAuthenticityBlacklistConfig;
+//# sourceMappingURL=deviceAuthenticityBlacklist.d.ts.map

package/lib/data/deviceAuthenticityBlacklist.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deviceAuthenticityBlacklist = void 0;
+exports.deviceAuthenticityBlacklist = {
+    version: 1,
+    blacklistedCaPubKeys: [],
+    debug: {
+        blacklistedCaPubKeys: [],
+    },
+};
+//# sourceMappingURL=deviceAuthenticityBlacklist.js.map

package/lib/data/deviceAuthenticityBlacklistConfig.d.ts

@@ -0,0 +1,11 @@
+import { Static } from '@trezor/schema-utils';
+export type DeviceAuthenticityBlacklistConfig = Static<typeof DeviceAuthenticityBlacklistConfig>;
+export declare const DeviceAuthenticityBlacklistConfig: import("@trezor/schema-utils").TIntersect<[import("@trezor/schema-utils").TObject<{
+    blacklistedCaPubKeys: import("@trezor/schema-utils").TArray<import("@trezor/schema-utils").TString>;
+}>, import("@trezor/schema-utils").TObject<{
+    version: import("@trezor/schema-utils").TNumber;
+    debug: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TObject<{
+        blacklistedCaPubKeys: import("@trezor/schema-utils").TArray<import("@trezor/schema-utils").TString>;
+    }>>;
+}>]>;
+//# sourceMappingURL=deviceAuthenticityBlacklistConfig.d.ts.map

package/lib/data/deviceAuthenticityBlacklistConfig.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceAuthenticityBlacklistConfig = void 0;
+const schema_utils_1 = require("@trezor/schema-utils");
+const CertPubKeysBlacklist = schema_utils_1.Type.Object({
+    blacklistedCaPubKeys: schema_utils_1.Type.Array(schema_utils_1.Type.String()),
+});
+exports.DeviceAuthenticityBlacklistConfig = schema_utils_1.Type.Intersect([
+    CertPubKeysBlacklist,
+    schema_utils_1.Type.Object({
+        version: schema_utils_1.Type.Number(),
+        debug: schema_utils_1.Type.Optional(CertPubKeysBlacklist),
+    }),
+]);
+//# sourceMappingURL=deviceAuthenticityBlacklistConfig.js.map