@trezor/connect 9.3.1-beta.1 → 9.3.1-beta.3

package/lib/device/checkFirmwareRevision.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkFirmwareRevision = void 0;
+const versionUtils_1 = require("@trezor/utils/lib/versionUtils");
+const downloadReleasesMetadata_1 = require("../data/downloadReleasesMetadata");
+const device_1 = require("../types/device");
+const calculateRevisionForDevice_1 = require("./calculateRevisionForDevice");
+const getOnlineReleaseMetadata = async ({ firmwareVersion, internalModel, }) => {
+    const onlineReleases = await (0, downloadReleasesMetadata_1.downloadReleasesMetadata)({ internal_model: internalModel });
+    return onlineReleases.find(onlineRelease => (0, versionUtils_1.isEqual)(onlineRelease.version, firmwareVersion));
+};
+const failFirmwareRevisionCheck = (error) => ({ success: false, error });
+const doRevisionsMatch = ({ deviceRevision, expectedCommitRevision, firmwareVersion, }) => {
+    if (deviceRevision === null) {
+        return false;
+    }
+    const adjustedExpected = (0, calculateRevisionForDevice_1.calculateRevisionForDevice)({
+        commitRevision: expectedCommitRevision,
+        version: firmwareVersion,
+    });
+    return adjustedExpected === deviceRevision;
+};
+const checkFirmwareRevision = async ({ firmwareVersion, internalModel, deviceRevision, expectedRevision, }) => {
+    if (internalModel !== device_1.DeviceModelInternal.T2T1 && internalModel !== device_1.DeviceModelInternal.T1B1) {
+        return { success: true };
+    }
+    if (expectedRevision === undefined) {
+        if (firmwareVersion.length !== 3) {
+            return failFirmwareRevisionCheck('firmware-version-unknown');
+        }
+        try {
+            const onlineRelease = await getOnlineReleaseMetadata({
+                firmwareVersion,
+                internalModel,
+            });
+            if ((onlineRelease === null || onlineRelease === void 0 ? void 0 : onlineRelease.firmware_revision) === undefined) {
+                return failFirmwareRevisionCheck('firmware-version-unknown');
+            }
+            if (!doRevisionsMatch({
+                deviceRevision,
+                expectedCommitRevision: onlineRelease.firmware_revision,
+                firmwareVersion,
+            })) {
+                return failFirmwareRevisionCheck('revision-mismatch');
+            }
+            return { success: true };
+        }
+        catch (e) {
+            return {
+                success: false,
+                error: 'cannot-perform-check-offline',
+            };
+        }
+    }
+    if (!doRevisionsMatch({
+        deviceRevision,
+        expectedCommitRevision: expectedRevision,
+        firmwareVersion,
+    })) {
+        return failFirmwareRevisionCheck('revision-mismatch');
+    }
+    return { success: true };
+};
+exports.checkFirmwareRevision = checkFirmwareRevision;
+//# sourceMappingURL=checkFirmwareRevision.js.map

package/lib/events/popup.d.ts

