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

package/CHANGELOG.md

@@ -1,17 +1,17 @@
 |             Package              | Stable |    Canary    |
 | :------------------------------: | :----: | :----------: |
-|       npm @trezor/connect        | 9.6.1  | 9.6.2-beta.1 |
-|     npm @trezor/connect-web      | 9.6.1  | 9.6.2-beta.1 |
-| npm @trezor/connect-webextension | 9.6.1  | 9.6.2-beta.1 |
-|    npm @trezor/connect-mobile    | 9.6.1  | 9.6.2-beta.1 |
+|       npm @trezor/connect        | 9.6.1  | 9.6.2-beta.3 |
+|     npm @trezor/connect-web      | 9.6.1  | 9.6.2-beta.3 |
+| npm @trezor/connect-webextension | 9.6.1  | 9.6.2-beta.3 |
+|    npm @trezor/connect-mobile    | 9.6.1  | 9.6.2-beta.3 |
 
 |     Deployment     | Stable |    Canary    |
 | :----------------: | :----: | :----------: |
-| connect.trezor.io/ | 9.6.1  | 9.6.2-beta.1 |
+| connect.trezor.io/ | 9.6.1  | 9.6.2-beta.3 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
-# 9.6.2-beta.1
+# 9.6.2-beta.3
 
 This release is important for smooth support of 2.9.0 trezor firmware, namely commits:
 

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.6.2-beta.1
+API version 9.6.2-beta.3
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)

package/lib/api/ethereum/api/ethereumSignTypedData.d.ts

@@ -99,7 +99,7 @@ export default class EthereumSignTypedData extends AbstractMethod<'ethereumSignT
     init(): void;
     initAsync(): Promise<void>;
     get info(): string;
