@trezor/connect 9.2.3 → 9.2.4-beta.2

package/lib/api/cardano/api/cardanoSignTransaction.js

@@ -14,19 +14,7 @@ const cardano_1 = require("../../../types/api/cardano");
 const cardanoWitnesses_1 = require("../cardanoWitnesses");
 const cardanoTokenBundle_1 = require("../cardanoTokenBundle");
 const schema_utils_1 = require("@trezor/schema-utils");
-const CardanoSignTransactionFeatures = Object.freeze({
-    TransactionStreaming: ['0', '2.4.2'],
-    TokenMinting: ['0', '2.4.3'],
-    Multisig: ['0', '2.4.3'],
-    NetworkIdInTxBody: ['0', '2.4.4'],
-    OutputDatumHash: ['0', '2.4.4'],
-    ScriptDataHash: ['0', '2.4.4'],
-    Plutus: ['0', '2.4.4'],
-    KeyHashStakeCredential: ['0', '2.4.4'],
-    Babbage: ['0', '2.5.2'],
-    CIP36Registration: ['0', '2.5.3'],
-    CIP36RegistrationExternalPaymentAddress: ['0', '2.5.4'],
-});
+const CardanoSignTransactionFeatures = Object.freeze({});
 class CardanoSignTransaction extends AbstractMethod_1.AbstractMethod {
     init() {
         this.requiredPermissions = ['read', 'write'];
@@ -138,67 +126,6 @@ class CardanoSignTransaction extends AbstractMethod_1.AbstractMethod {
         }
     }
     _ensureFirmwareSupportsParams() {
-        var _a;
-        const { params } = this;
-        this._ensureFeatureIsSupported('TransactionStreaming');
-        params.certificatesWithPoolOwnersAndRelays.forEach(({ certificate }) => {
-            if (certificate.key_hash) {
-                this._ensureFeatureIsSupported('KeyHashStakeCredential');
-            }
-        });
-        params.outputsWithData.forEach(({ output }) => {
-            if (output.datum_hash) {
-                this._ensureFeatureIsSupported('OutputDatumHash');
-            }
-        });
-        params.withdrawals.forEach(withdrawal => {
-            if (withdrawal.key_hash) {
-                this._ensureFeatureIsSupported('KeyHashStakeCredential');
-            }
-        });
-        if (params.mint.length > 0) {
-            this._ensureFeatureIsSupported('TokenMinting');
-        }
-        if (params.additionalWitnessRequests.length > 0 ||
-            params.signingMode === constants_1.PROTO.CardanoTxSigningMode.MULTISIG_TRANSACTION) {
-            this._ensureFeatureIsSupported('Multisig');
-        }
-        if (params.includeNetworkId) {
-            this._ensureFeatureIsSupported('NetworkIdInTxBody');
-        }
-        if (params.scriptDataHash) {
-            this._ensureFeatureIsSupported('ScriptDataHash');
-        }
-        if (params.signingMode === constants_1.PROTO.CardanoTxSigningMode.PLUTUS_TRANSACTION) {
-            this._ensureFeatureIsSupported('Plutus');
-        }
-        params.outputsWithData.forEach(({ output, inlineDatum, referenceScript }) => {
-            if (output.format === constants_1.PROTO.CardanoTxOutputSerializationFormat.MAP_BABBAGE ||
-                inlineDatum ||
-                referenceScript) {
-                this._ensureFeatureIsSupported('Babbage');
-            }
-        });
-        if (params.collateralReturnWithData ||
-            params.totalCollateral != null ||
-            params.referenceInputs.length > 0) {
-            this._ensureFeatureIsSupported('Babbage');
-        }
-        if (params.requiredSigners.length > 0 &&
-            params.signingMode !== constants_1.PROTO.CardanoTxSigningMode.PLUTUS_TRANSACTION) {
-            this._ensureFeatureIsSupported('Babbage');
-        }
-        if ((_a = params.auxiliaryData) === null || _a === void 0 ? void 0 : _a.cvote_registration_parameters) {
-            const { format, delegations, voting_purpose, payment_address } = params.auxiliaryData.cvote_registration_parameters;
-            if (format === constants_1.PROTO.CardanoCVoteRegistrationFormat.CIP36 ||
-                (delegations === null || delegations === void 0 ? void 0 : delegations.length) ||
-                voting_purpose != null) {
-                this._ensureFeatureIsSupported('CIP36Registration');
-            }
-            if (payment_address) {
-                this._ensureFeatureIsSupported('CIP36RegistrationExternalPaymentAddress');
-            }
-        }
     }
     async _sign_tx() {
         const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
@@ -251,7 +178,7 @@ class CardanoSignTransaction extends AbstractMethod_1.AbstractMethod {
         if (this.params.auxiliaryData) {
             const { cvote_registration_parameters } = this.params.auxiliaryData;
             if (cvote_registration_parameters) {
-                this.params.auxiliaryData = (0, cardanoAuxiliaryData_1.modifyAuxiliaryDataForBackwardsCompatibility)(this.device, this.params.auxiliaryData);
+                this.params.auxiliaryData = (0, cardanoAuxiliaryData_1.modifyAuxiliaryDataForBackwardsCompatibility)(this.params.auxiliaryData);
             }
             const { message } = await typedCall('CardanoTxAuxiliaryData', 'CardanoTxAuxiliaryDataSupplement', this.params.auxiliaryData);
             const auxiliaryDataType = constants_1.PROTO.CardanoTxAuxiliaryDataSupplementType[message.type];

package/lib/api/cardano/cardanoAddressParameters.d.ts

@@ -1,8 +1,7 @@
 import { PROTO } from '../../constants';
-import type { Device } from '../../device/Device';
 import { CardanoAddressParameters } from '../../types/api/cardano';
 export declare const validateAddressParameters: (addressParameters: CardanoAddressParameters) => void;
-export declare const modifyAddressParametersForBackwardsCompatibility: (device: Device, address_parameters: PROTO.CardanoAddressParametersType) => PROTO.CardanoAddressParametersType;
+export declare const modifyAddressParametersForBackwardsCompatibility: (address_parameters: PROTO.CardanoAddressParametersType) => PROTO.CardanoAddressParametersType;
 export declare const addressParametersToProto: (addressParameters: CardanoAddressParameters) => PROTO.CardanoAddressParametersType;
 export declare const addressParametersFromProto: (addressParameters: PROTO.CardanoAddressParametersType) => CardanoAddressParameters;
 //# sourceMappingURL=cardanoAddressParameters.d.ts.map

package/lib/api/cardano/cardanoAddressParameters.js

@@ -15,21 +15,15 @@ const validateAddressParameters = (addressParameters) => {
     }
 };
 exports.validateAddressParameters = validateAddressParameters;
-const modifyAddressParametersForBackwardsCompatibility = (device, address_parameters) => {
+const modifyAddressParametersForBackwardsCompatibility = (address_parameters) => {
     if (address_parameters.address_type === constants_1.PROTO.CardanoAddressType.REWARD) {
         let { address_n, address_n_staking } = address_parameters;
         if (address_n.length > 0 && address_n_staking.length > 0) {
             throw constants_1.ERRORS.TypedError('Method_InvalidParameter', `Only stakingPath is allowed for CardanoAddressType.REWARD`);
         }
-        if (device.atLeast(['0', '2.4.3'])) {
-            if (address_n.length > 0) {
-                address_n_staking = address_n;
-                address_n = [];
-            }
-        }
-        else if (address_n_staking.length > 0) {
-            address_n = address_n_staking;
-            address_n_staking = [];
+        if (address_n.length > 0) {
+            address_n_staking = address_n;
+            address_n = [];
         }
         return {
             ...address_parameters,

package/lib/api/cardano/cardanoAuxiliaryData.d.ts

@@ -1,6 +1,5 @@
-import type { Device } from '../../device/Device';
 import { PROTO } from '../../constants';
 import { CardanoAuxiliaryData } from '../../types/api/cardano';
 export declare const transformAuxiliaryData: (auxiliaryData: CardanoAuxiliaryData) => PROTO.CardanoTxAuxiliaryData;
-export declare const modifyAuxiliaryDataForBackwardsCompatibility: (device: Device, auxiliary_data: PROTO.CardanoTxAuxiliaryData) => PROTO.CardanoTxAuxiliaryData;
+export declare const modifyAuxiliaryDataForBackwardsCompatibility: (auxiliary_data: PROTO.CardanoTxAuxiliaryData) => PROTO.CardanoTxAuxiliaryData;
 //# sourceMappingURL=cardanoAuxiliaryData.d.ts.map

package/lib/api/cardano/cardanoAuxiliaryData.js

@@ -62,11 +62,11 @@ const transformAuxiliaryData = (auxiliaryData) => {
     };
 };
 exports.transformAuxiliaryData = transformAuxiliaryData;
-const modifyAuxiliaryDataForBackwardsCompatibility = (device, auxiliary_data) => {
+const modifyAuxiliaryDataForBackwardsCompatibility = (auxiliary_data) => {
     const { cvote_registration_parameters } = auxiliary_data;
     if (cvote_registration_parameters === null || cvote_registration_parameters === void 0 ? void 0 : cvote_registration_parameters.payment_address_parameters) {
         cvote_registration_parameters.payment_address_parameters =
-            (0, cardanoAddressParameters_1.modifyAddressParametersForBackwardsCompatibility)(device, cvote_registration_parameters.payment_address_parameters);
+            (0, cardanoAddressParameters_1.modifyAddressParametersForBackwardsCompatibility)(cvote_registration_parameters.payment_address_parameters);
         return {
             ...auxiliary_data,
             cvote_registration_parameters,

package/lib/api/changeLanguage.d.ts

@@ -2,7 +2,14 @@ import { AbstractMethod } from '../core/AbstractMethod';
 import { ChangeLanguage as ChangeLanguageSchema } from '../types/api/changeLanguage';
 export default class ChangeLanguage extends AbstractMethod<'changeLanguage', ChangeLanguageSchema> {
     init(): void;
-    confirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "device-management";
+        customConfirmButton: {
+            className: string;
+            label: string;
+        };
+        label: string;
+    };
     run(): Promise<{
         message: string;
     }>;

package/lib/api/changeLanguage.js

@@ -14,19 +14,15 @@ class ChangeLanguage extends AbstractMethod_1.AbstractMethod {
         (0, schema_utils_1.Assert)(changeLanguage_1.ChangeLanguage, payload);
         this.params = payload;
     }
-    async confirmation() {
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+    get confirmation() {
+        return {
             view: 'device-management',
             customConfirmButton: {
                 className: 'confirm',
                 label: 'Proceed',
             },
             label: 'Do you want to change language?',
-        }));
-        const uiResp = await uiPromise.promise;
-        return uiResp.payload;
+        };
     }
     run() {
         const { language, binary } = this.params;

package/lib/api/eos/api/eosGetPublicKey.d.ts

@@ -2,10 +2,12 @@ import { AbstractMethod } from '../../../core/AbstractMethod';
 import type { PROTO } from '../../../constants';
 export default class EosGetPublicKey extends AbstractMethod<'eosGetPublicKey', PROTO.EosGetPublicKey[]> {
     hasBundle?: boolean;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-address";
+        label: string;
+    };
     run(): Promise<{
         path: number[];
         serializedPath: string;

package/lib/api/eos/api/eosGetPublicKey.js

@@ -28,25 +28,13 @@ class EosGetPublicKey extends AbstractMethod_1.AbstractMethod {
     get info() {
         return 'Export Eos public key';
     }
-    async confirmation() {
-        if (this.confirmed)
-            return true;
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-        let label;
-        if (this.params.length > 1) {
-            label = 'Export multiple Eos public keys';
-        }
-        else {
-            label = `Export Eos public key for account #${(0, pathUtils_1.fromHardened)(this.params[0].address_n[2]) + 1}`;
-        }
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+    get confirmation() {
+        return {
             view: 'export-address',
-            label,
-        }));
-        const uiResp = await uiPromise.promise;
-        this.confirmed = uiResp.payload;
-        return this.confirmed;
+            label: this.params.length > 1
+                ? 'Export multiple Eos public keys'
+                : `Export Eos public key for account #${(0, pathUtils_1.fromHardened)(this.params[0].address_n[2]) + 1}`,
+        };
     }
     async run() {
         const responses = [];

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

@@ -9,7 +9,6 @@ type Params = PROTO.EthereumGetAddress & {
 export default class EthereumGetAddress extends AbstractMethod<'ethereumGetAddress', Params[]> {
     hasBundle?: boolean;
     progress: number;
-    confirmed?: boolean;
     init(): void;
     initAsync(): Promise<void>;
     get info(): string;
@@ -18,8 +17,10 @@ export default class EthereumGetAddress extends AbstractMethod<'ethereumGetAddre
         serializedPath: string;
         address: string;
     } | undefined;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-address";
+        label: string;
+    };
     _call({ address_n, show_display, encoded_network, chunkify }: Params): Promise<{
         path: number[];
         serializedPath: string;

package/lib/api/ethereum/api/ethereumGetAddress.js

@@ -18,6 +18,7 @@ class EthereumGetAddress extends AbstractMethod_1.AbstractMethod {
         this.progress = 0;
     }
     init() {
+        this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
         this.hasBundle = !!this.payload.bundle;
         const payload = !this.payload.bundle
@@ -40,7 +41,6 @@ class EthereumGetAddress extends AbstractMethod_1.AbstractMethod {
             this.params.length === 1 &&
             typeof this.params[0].address === 'string' &&
             this.params[0].show_display;
-        this.confirmed = useEventListener;
         this.useUi = !useEventListener;
     }
     async initAsync() {
@@ -80,27 +80,11 @@ class EthereumGetAddress extends AbstractMethod_1.AbstractMethod {
             };
         }
     }
-    async confirmation() {
-        if (this.confirmed)
-            return true;
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+    get confirmation() {
+        return {
             view: 'export-address',
             label: this.info,
-        }));
-        const uiResp = await uiPromise.promise;
-        this.confirmed = uiResp.payload;
-        return this.confirmed;
-    }
-    async noBackupConfirmation() {
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
-            view: 'no-backup',
-        }));
-        const uiResp = await uiPromise.promise;
-        return uiResp.payload;
+        };
     }
     _call({ address_n, show_display, encoded_network, chunkify }) {
         const cmd = this.device.getCommands();

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

@@ -6,10 +6,12 @@ type Params = PROTO.EthereumGetPublicKey & {
 };
 export default class EthereumGetPublicKey extends AbstractMethod<'ethereumGetPublicKey', Params[]> {
     hasBundle?: boolean;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-xpub";
+        label: string;
+    };
     run(): Promise<{
         xpubSegwit?: string | undefined;
         descriptorChecksum?: string | undefined;

package/lib/api/ethereum/api/ethereumGetPublicKey.js

@@ -38,18 +38,11 @@ class EthereumGetPublicKey extends AbstractMethod_1.AbstractMethod {
         }
         return 'Export multiple public keys';
     }
-    async confirmation() {
-        if (this.confirmed)
-            return true;
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+    get confirmation() {
+        return {
             view: 'export-xpub',
             label: this.info,
-        }));
-        const uiResp = await uiPromise.promise;
-        this.confirmed = uiResp.payload;
-        return this.confirmed;
+        };
     }
     async run() {
         const responses = [];

package/lib/api/firmware/index.d.ts

@@ -1,5 +1,7 @@
 export { getBinary } from './getBinary';
+export { getLanguage } from '../../data/getLanguage';
 export { shouldStripFwHeaders, stripFwHeaders } from './modifyFirmware';
 export { uploadFirmware } from './uploadFirmware';
 export { calculateFirmwareHash } from './calculateFirmwareHash';
+export { parseFirmwareHeaders } from './parseFirmwareHeaders';
 //# sourceMappingURL=index.d.ts.map

package/lib/api/firmware/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateFirmwareHash = exports.uploadFirmware = exports.stripFwHeaders = exports.shouldStripFwHeaders = exports.getBinary = void 0;
+exports.parseFirmwareHeaders = exports.calculateFirmwareHash = exports.uploadFirmware = exports.stripFwHeaders = exports.shouldStripFwHeaders = exports.getLanguage = exports.getBinary = void 0;
 var getBinary_1 = require("./getBinary");
 Object.defineProperty(exports, "getBinary", { enumerable: true, get: function () { return getBinary_1.getBinary; } });
+var getLanguage_1 = require("../../data/getLanguage");
+Object.defineProperty(exports, "getLanguage", { enumerable: true, get: function () { return getLanguage_1.getLanguage; } });
 var modifyFirmware_1 = require("./modifyFirmware");
 Object.defineProperty(exports, "shouldStripFwHeaders", { enumerable: true, get: function () { return modifyFirmware_1.shouldStripFwHeaders; } });
 Object.defineProperty(exports, "stripFwHeaders", { enumerable: true, get: function () { return modifyFirmware_1.stripFwHeaders; } });
@@ -10,4 +12,6 @@ var uploadFirmware_1 = require("./uploadFirmware");
 Object.defineProperty(exports, "uploadFirmware", { enumerable: true, get: function () { return uploadFirmware_1.uploadFirmware; } });
 var calculateFirmwareHash_1 = require("./calculateFirmwareHash");
 Object.defineProperty(exports, "calculateFirmwareHash", { enumerable: true, get: function () { return calculateFirmwareHash_1.calculateFirmwareHash; } });
+var parseFirmwareHeaders_1 = require("./parseFirmwareHeaders");
+Object.defineProperty(exports, "parseFirmwareHeaders", { enumerable: true, get: function () { return parseFirmwareHeaders_1.parseFirmwareHeaders; } });
 //# sourceMappingURL=index.js.map

package/lib/api/firmware/parseFirmwareHeaders.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+export declare const parseFirmwareHeaders: (buff: Buffer) => {
+    version: [number, number, number];
+};
+//# sourceMappingURL=parseFirmwareHeaders.d.ts.map

package/lib/api/firmware/parseFirmwareHeaders.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFirmwareHeaders = void 0;
+const parseFirmwareHeaders = (buff) => {
+    const vendorHeader = buff.subarray(0, 4).toString('utf8');
+    let trezorImageHeader = '';
+    let restbuff;
+    if (vendorHeader === 'TRZV') {
+        const vendorHeaderLength = buff.readUInt32LE(4);
+        trezorImageHeader = buff
+            .subarray(vendorHeaderLength, vendorHeaderLength + 4)
+            .toString('utf8');
+        restbuff = buff.subarray(vendorHeaderLength + 4);
+    }
+    else if (vendorHeader === 'TRZR') {
+        restbuff = buff.subarray(256 + 4);
+        trezorImageHeader = buff.subarray(256, 256 + 4).toString('utf8');
+    }
+    else {
+        restbuff = buff.subarray(4);
+        trezorImageHeader = buff.subarray(0, 4).toString('utf8');
+    }
+    if (trezorImageHeader !== 'TRZF') {
+        throw new Error(`unexpected header ${vendorHeader}`);
+    }
+    const version_major = restbuff.readInt8(12);
+    const version_minor = restbuff.readInt8(13);
+    const version_patch = restbuff.readInt8(14);
+    const version = [version_major, version_minor, version_patch];
+    return {
+        version,
+    };
+};
+exports.parseFirmwareHeaders = parseFirmwareHeaders;
+//# sourceMappingURL=parseFirmwareHeaders.js.map

package/lib/api/firmware/uploadFirmware.d.ts

@@ -2,7 +2,7 @@ import { CoreEventMessage } from '../../events';
 import { PROTO } from '../../constants';
 import type { Device } from '../../device/Device';
 import type { TypedCall } from '../../device/DeviceCommands';
-export declare const uploadFirmware: (typedCall: TypedCall, postMessage: (message: CoreEventMessage) => void, device: Device, { payload }: PROTO.FirmwareUpload) => Promise<{
+export declare const uploadFirmware: (typedCall: TypedCall, postMessage: (message: CoreEventMessage) => void, device: Device, { payload }: PROTO.FirmwareUpload) => Promise<import("../../device/DeviceCommands").TypedResponseMessage<"Success"> | {
     message: string;
 }>;
 //# sourceMappingURL=uploadFirmware.d.ts.map

package/lib/api/firmware/uploadFirmware.js

@@ -11,6 +11,7 @@ const postConfirmationMessage = (device) => {
 const postProgressMessage = (device, progress, postMessage) => {
     postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_PROGRESS, {
         device: device.toMessageObject(),
+        operation: 'flashing',
         progress,
     }));
 };
@@ -19,8 +20,15 @@ const uploadFirmware = async (typedCall, postMessage, device, { payload }) => {
         postConfirmationMessage(device);
         await typedCall('FirmwareErase', 'Success', {});
         postProgressMessage(device, 0, postMessage);
-        const { message } = await typedCall('FirmwareUpload', 'Success', {
+        let i = 0;
+        const progressTimer = setInterval(() => {
+            i++;
+            postProgressMessage(device, Math.min(i * 2, 99), postMessage);
+        }, 300);
+        const message = await typedCall('FirmwareUpload', 'Success', {
             payload,
+        }).finally(() => {
+            clearInterval(progressTimer);
         });
         postProgressMessage(device, 100, postMessage);
         return message;

package/lib/api/getAccountDescriptor.d.ts

@@ -10,9 +10,11 @@ export default class GetAccountDescriptor extends AbstractMethod<'getAccountDesc
     hasBundle?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(allowSuppression?: boolean): Promise<boolean>;
-    checkFirmwareRange(_isUsingPopup: boolean): Promise<undefined>;
+    get confirmation(): {
+        view: "export-account-info";
+        label: string;
+    };
+    checkFirmwareRange(): undefined;
     run(): Promise<GetAccountDescriptorResponse | (GetAccountDescriptorResponse | null)[]>;
     dispose(): void;
 }

package/lib/api/getAccountDescriptor.js

@@ -37,13 +37,14 @@ class GetAccountDescriptor extends AbstractMethod_1.AbstractMethod {
                 coinInfo,
             };
         });
+        this.noBackupConfirmationMode = this.params.every(batch => batch.suppressBackupWarning)
+            ? 'popup-only'
+            : 'always';
     }
     get info() {
         return 'Export account descriptor';
     }
-    async confirmation() {
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
+    get confirmation() {
         const keys = {};
         this.params.forEach(b => {
             if (!keys[b.coinInfo.label]) {
@@ -70,30 +71,16 @@ class GetAccountDescriptor extends AbstractMethod_1.AbstractMethod {
                 str.push('</span>');
             });
         });
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+        return {
             view: 'export-account-info',
             label: `Export descriptor for: ${str.join('')}`,
-        }));
-        const uiResp = await uiPromise.promise;
-        return uiResp.payload;
-    }
-    async noBackupConfirmation(allowSuppression) {
-        if (allowSuppression && this.params.every(batch => batch.suppressBackupWarning)) {
-            return true;
-        }
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
-            view: 'no-backup',
-        }));
-        const uiResp = await uiPromise.promise;
-        return uiResp.payload;
+        };
     }
-    async checkFirmwareRange(_isUsingPopup) {
+    checkFirmwareRange() {
         const invalid = [];
         for (let i = 0; i < this.params.length; i++) {
             this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, this.params[i].coinInfo, AbstractMethod_1.DEFAULT_FIRMWARE_RANGE);
-            const exception = await super.checkFirmwareRange(false);
+            const exception = super.checkFirmwareRange();
             if (exception) {
                 invalid.push({
                     index: i,

package/lib/api/getAccountInfo.d.ts

@@ -12,9 +12,19 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
     discovery?: Discovery;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(allowSuppression?: boolean): Promise<boolean>;
-    checkFirmwareRange(isUsingPopup: boolean): Promise<"ui-device_firmware_old" | "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined>;
+    get confirmation(): {
+        view: "export-account-info";
+        label: string;
+        customConfirmButton: {
+            label: string;
+            className: string;
+        };
+    } | {
+        view: "export-account-info";
+        label: string;
+        customConfirmButton?: undefined;
+    };
+    checkFirmwareRange(): "ui-device_firmware_old" | "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;
@@ -33,7 +43,11 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
         };
         misc?: {
             nonce?: string | undefined;
-            erc20Contract?: import("@trezor/blockchain-link-types/lib/common").TokenInfo | undefined;
+            contractInfo?: import("@trezor/blockchain-link-types/lib/blockbook-api").ContractInfo | undefined;
+            stakingPools?: import("@trezor/blockchain-link-types/lib/blockbook-api").StakingPool[] | undefined;
+            addressAliases?: {
+                [key: string]: import("@trezor/blockchain-link-types/lib/blockbook-api").AddressAlias;
+            } | undefined;
             sequence?: number | undefined;
             reserve?: string | undefined;
             rewards?: string | undefined;
@@ -54,7 +68,6 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
             ledger: number;
             seq: number;
         } | undefined;
-        stakingPools?: import("@trezor/blockchain-link-types").StakingPool[] | undefined;
         path: string;
     }>;
     discover(request: Request): Promise<{
@@ -75,7 +88,11 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
         };
         misc?: {
             nonce?: string | undefined;
-            erc20Contract?: import("@trezor/blockchain-link-types/lib/common").TokenInfo | undefined;
+            contractInfo?: import("@trezor/blockchain-link-types/lib/blockbook-api").ContractInfo | undefined;
+            stakingPools?: import("@trezor/blockchain-link-types/lib/blockbook-api").StakingPool[] | undefined;
+            addressAliases?: {
+                [key: string]: import("@trezor/blockchain-link-types/lib/blockbook-api").AddressAlias;
+            } | undefined;
             sequence?: number | undefined;
             reserve?: string | undefined;
             rewards?: string | undefined;
@@ -96,7 +113,6 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
             ledger: number;
             seq: number;
         } | undefined;
-        stakingPools?: import("@trezor/blockchain-link-types").StakingPool[] | undefined;
         path: string;
     }>;
     dispose(): void;