@trezor/connect 9.6.0 → 9.6.1-beta.1

package/CHANGELOG.md

@@ -1,16 +1,45 @@
 |             Package              | Stable |    Canary    |
 | :------------------------------: | :----: | :----------: |
-|       npm @trezor/connect        | 9.6.0  |      -       |
-|     npm @trezor/connect-web      | 9.6.0  |      -       |
-| npm @trezor/connect-webextension | 9.6.0  |      -       |
-|    npm @trezor/connect-mobile    |   -    | 0.0.1-beta.1 |
+|       npm @trezor/connect        | 9.6.0  | 9.6.1-beta.1 |
+|     npm @trezor/connect-web      | 9.6.0  | 9.6.1-beta.1 |
+| npm @trezor/connect-webextension | 9.6.0  | 9.6.1-beta.1 |
+|    npm @trezor/connect-mobile    | 9.6.0  | 9.6.1-beta.1 |
 
-|     Deployment     | Stable | Canary |
-| :----------------: | :----: | :----: |
-| connect.trezor.io/ | 9.6.0  |   -    |
+|     Deployment     | Stable |    Canary    |
+| :----------------: | :----: | :----------: |
+| connect.trezor.io/ | 9.6.0  | 9.6.1-beta.1 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
+# 9.6.1-beta.1
+
+This is a special beta release where we allow temporarily remove firmware version check. We do so to let users stuck with old devices that can't update their firmwares to send their funds out.
+
+## Fixes
+
+- Webusb sync between tabs in browser fixed in connect-popup (dd50a1a, f558513, cdd73c5)
+- fix(connect-web): empty settings in init in suite-desktop mode (3f61be1)
+
+## Features
+
+- Works on the new communication protocol continue:
+    - feat(connect): add ThpState and ThpMessageResponse to DeviceCurrentSession (5919fe9)
+    - feat(connect): add UI response for THP pairing tag (6084994)
+- feat(connect): add getNonce (72a1417)
+- feat(connect): decode hex in message signing (2f41cc6)
+- feat(connect-mobile): add appName and appIcon to deeplink (7f96299)
+- feat(connect-explorer): add appIcon (04dd6d6)
+- feat(connect): add backendType to discovery progress events (a3b804e)
+- feat(connect): track npmVersion in analytics (6cc1058)
+
+## Chores
+
+- chore: update jest to v30 (6d27a2c)
+- chore: update trends deps (a9f0997)
+- chore: add/remove used/unused packages (60fb96b)
+- chore: add missing workspace libs (bc6a681)
+- refactor(connect): split Device related code to workflow modules (dd9ffde)
+
 # 9.6.0
 
 Starting with Connect version 9.6.0, we are introducing a new integration with Trezor Suite. The new flow is designed to provide a more seamless and user-friendly experience for users interacting with Trezor devices.

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.6.0
+API version 9.6.1-beta.1
 
 [![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/blockchainEstimateFee.js

@@ -51,6 +51,7 @@ class BlockchainEstimateFee extends AbstractMethod_1.AbstractMethod {
             blockTime: coinInfo.blockTime,
             minFee: coinInfo.minFee,
             maxFee: coinInfo.maxFee,
+            minPriorityFee: coinInfo.minPriorityFee,
             dustLimit: coinInfo.type === 'bitcoin' ? coinInfo.dustLimit : undefined,
             levels: [],
         };

package/lib/api/discoverAccounts.js

@@ -157,7 +157,15 @@ class DiscoverAccounts extends AbstractMethod_1.AbstractMethod {
                         ? []
                         : await blockchain.getAccountUtxo(descriptor);
                 this.updateProgress(accountKey, index + 1, info.empty);
-                this.sendProgress({ ...info, descriptor, ...descRest, utxo, ...accountKey, index });
+                this.sendProgress({
+                    ...info,
+                    descriptor,
+                    ...descRest,
+                    utxo,
+                    ...accountKey,
+                    index,
+                    backendType: request.coinInfo.blockchainLink?.type,
+                });
                 if (info.empty) {
                     await descPromise.catch(() => { });
                     return { nonempty: index - skip };
@@ -166,7 +174,7 @@ class DiscoverAccounts extends AbstractMethod_1.AbstractMethod {
             catch (error) {
                 descPromise.catch(() => { });
                 this.updateProgress(accountKey, index + 1, true);
-                this.sendProgress({ ...accountKey, index, error: error.message });
+                this.sendProgress({ ...accountKey, index, error: error.message, code: error.code });
                 return { nonempty: index - skip, error };
             }
             index++;

package/lib/api/ethereum/api/ethereumSignMessage.js

@@ -44,7 +44,7 @@ class EthereumSignMessage extends AbstractMethod_1.AbstractMethod {
                 type: 'message',
                 coin: this.params.network?.shortcut ?? 'ETH',
                 serializedPath: (0, pathUtils_1.getSerializedPath)(this.params.address_n),
-                message: this.payload.message,
+                message: this.payload.hex ? (0, formatUtils_1.hexToText)(this.payload.message) : this.payload.message,
             };
         }
     }

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

@@ -74,6 +74,7 @@ declare const Params: import("@trezor/schema-utils").TIntersect<[import("@trezor
         blockTime: import("@trezor/schema-utils").TNumber;
         minFee: import("@trezor/schema-utils").TNumber;
         maxFee: import("@trezor/schema-utils").TNumber;
+        minPriorityFee: import("@trezor/schema-utils").TNumber;
         defaultFees: import("@trezor/schema-utils").TArray<import("@trezor/schema-utils").TObject<{
             label: import("@trezor/schema-utils").TUnion<[import("@trezor/schema-utils").TLiteral<"high">, import("@trezor/schema-utils").TLiteral<"normal">, import("@trezor/schema-utils").TLiteral<"economy">, import("@trezor/schema-utils").TLiteral<"low">, import("@trezor/schema-utils").TLiteral<"custom">]>;
             blocks: import("@trezor/schema-utils").TNumber;
@@ -83,7 +84,6 @@ declare const Params: import("@trezor/schema-utils").TIntersect<[import("@trezor
             baseFeePerGas: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TString>;
             maxFeePerGas: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TString>;
             maxPriorityFeePerGas: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TString>;
-            maxWaitTimeEstimate: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TNumber>;
         }>>;
     }>, import("@trezor/schema-utils").TObject<{
         type: import("@trezor/schema-utils").TLiteral<"ethereum">;

package/lib/api/firmware/getBinary.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBinaryOptional = exports.getBinary = void 0;
+const utils_1 = require("@trezor/utils");
 const assets_1 = require("../../utils/assets");
-const ALL_SLASHES_AT_THE_END_REGEX = /\/+$/;
 const getBinary = ({ baseUrl, btcOnly, release }) => {
     const fwUrl = release[btcOnly ? 'url_bitcoinonly' : 'url'];
-    const sanitizedBaseUrl = baseUrl.replace(ALL_SLASHES_AT_THE_END_REGEX, '');
+    const sanitizedBaseUrl = (0, utils_1.removeTrailingSlashes)(baseUrl);
     const url = `${sanitizedBaseUrl}/${fwUrl}`;
     return (0, assets_1.httpRequest)(url, 'binary');
 };

package/lib/api/getAccountInfo.d.ts

@@ -24,7 +24,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
         label: string;
         customConfirmButton?: undefined;
     };
-    checkFirmwareRange(): "ui-device_firmware_old" | "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined;
+    checkFirmwareRange(): "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined;
     run(): Promise<AccountInfo | (AccountInfo | null)[] | {
         utxo: AccountUtxo[] | undefined;
         descriptor: string;

package/lib/api/getCoinInfo.d.ts

@@ -14,6 +14,7 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
         blockTime: number;
         minFee: number;
         maxFee: number;
+        minPriorityFee: number;
         name: string;
         shortcut: string;
         slip44: number;
@@ -34,7 +35,6 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
             baseFeePerGas?: string | undefined;
             maxFeePerGas?: string | undefined;
             maxPriorityFeePerGas?: string | undefined;
-            maxWaitTimeEstimate?: number | undefined;
             label: "normal" | "custom" | "high" | "economy" | "low";
             blocks: number;
             feePerUnit: string;
@@ -77,6 +77,7 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
         blockTime: number;
         minFee: number;
         maxFee: number;
+        minPriorityFee: number;
         name: string;
         shortcut: string;
         slip44: number;
@@ -97,7 +98,6 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
             baseFeePerGas?: string | undefined;
             maxFeePerGas?: string | undefined;
             maxPriorityFeePerGas?: string | undefined;
-            maxWaitTimeEstimate?: number | undefined;
             label: "normal" | "custom" | "high" | "economy" | "low";
             blocks: number;
             feePerUnit: string;
@@ -115,6 +115,7 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
         blockTime: number;
         minFee: number;
         maxFee: number;
+        minPriorityFee: number;
         name: string;
         shortcut: string;
         slip44: number;
@@ -135,7 +136,6 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
             baseFeePerGas?: string | undefined;
             maxFeePerGas?: string | undefined;
             maxPriorityFeePerGas?: string | undefined;
-            maxWaitTimeEstimate?: number | undefined;
             label: "normal" | "custom" | "high" | "economy" | "low";
             blocks: number;
             feePerUnit: string;

package/lib/api/getNonce.d.ts

@@ -0,0 +1,9 @@
+import { PROTO } from '../constants';
+import { AbstractMethod } from '../core/AbstractMethod';
+export default class GetNonce extends AbstractMethod<'getNonce', PROTO.GetNonce> {
+    init(): void;
+    run(): Promise<{
+        nonce: string;
+    }>;
+}
+//# sourceMappingURL=getNonce.d.ts.map

package/lib/api/getNonce.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AbstractMethod_1 = require("../core/AbstractMethod");
+class GetNonce extends AbstractMethod_1.AbstractMethod {
+    init() {
+        this.useDeviceState = false;
+    }
+    async run() {
+        const cmd = this.device.getCommands();
+        const response = await cmd.typedCall('GetNonce', 'Nonce');
+        return response.message;
+    }
+}
+exports.default = GetNonce;
+//# sourceMappingURL=getNonce.js.map

package/lib/api/index.d.ts

@@ -32,6 +32,7 @@ export { default as getCoinInfo } from './getCoinInfo';
 export { default as getDeviceState } from './getDeviceState';
 export { default as getFeatures } from './getFeatures';
 export { default as getFirmwareHash } from './getFirmwareHash';
+export { default as getNonce } from './getNonce';
 export { default as getOwnershipId } from './getOwnershipId';
 export { default as getOwnershipProof } from './getOwnershipProof';
 export { default as getPublicKey } from './getPublicKey';

package/lib/api/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyMessage = exports.unlockPath = exports.signTransaction = exports.signMessage = exports.setProxy = exports.setBusy = exports.setBrightness = exports.loadDevice = exports.resetDevice = exports.requestLogin = exports.recoveryDevice = exports.pushTransaction = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.getAccountDescriptor = exports.discoverAccounts = exports.composeTransaction = exports.cipherKeyValue = exports.changeWipeCode = exports.changePin = exports.changeLanguage = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainEvmRpcCall = exports.blockchainGetInfo = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.bleUnpair = exports.backupDevice = exports.showDeviceTutorial = exports.cancelCoinjoinAuthorization = exports.authorizeCoinjoin = exports.authenticateDevice = exports.applySettings = exports.applyFlags = void 0;
-exports.wipeDevice = void 0;
+exports.unlockPath = exports.signTransaction = exports.signMessage = exports.setProxy = exports.setBusy = exports.setBrightness = exports.loadDevice = exports.resetDevice = exports.requestLogin = exports.recoveryDevice = exports.pushTransaction = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getNonce = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.getAccountDescriptor = exports.discoverAccounts = exports.composeTransaction = exports.cipherKeyValue = exports.changeWipeCode = exports.changePin = exports.changeLanguage = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainEvmRpcCall = exports.blockchainGetInfo = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.bleUnpair = exports.backupDevice = exports.showDeviceTutorial = exports.cancelCoinjoinAuthorization = exports.authorizeCoinjoin = exports.authenticateDevice = exports.applySettings = exports.applyFlags = void 0;
+exports.wipeDevice = exports.verifyMessage = void 0;
 const tslib_1 = require("tslib");
 var applyFlags_1 = require("./applyFlags");
 Object.defineProperty(exports, "applyFlags", { enumerable: true, get: function () { return tslib_1.__importDefault(applyFlags_1).default; } });
@@ -71,6 +71,8 @@ var getFeatures_1 = require("./getFeatures");
 Object.defineProperty(exports, "getFeatures", { enumerable: true, get: function () { return tslib_1.__importDefault(getFeatures_1).default; } });
 var getFirmwareHash_1 = require("./getFirmwareHash");
 Object.defineProperty(exports, "getFirmwareHash", { enumerable: true, get: function () { return tslib_1.__importDefault(getFirmwareHash_1).default; } });
+var getNonce_1 = require("./getNonce");
+Object.defineProperty(exports, "getNonce", { enumerable: true, get: function () { return tslib_1.__importDefault(getNonce_1).default; } });
 var getOwnershipId_1 = require("./getOwnershipId");
 Object.defineProperty(exports, "getOwnershipId", { enumerable: true, get: function () { return tslib_1.__importDefault(getOwnershipId_1).default; } });
 var getOwnershipProof_1 = require("./getOwnershipProof");

package/lib/api/nem/nemSignTx.d.ts

@@ -37,13 +37,13 @@ export declare const createTx: (tx: $T.NEMTransaction, address_n: number[], chun
             levy?: PROTO.NEMMosaicLevy | undefined;
             divisibility?: number | undefined;
             transferable?: boolean | undefined;
+            networks?: number[] | undefined;
             ticker?: string | undefined;
             levy_address?: string | undefined;
             levy_namespace?: string | undefined;
             levy_mosaic?: string | undefined;
             supply?: number | undefined;
             mutable_supply?: boolean | undefined;
-            networks?: number[] | undefined;
             description: string;
             namespace: string;
             mosaic: string;

package/lib/api/resetDevice.d.ts

@@ -1,15 +1,14 @@
 import { PROTO } from '../constants';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class ResetDevice extends AbstractMethod<'resetDevice', PROTO.ResetDevice> {
-    private isEntropyCheckSuccessful;
     init(): void;
     get info(): string;
     get confirmation(): {
         view: "device-management";
         label: string;
     };
-    private getEntropyData;
-    private entropyCheck;
+    private resetDeviceWorkflow;
+    private entropyCheckWorkflow;
     run(): Promise<{
         message: string;
     }>;

package/lib/api/resetDevice.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_utils_1 = require("@trezor/schema-utils");
-const errors_groups_1 = require("@trezor/transport/lib/errors-groups");
 const utils_1 = require("@trezor/utils");
 const verifyEntropy_1 = require("../api/firmware/verifyEntropy");
 const constants_1 = require("../constants");
@@ -10,7 +9,6 @@ const events_1 = require("../events");
 const paramsValidator_1 = require("./common/paramsValidator");
 const pathUtils_1 = require("../utils/pathUtils");
 class ResetDevice extends AbstractMethod_1.AbstractMethod {
-    isEntropyCheckSuccessful = false;
     init() {
         this.allowDeviceMode = [events_1.UI.INITIALIZE, events_1.UI.SEEDLESS];
         this.useDeviceState = false;
@@ -40,65 +38,65 @@ class ResetDevice extends AbstractMethod_1.AbstractMethod {
             label: 'Do you really you want to create a new wallet?',
         };
     }
-    async getEntropyData(type) {
+    async resetDeviceWorkflow() {
         const cmd = this.device.getCommands();
         const entropy = (0, verifyEntropy_1.generateEntropy)(32).toString('hex');
-        const params = type === 'ResetDevice' ? this.params : {};
-        const entropyRequest = await cmd.typedCall(type, 'EntropyRequest', params);
-        await cmd.typedCall('EntropyAck', ['EntropyCheckReady', 'Success'], { entropy });
-        return {
-            ...entropyRequest.message,
-            host_entropy: entropy,
-        };
+        await cmd.typedCall('ResetDevice', 'EntropyRequest', this.params);
+        await cmd.typedCall('EntropyAck', 'Success', { entropy });
     }
-    async entropyCheck(prevData) {
+    async entropyCheckWorkflow() {
         const cmd = this.device.getCommands();
         const paths = ["m/84'/0'/0'", "m/44'/60'/0'"];
-        const xpubs = {};
-        for (let i = 0; i < paths.length; i++) {
-            const p = paths[i];
-            const pubKey = await cmd.getPublicKey({ address_n: (0, pathUtils_1.validatePath)(p) });
-            xpubs[p] = pubKey.xpub;
-        }
-        const currentData = await this.getEntropyData('EntropyCheckContinue');
-        const res = await (0, verifyEntropy_1.verifyEntropy)({
-            type: this.params.backup_type,
-            strength: this.params.strength,
-            commitment: prevData.entropy_commitment,
-            hostEntropy: prevData.host_entropy,
-            trezorEntropy: currentData.prev_entropy,
-            xpubs,
-        });
-        if (res.error) {
-            await this.device.getCurrentSession().cancelCall();
-            throw new Error(res.error);
+        const handleErr = (error) => {
+            throw error.cause === 'transport-error'
+                ? error
+                : constants_1.ERRORS.TypedError('Failure_EntropyCheck', error.message);
+        };
+        let entropy = (0, verifyEntropy_1.generateEntropy)(32).toString('hex');
+        let commitment = await cmd
+            .typedCall('ResetDevice', 'EntropyRequest', this.params)
+            .then(response => response.message.entropy_commitment);
+        await cmd.typedCall('EntropyAck', 'EntropyCheckReady', { entropy });
+        const tries = (0, utils_1.getRandomInt)(1, 5);
+        for (let i = 0; i < tries; i++) {
+            const xpubs = {};
+            for (const path of paths) {
+                const pubKey = await cmd
+                    .getPublicKey({ address_n: (0, pathUtils_1.validatePath)(path) })
+                    .catch(handleErr);
+                xpubs[path] = pubKey.xpub;
+            }
+            const { prev_entropy, entropy_commitment } = await cmd
+                .typedCall('EntropyCheckContinue', 'EntropyRequest', {})
+                .then(response => response.message)
+                .catch(handleErr);
+            const res = await (0, verifyEntropy_1.verifyEntropy)({
+                type: this.params.backup_type,
+                strength: this.params.strength,
+                commitment,
+                hostEntropy: entropy,
+                trezorEntropy: prev_entropy,
+                xpubs,
+            });
+            if (res.error) {
+                await this.device.getCurrentSession().cancelCall();
+                throw constants_1.ERRORS.TypedError('Failure_EntropyCheck', res.error);
+            }
+            entropy = (0, verifyEntropy_1.generateEntropy)(32).toString('hex');
+            commitment = entropy_commitment;
+            await cmd.typedCall('EntropyAck', 'EntropyCheckReady', { entropy }).catch(handleErr);
         }
-        return currentData;
+        await cmd.typedCall('EntropyCheckContinue', 'Success', { finish: true });
     }
     async run() {
-        const cmd = this.device.getCommands();
         if (this.params.entropy_check && this.device.unavailableCapabilities['entropyCheck']) {
             this.params.entropy_check = false;
         }
-        let entropyData = await this.getEntropyData('ResetDevice');
-        try {
-            if (this.params.entropy_check) {
-                const tries = (0, utils_1.getRandomInt)(1, 5);
-                for (let i = 0; i < tries; i++) {
-                    entropyData = await this.entropyCheck(entropyData);
-                }
-                this.isEntropyCheckSuccessful = true;
-                await cmd.typedCall('EntropyCheckContinue', 'Success', { finish: true });
-            }
+        if (this.params.entropy_check) {
+            await this.entropyCheckWorkflow();
         }
-        catch (error) {
-            if (error.cause === 'transport-error' &&
-                errors_groups_1.ERRORS_WITHOUT_DEVICE_INTERACTION.includes(error.message)) {
-                throw error;
-            }
-            if (this.isEntropyCheckSuccessful === true)
-                throw error;
-            throw constants_1.ERRORS.TypedError('Failure_EntropyCheck', error.message);
+        else {
+            await this.resetDeviceWorkflow();
         }
         return { message: 'Success' };
     }

package/lib/api/signMessage.js

@@ -44,7 +44,7 @@ class SignMessage extends AbstractMethod_1.AbstractMethod {
                 type: 'message',
                 serializedPath: (0, pathUtils_1.getSerializedPath)(this.params.address_n.slice(0, 4)),
                 coin: this.coinInfo?.shortcut ?? 'BTC',
-                message: this.payload.message,
+                message: this.payload.hex ? (0, formatUtils_1.hexToText)(this.payload.message) : this.payload.message,
             };
         }
     }

package/lib/backend/Blockchain.d.ts

@@ -51,6 +51,7 @@ export declare class Blockchain {
     estimateFee(request: Parameters<typeof this.link.estimateFee>[0]): Promise<{
         feePerUnit: string;
         feePerTx?: string;
+        feePayer?: string;
         feeLimit?: string;
         eip1559?: import("@trezor/blockchain-link-types/lib/blockbook-api").Eip1559Fees;
     }[]>;

package/lib/backend/fees/BitcoinFeeLevels.d.ts

@@ -12,7 +12,6 @@ export declare class BitcoinFeeLevels extends MiscFeeLevels {
         baseFeePerGas?: string | undefined;
         maxFeePerGas?: string | undefined;
         maxPriorityFeePerGas?: string | undefined;
-        maxWaitTimeEstimate?: number | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         blocks: number;
         feePerUnit: string;

package/lib/backend/fees/EthereumFeeLevels.d.ts

@@ -11,7 +11,6 @@ export declare class EthereumFeeLevels extends MiscFeeLevels {
         baseFeePerGas?: string | undefined;
         maxFeePerGas?: string | undefined;
         maxPriorityFeePerGas?: string | undefined;
-        maxWaitTimeEstimate?: number | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         blocks: number;
         feePerUnit: string;

package/lib/backend/fees/EthereumFeeLevels.js

@@ -19,21 +19,25 @@ class EthereumFeeLevels extends MiscFeeLevels_1.MiscFeeLevels {
             const feeInWei = new bigNumber_1.BigNumber(response.feePerUnit).toNumber();
             const feePerUnit = Math.min(maxFeeInWei, Math.max(minFeeInWei, feeInWei)).toString();
             if (eip1559?.baseFeePerGas) {
+                const minMaxPriorityFeePerGas = new bigNumber_1.BigNumber(this.coinInfo.minPriorityFee)
+                    .multipliedBy('1e+9')
+                    .toNumber();
                 const levels = ['low', 'medium', 'high'].map(levelKey => {
                     const level = eip1559[levelKey];
                     const label = levelKey === 'medium' ? 'normal' : levelKey;
                     if (!level?.maxFeePerGas || !level?.maxPriorityFeePerGas) {
                         return null;
                     }
+                    const maxFeePerGas = bigNumber_1.BigNumber.max(this.coinInfo.minFee, level.maxFeePerGas, minMaxPriorityFeePerGas).toString();
+                    const maxPriorityFeePerGas = bigNumber_1.BigNumber.max(minMaxPriorityFeePerGas, bigNumber_1.BigNumber.min(maxFeePerGas, level.maxPriorityFeePerGas)).toString();
                     return {
                         label,
                         feePerUnit,
                         feeLimit: response.feeLimit,
-                        blocks: -1,
+                        blocks: Math.ceil(Math.max(1, (level?.maxWaitTimeEstimate || 0) / 1000 / this.coinInfo.blockTime)),
                         baseFeePerGas: eip1559.baseFeePerGas,
-                        maxFeePerGas: level?.maxFeePerGas,
-                        maxPriorityFeePerGas: level?.maxPriorityFeePerGas,
-                        maxWaitTimeEstimate: level?.maxWaitTimeEstimate,
+                        maxFeePerGas,
+                        maxPriorityFeePerGas,
                     };
                 });
                 this.levels = levels.filter(level => level);

package/lib/backend/fees/MiscFeeLevels.d.ts

@@ -13,7 +13,6 @@ export declare class MiscFeeLevels {
         baseFeePerGas?: string | undefined;
         maxFeePerGas?: string | undefined;
         maxPriorityFeePerGas?: string | undefined;
-        maxWaitTimeEstimate?: number | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         blocks: number;
         feePerUnit: string;

package/lib/constants/errors.d.ts

@@ -35,6 +35,7 @@ export declare const ERROR_CODES: {
     readonly Device_MultipleNotSupported: "Multiple devices are not supported";
     readonly Device_MissingCapability: "Device is missing capability";
     readonly Device_MissingCapabilityBtcOnly: "Device is missing capability (BTC only)";
+    readonly Device_ThpPairingTagInvalid: "Pairing tag mismatch";
     readonly Failure_ActionCancelled: "Action cancelled by user";
     readonly Failure_FirmwareError: "Firmware installation failed";
     readonly Failure_UnknownCode: "Unknown error";

package/lib/constants/errors.js

@@ -38,6 +38,7 @@ exports.ERROR_CODES = {
     Device_MultipleNotSupported: 'Multiple devices are not supported',
     Device_MissingCapability: 'Device is missing capability',
     Device_MissingCapabilityBtcOnly: 'Device is missing capability (BTC only)',
+    Device_ThpPairingTagInvalid: 'Pairing tag mismatch',
     Failure_ActionCancelled: 'Action cancelled by user',
     Failure_FirmwareError: 'Firmware installation failed',
     Failure_UnknownCode: 'Unknown error',

package/lib/core/AbstractMethod.d.ts

@@ -61,7 +61,7 @@ export declare abstract class AbstractMethod<Name extends CallMethodPayload['met
     private getOriginPermissions;
     checkPermissions({ origin }: Pick<ConnectSettings, 'origin'>): void;
     savePermissions(temporary: boolean | undefined, { origin }: Pick<ConnectSettings, 'origin'>): void;
-    checkFirmwareRange(): "ui-device_firmware_old" | "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined;
+    checkFirmwareRange(): "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined;
     isManagementRestricted({ popup, origin }: Pick<ConnectSettings, 'popup' | 'origin'>): boolean | undefined;
     abstract init(): void;
     getMethodInfo(): Promise<{
@@ -72,7 +72,7 @@ export declare abstract class AbstractMethod<Name extends CallMethodPayload['met
         requiredPermissions: MethodPermission[];
         info: string;
         confirmation: {
-            view: "no-backup" | "export-xpub" | "export-address" | "export-account-info" | "device-management";
+            view: "thp-pairing-start" | "thp-pairing-failed" | "no-backup" | "export-xpub" | "export-address" | "export-account-info" | "device-management";
             label?: string;
             customConfirmButton?: {
                 className: string;

package/lib/core/AbstractMethod.js

@@ -200,7 +200,6 @@ class AbstractMethod {
             this.name !== 'recoveryDevice' &&
             (device.firmwareStatus === 'required' ||
                 !utils_1.versionUtils.isNewerOrEqual(version, range.min))) {
-            return events_1.UI.FIRMWARE_OLD;
         }
         if (range.max !== '0' && utils_1.versionUtils.isNewer(version, range.max)) {
             return events_1.UI.FIRMWARE_NOT_COMPATIBLE;