-    getButtonRequestData(code: string): {
+    getButtonRequestData(code: string, name?: string): {
         type: "message";
         coin: string;
         serializedPath: string;

package/lib/api/ethereum/api/ethereumSignTypedData.js

@@ -74,8 +74,18 @@ class EthereumSignTypedData extends AbstractMethod_1.AbstractMethod {
     get info() {
         return (0, ethereumUtils_1.getNetworkLabel)('Sign #NETWORK typed data', (0, coinInfo_1.getEthereumNetwork)(this.params.address_n));
     }
-    getButtonRequestData(code) {
-        if (code === 'ButtonRequest_Other' || code === 'ButtonRequest_SignTx') {
+    getButtonRequestData(code, name) {
+        if ((code === 'ButtonRequest_Other' &&
+            name &&
+            [
+                'should_show_domain',
+                'should_show_struct',
+                'should_show_array',
+                'confirm_typed_value',
+                'confirm_empty_typed_message',
+                'confirm_typed_data_final',
+            ].includes(name)) ||
+            code === 'ButtonRequest_SignTx') {
             return {
                 type: 'message',
                 coin: this.params.network?.shortcut ?? 'ETH',

package/lib/api/firmware/uploadFirmware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFirmware = void 0;
+const transport_1 = require("@trezor/transport");
 const constants_1 = require("../../constants");
 const events_1 = require("../../events");
 const postConfirmationMessage = (device) => {
@@ -41,16 +42,29 @@ const uploadFirmware = async (typedCall, postMessage, device, { payload }) => {
     if (device.features.major_version === 2) {
         postConfirmationMessage(device);
         const length = payload.byteLength;
+        let progress = 0;
         let response = await typedCall('FirmwareErase', ['FirmwareRequest', 'Success'], { length });
         while (response.type !== 'Success') {
             const start = response.message.offset;
             const end = response.message.offset + response.message.length;
             const chunk = payload.slice(start, end);
+            const progressStart = Math.round((start / length) * 100);
+            const progressEnd = Math.round((end / length) * 100);
+            const progressDiff = progressEnd - progressStart;
+            device.transport.on(transport_1.TRANSPORT.SEND_MESSAGE_PROGRESS, p => {
+                const newProgress = progressStart + Math.floor(progressDiff * p);
+                if (start > 0 && newProgress > progress) {
+                    progress = newProgress;
+                    postProgressMessage(device, progress, postMessage);
+                }
+            });
             if (start > 0) {
-                postProgressMessage(device, Math.round((start / length) * 100), postMessage);
+                postProgressMessage(device, progressStart, postMessage);
             }
             response = await typedCall('FirmwareUpload', ['FirmwareRequest', 'Success'], {
                 payload: chunk,
+            }).finally(() => {
+                device.transport.removeAllListeners(transport_1.TRANSPORT.SEND_MESSAGE_PROGRESS);
             });
         }
         postProgressMessage(device, 100, postMessage);

package/lib/core/onCallFirmwareUpdate.js

@@ -92,9 +92,7 @@ const getInstallationParams = (device, params) => {
         const isUpdatingToEqualFirmwareType = (device.firmwareType === 'bitcoin-only') === btcOnly;
         const upgrade = device.atLeast('2.6.3') && isUpdatingToNewerVersion && isUpdatingToEqualFirmwareType;
         const manual = !device.atLeast(['1.10.0', '2.6.0']) && !upgrade;
-        const language = device.atLeast('2.7.0') &&
-            device.features.internal_model !== constants_1.PROTO.DeviceModelInternal.T2T1 &&
-            device.features.internal_model !== constants_1.PROTO.DeviceModelInternal.T3T1;
+        const language = false;
         return {
             manual,
             upgrade,

package/lib/data/coinInfo.d.ts

@@ -229,70 +229,6 @@ export declare const fixCoinInfoNetwork: (ci: BitcoinNetworkInfo, path: number[]
     };
     isBitcoin: boolean;
 };
-export declare const getCoinInfoByHash: (hash: string, networkInfo: any) => {
-    blockchainLink?: {
-        type: string;
-        url: string[];
-    } | undefined;
-    label: string;
-    blockTime: number;
-    minFee: number;
-    maxFee: number;
-    minPriorityFee: number;
-    name: string;
-    shortcut: string;
-    slip44: number;
-    support: {
-        T1B1: string | false;
-        T2T1: string | false;
-        T2B1: string | false;
-        T3B1: string | false;
-        T3T1: string | false;
-        T3W1: string | false;
-        UNKNOWN: string | false;
-        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;
-    }[];
-} & {
-    cashAddrPrefix?: string | undefined;
-    xPubMagicSegwitNative?: number | undefined;
-    xPubMagicSegwit?: number | undefined;
-    taproot?: boolean | undefined;
-    type: "bitcoin";
-    dustLimit: number;
-    curveName: string;
-    forceBip143: boolean;
-    hashGenesisBlock: string;
-    maxAddressLength: number;
-    maxFeeSatoshiKb: number;
-    minAddressLength: number;
-    minFeeSatoshiKb: number;
-    segwit: boolean;
-    xPubMagic: number;
-    network: {
-        forkId?: number | undefined;
-        messagePrefix: string;
-        bech32: string;
-        bip32: {
-            public: number;
-            private: number;
-        };
-        pubKeyHash: number;
-        scriptHash: number;
-        wif: number;
-    };
-    isBitcoin: boolean;
-};
 export declare const getCoinInfo: (currency: string) => ({
     blockchainLink?: {
         type: string;

package/lib/data/coinInfo.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllNetworks = exports.getUniqueNetworks = exports.parseCoinsJson = exports.ethereumNetworkInfoBase = exports.getCoinName = exports.getCoinInfo = exports.getCoinInfoByHash = exports.fixCoinInfoNetwork = exports.getBech32Network = exports.getSegwitNetwork = exports.getMiscNetwork = exports.getEthereumNetwork = exports.getBitcoinNetwork = void 0;
+exports.getAllNetworks = exports.getUniqueNetworks = exports.parseCoinsJson = exports.ethereumNetworkInfoBase = exports.getCoinName = exports.getCoinInfo = exports.fixCoinInfoNetwork = exports.getBech32Network = exports.getSegwitNetwork = exports.getMiscNetwork = exports.getEthereumNetwork = exports.getBitcoinNetwork = void 0;
 const utils_1 = require("@trezor/utils");
 const defaultFeeLevels_1 = require("./defaultFeeLevels");
-const constants_1 = require("../constants");
 const pathUtils_1 = require("../utils/pathUtils");
 const bitcoinNetworks = [];
 const ethereumNetworks = [];
@@ -86,44 +85,6 @@ const fixCoinInfoNetwork = (ci, path) => {
     return coinInfo;
 };
 exports.fixCoinInfoNetwork = fixCoinInfoNetwork;
-const detectBtcVersion = (data) => {
-    if (data.subversion == null) {
-        return 'btc';
-    }
-    if (data.subversion.startsWith('/Bitcoin ABC')) {
-        return 'bch';
-    }
-    if (data.subversion.startsWith('/Bitcoin Cash')) {
-        return 'bch';
-    }
-    if (data.subversion.startsWith('/Bitcoin Gold')) {
-        return 'btg';
-    }
-    return 'btc';
-};
-const getCoinInfoByHash = (hash, networkInfo) => {
-    const networks = (0, utils_1.cloneObject)(bitcoinNetworks);
-    const result = networks.find(info => hash.toLowerCase() === info.hashGenesisBlock.toLowerCase());
-    if (!result) {
-        throw constants_1.ERRORS.TypedError('Method_UnknownCoin', `Coin info not found for hash: ${hash} ${networkInfo.hashGenesisBlock}`);
-    }
-    if (result.isBitcoin) {
-        const btcVersion = detectBtcVersion(networkInfo);
-        let fork;
-        if (btcVersion === 'bch') {
-            fork = networks.find(info => info.name === 'Bcash');
-        }
-        else if (btcVersion === 'btg') {
-            fork = networks.find(info => info.name === 'Bgold');
-        }
-        if (fork) {
-            return fork;
-        }
-        throw constants_1.ERRORS.TypedError('Method_UnknownCoin', `Coin info not found for hash: ${hash} ${networkInfo.hashGenesisBlock} BTC version:${btcVersion}`);
-    }
-    return result;
-};
-exports.getCoinInfoByHash = getCoinInfoByHash;
 const getCoinInfo = (currency) => (0, exports.getBitcoinNetwork)(currency) || (0, exports.getEthereumNetwork)(currency) || (0, exports.getMiscNetwork)(currency);
 exports.getCoinInfo = getCoinInfo;
 const getCoinName = (path) => {

package/lib/data/version.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "9.6.2-beta.1";
+export declare const VERSION = "9.6.2-beta.3";
 export declare const DEFAULT_DOMAIN: string;
 export declare const CONTENT_SCRIPT_VERSION = 1;
 export declare const DEEPLINK_VERSION = 1;

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEEPLINK_VERSION = exports.CONTENT_SCRIPT_VERSION = exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.6.2-beta.1';
+exports.VERSION = '9.6.2-beta.3';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 const isBeta = exports.VERSION.includes('beta');
 exports.DEFAULT_DOMAIN = isBeta

package/lib/device/Device.js

@@ -572,7 +572,7 @@ class Device extends utils_1.TypedEmitter {
             this._firmwareType = types_1.FirmwareType.BitcoinOnly;
         }
         else if (feat.fw_vendor === 'Trezor') {
-            this._firmwareType = types_1.FirmwareType.Regular;
+            this._firmwareType = types_1.FirmwareType.Universal;
         }
         else if (this.getMode() !== 'bootloader') {
             this._firmwareType =
@@ -580,7 +580,7 @@ class Device extends utils_1.TypedEmitter {
                     feat.capabilities.length > 0 &&
                     !feat.capabilities.includes('Capability_Bitcoin_like')
                     ? types_1.FirmwareType.BitcoinOnly
-                    : types_1.FirmwareType.Regular;
+                    : types_1.FirmwareType.Universal;
         }
         const deviceInfo = device_utils_1.models[feat.internal_model] ?? {
             name: `Unknown ${feat.internal_model}`,

package/lib/device/DeviceCurrentSession.js

@@ -25,6 +25,7 @@ const allowedCallsBeforeInitialize = [
     'GetFirmwareHash',
     'ChangeLanguage',
     'DataChunkAck',
+    'RebootToBootloader',
     'FirmwareErase',
     'FirmwareUpload',
 ];

package/lib/types/device.d.ts

@@ -1,5 +1,6 @@
 import { FeaturesNarrowing, FirmwareType } from '@trezor/device-utils';
 import type { ThpStateSerialized } from '@trezor/protocol';
+import { Branded } from '@trezor/type-utils';
 import type { PROTO } from '../constants';
 import type { ReleaseInfo } from './firmware';
 export type DeviceStatus = 'available' | 'occupied' | 'used';
@@ -34,9 +35,7 @@ export type FirmwareHashCheckResult = {
     attemptCount?: number;
     errorPayload?: unknown;
 };
-export type DeviceUniquePath = string & {
-    __type: 'DeviceUniquePath';
-};
+export type DeviceUniquePath = string & Branded<'DeviceUniquePath'>;
 export declare const DeviceUniquePath: (id: string) => DeviceUniquePath;
 type BaseDevice = {
     path: DeviceUniquePath;

package/lib/utils/assetUtils.js

@@ -13,7 +13,7 @@ exports.firmwareAssets = {
     [device_utils_1.DeviceModelInternal.T3T1]: require('@trezor/connect-common/files/firmware/t3t1/releases.json'),
     [device_utils_1.DeviceModelInternal.T3W1]: require('@trezor/connect-common/files/firmware/t3w1/releases.json'),
 };
-exports.firmwareReleaseConfigAssets = require('@trezor/connect-common/files/firmware/release/releases.v1.ts');
+exports.firmwareReleaseConfigAssets = require('@trezor/connect-common/files/firmware/release/releases.v1.json');
 const tryLocalAssetRequire = (url) => {
     const fileUrl = url.split('?')[0];
     switch (fileUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trezor/connect",
-  "version": "9.6.2-beta.1",
+  "version": "9.6.2-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.",
@@ -79,21 +79,21 @@
     "@solana-program/token": "^0.5.1",
     "@solana-program/token-2022": "^0.4.2",
     "@solana/kit": "^2.1.1",
-    "@trezor/blockchain-link": "2.5.2-beta.1",
-    "@trezor/blockchain-link-types": "1.4.2-beta.1",
-    "@trezor/blockchain-link-utils": "1.4.2-beta.1",
-    "@trezor/connect-analytics": "1.3.4",
-    "@trezor/connect-common": "0.4.2-beta.1",
+    "@trezor/blockchain-link": "2.5.2-beta.2",
+    "@trezor/blockchain-link-types": "1.4.2-beta.3",
+    "@trezor/blockchain-link-utils": "1.4.2-beta.2",
+    "@trezor/connect-analytics": "1.3.5-beta.1",
+    "@trezor/connect-common": "0.4.2-beta.3",
     "@trezor/crypto-utils": "1.1.4-beta.1",
     "@trezor/device-utils": "1.1.2-beta.1",
     "@trezor/env-utils": "^1.4.2-beta.1",
     "@trezor/protobuf": "1.4.2-beta.1",
     "@trezor/protocol": "1.2.8-beta.1",
     "@trezor/schema-utils": "1.3.4-beta.1",
-    "@trezor/transport": "1.5.2-beta.1",
-    "@trezor/type-utils": "1.1.8-beta.1",
-    "@trezor/utils": "9.4.2-beta.1",
-    "@trezor/utxo-lib": "2.4.2-beta.1",
+    "@trezor/transport": "1.5.2-beta.2",
+    "@trezor/type-utils": "1.1.8-beta.2",
+    "@trezor/utils": "9.4.2-beta.2",
+    "@trezor/utxo-lib": "2.4.2-beta.2",
     "blakejs": "^1.2.1",
     "bs58": "^6.0.0",
     "bs58check": "^4.0.0",