@@ -62,6 +62,7 @@ export interface PopupContentScriptLoaded {
     type: typeof POPUP.CONTENT_SCRIPT_LOADED;
     payload: {
         id: string;
+        contentScriptVersion: number;
     };
 }
 export interface PopupExtensionUsbPermissions {

package/lib/types/device.d.ts

@@ -11,6 +11,12 @@ export declare enum FirmwareType {
 export type UnavailableCapabilities = {
     [key: string]: UnavailableCapability;
 };
+export type FirmwareRevisionCheckResult = {
+    success: true;
+} | {
+    success: false;
+    error: 'revision-mismatch' | 'firmware-version-unknown' | 'firmware-version-unknown' | 'cannot-perform-check-offline';
+};
 export type KnownDevice = {
     type: 'acquired';
     id: string | null;
@@ -28,6 +34,9 @@ export type KnownDevice = {
     features: PROTO.Features;
     unavailableCapabilities: UnavailableCapabilities;
     availableTranslations: string[];
+    authenticityChecks?: {
+        firmwareRevision: FirmwareRevisionCheckResult | null;
+    };
 };
 export type UnknownDevice = {
     type: 'unacquired';

package/lib/types/firmware.d.ts

@@ -10,6 +10,7 @@ export type FirmwareRelease = {
     fingerprint: string;
     changelog: string | string[];
     changelog_bitcoinonly?: string | string[];
+    firmware_revision?: string;
     version: VersionArray;
     min_firmware_version: VersionArray;
     min_bootloader_version: VersionArray;

package/lib/utils/assets-browser.d.ts

@@ -1,2 +1,2 @@
-export declare const httpRequest: (url: string, type?: 'text' | 'binary' | 'json') => Promise<any>;
+export declare const httpRequest: (url: string, type?: 'text' | 'binary' | 'json', options?: RequestInit) => Promise<any>;
 //# sourceMappingURL=assets-browser.d.ts.map

package/lib/utils/assets-browser.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpRequest = void 0;
 const tslib_1 = require("tslib");
 const cross_fetch_1 = tslib_1.__importDefault(require("cross-fetch"));
-const httpRequest = async (url, type = 'text') => {
-    const response = await (0, cross_fetch_1.default)(url, { credentials: 'same-origin' });
+const httpRequest = async (url, type = 'text', options) => {
+    const init = { ...options, credentials: 'same-origin' };
+    const response = await (0, cross_fetch_1.default)(url, init);
     if (response.ok) {
         if (type === 'json') {
             const txt = await response.text();

package/lib/utils/assets.d.ts

@@ -1,4 +1,4 @@
-export declare function httpRequest(url: string, type: 'text'): Promise<string>;
-export declare function httpRequest(url: string, type: 'binary'): Promise<ArrayBuffer>;
-export declare function httpRequest(url: string, type: 'json'): Promise<Record<string, any>>;
+export declare function httpRequest(url: string, type: 'text', options?: RequestInit, skipLocalForceDownload?: boolean): Promise<string>;
+export declare function httpRequest(url: string, type: 'binary', options?: RequestInit, skipLocalForceDownload?: boolean): Promise<ArrayBuffer>;
+export declare function httpRequest(url: string, type: 'json', options?: RequestInit, skipLocalForceDownload?: boolean): Promise<Record<string, any>>;
 //# sourceMappingURL=assets.d.ts.map

package/lib/utils/assets.js

@@ -9,10 +9,10 @@ const assetUtils_1 = require("./assetUtils");
 if (global && typeof global.fetch !== 'function') {
     global.fetch = cross_fetch_1.default;
 }
-function httpRequest(url, type) {
-    const asset = (0, assetUtils_1.getAssetByUrl)(url);
+function httpRequest(url, type, options, skipLocalForceDownload) {
+    const asset = skipLocalForceDownload ? null : (0, assetUtils_1.getAssetByUrl)(url);
     if (!asset) {
-        return /^https?/.test(url) ? (0, assets_browser_1.httpRequest)(url, type) : fs_1.promises.readFile(url);
+        return /^https?/.test(url) ? (0, assets_browser_1.httpRequest)(url, type, options) : fs_1.promises.readFile(url);
     }
     return asset;
 }

package/lib/utils/deviceFeaturesUtils.js

@@ -44,10 +44,22 @@ const getUnavailableCapabilities = (features, coins) => {
         return list;
     const fw = [features.major_version, features.minor_version, features.patch_version].join('.');
     const key = features.internal_model;
+    const duplicatedShortcuts = ['bnb'];
     const supported = coins.filter(info => {
         if (!info.support || info.support[key] === false) {
-            list[info.shortcut.toLowerCase()] = 'no-support';
-            return false;
+            const shortcut = info.shortcut.toLowerCase();
+            if (!duplicatedShortcuts.includes(shortcut)) {
+                list[shortcut] = 'no-support';
+                return false;
+            }
+            else {
+                const occurrences = coins.filter(coin => shortcut == coin.shortcut.toLowerCase());
+                const allUnsupported = occurrences.every(info => !info.support || info.support[key] === false);
+                if (allUnsupported) {
+                    list[shortcut] = 'no-support';
+                }
+                return false;
+            }
         }
         return true;
     });
@@ -64,14 +76,18 @@ const getUnavailableCapabilities = (features, coins) => {
         if (info.type === 'nem') {
             return !capabilities.includes('Capability_NEM');
         }
-        if (info.shortcut === 'BNB')
+        if (info.shortcut === 'BNB' && info.type === 'misc') {
             return !capabilities.includes('Capability_Binance');
-        if (info.shortcut === 'ADA' || info.shortcut === 'tADA')
+        }
+        if (info.shortcut === 'ADA' || info.shortcut === 'tADA') {
             return !capabilities.includes('Capability_Cardano');
-        if (info.shortcut === 'XRP' || info.shortcut === 'tXRP')
+        }
+        if (info.shortcut === 'XRP' || info.shortcut === 'tXRP') {
             return !capabilities.includes('Capability_Ripple');
-        if (info.shortcut === 'SOL' || info.shortcut === 'DSOL')
+        }
+        if (info.shortcut === 'SOL' || info.shortcut === 'DSOL') {
             return !capabilities.includes('Capability_Solana');
+        }
         return !capabilities.includes(`Capability_${info.name}`);
     });
     unavailable.forEach(info => {

package/lib/utils/promiseUtils.d.ts

@@ -1,5 +1,5 @@
-export declare const resolveAfter: (msec: number, value?: any) => {
-    promise: Promise<any>;
-    timeout: NodeJS.Timeout | undefined;
+export declare const resolveAfter: <T = void>(msec: number, value?: T | undefined) => {
+    promise: Promise<T>;
+    reject: (e: Error) => void;
 };
 //# sourceMappingURL=promiseUtils.d.ts.map

package/lib/utils/promiseUtils.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAfter = void 0;
+const utils_1 = require("@trezor/utils");
 const resolveAfter = (msec, value) => {
-    let timeout;
-    const promise = new Promise(resolve => {
-        timeout = setTimeout(resolve, msec, value);
-    });
-    return { promise, timeout };
+    const { promise, reject, resolve } = (0, utils_1.createDeferred)();
+    const timeout = setTimeout(resolve, msec, value);
+    return {
+        promise: promise.finally(() => clearTimeout(timeout)),
+        reject,
+    };
 };
 exports.resolveAfter = resolveAfter;
 //# sourceMappingURL=promiseUtils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trezor/connect",
-  "version": "9.3.1-beta.1",
+  "version": "9.3.1-beta.3",
   "author": "Trezor <info@trezor.io>",
   "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect",
   "description": "High-level javascript interface for Trezor hardware wallet.",
@@ -67,20 +67,20 @@
     "prepublish": "yarn tsx ../../scripts/prepublish.js"
   },
   "dependencies": {
-    "@babel/preset-typescript": "^7.23.3",
+    "@babel/preset-typescript": "^7.24.7",
     "@ethereumjs/common": "^4.3.0",
     "@ethereumjs/tx": "^5.3.0",
     "@fivebinaries/coin-selection": "2.2.1",
-    "@trezor/blockchain-link": "2.2.1-beta.1",
-    "@trezor/blockchain-link-types": "1.1.1-beta.1",
-    "@trezor/connect-analytics": "1.1.0",
-    "@trezor/connect-common": "0.1.1-beta.1",
-    "@trezor/protobuf": "1.1.1-beta.1",
-    "@trezor/protocol": "1.1.0",
-    "@trezor/schema-utils": "1.1.0",
-    "@trezor/transport": "1.2.1-beta.1",
-    "@trezor/utils": "9.1.1-beta.1",
-    "@trezor/utxo-lib": "2.1.0",
+    "@trezor/blockchain-link": "2.2.1-beta.3",
+    "@trezor/blockchain-link-types": "1.1.1-beta.3",
+    "@trezor/connect-analytics": "1.1.1-beta.1",
+    "@trezor/connect-common": "0.1.1-beta.3",
+    "@trezor/protobuf": "1.1.1-beta.2",
+    "@trezor/protocol": "1.1.1-beta.1",
+    "@trezor/schema-utils": "1.1.1-beta.1",
+    "@trezor/transport": "1.2.1-beta.3",
+    "@trezor/utils": "9.1.1-beta.3",
+    "@trezor/utxo-lib": "2.1.1-beta.1",
     "blakejs": "^1.2.1",
     "bs58": "^5.0.0",
     "bs58check": "^3.0.1",
@@ -100,9 +100,9 @@
     "karma-webpack": "^5.0.1",
     "node-libs-browser": "^2.2.1",
     "ts-node": "^10.9.1",
-    "tsx": "^4.7.0",
-    "webpack": "^5.90.1",
-    "ws": "^8.17.1"
+    "tsx": "^4.16.3",
+    "webpack": "^5.93.0",
+    "ws": "^8.18.0"
   },
   "peerDependencies": {
     "tslib": "^2.6.2"