@trezor/connect 9.2.2 → 9.2.4-beta.1

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

@@ -57,10 +57,11 @@ declare const Params: import("@sinclair/typebox").TIntersect<[import("@sinclair/
         shortcut: import("@sinclair/typebox").TString;
         slip44: import("@sinclair/typebox").TNumber;
         support: import("@sinclair/typebox").TObject<{
-            connect: import("@sinclair/typebox").TBoolean;
             T1B1: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TLiteral<false>]>;
             T2T1: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TLiteral<false>]>;
             T2B1: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TLiteral<false>]>;
+            T3T1: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TLiteral<false>]>;
+            connect: import("@sinclair/typebox").TBoolean;
         }>;
         decimals: import("@sinclair/typebox").TNumber;
         blockchainLink: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{

package/lib/api/ethereum/ethereumDefinitions.js

@@ -102,6 +102,7 @@ const ethereumNetworkInfoFromDefinition = (definition) => ({
         T1B1: '1.6.2',
         T2T1: '2.0.7',
         T2B1: '2.6.1',
+        T3T1: '2.7.1',
     },
     blockchainLink: undefined,
 });

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;

package/lib/api/getAccountInfo.js

@@ -28,6 +28,7 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
         this.params = payload.bundle.map(batch => {
             (0, paramsValidator_1.validateParams)(batch, [
                 { name: 'coin', type: 'string', required: true },
+                { name: 'identity', type: 'string' },
                 { name: 'descriptor', type: 'string' },
                 { name: 'path', type: 'string' },
                 { name: 'details', type: 'string' },
@@ -68,22 +69,23 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
         });
         this.useDevice = willUseDevice;
         this.useUi = willUseDevice;
+        this.noBackupConfirmationMode = this.params.every(batch => batch.suppressBackupWarning)
+            ? 'popup-only'
+            : 'always';
     }
     get info() {
         return 'Export account info';
     }
-    async confirmation() {
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
+    get confirmation() {
         if (this.params.length === 1 && !this.params[0].path && !this.params[0].descriptor) {
-            this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+            return {
                 view: 'export-account-info',
                 label: `Export info for ${this.params[0].coinInfo.label} account of your selection`,
                 customConfirmButton: {
                     label: 'Proceed to account selection',
                     className: 'not-empty-css',
                 },
-            }));
+            };
         }
         else {
             const keys = {};
@@ -112,34 +114,20 @@ class GetAccountInfo 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 info 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) {
-        if (isUsingPopup || this.params.length === 1) {
-            return super.checkFirmwareRange(isUsingPopup);
+    checkFirmwareRange() {
+        if (this.params.length === 1) {
+            return super.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,
@@ -204,7 +192,7 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
                 if (typeof descriptor !== 'string') {
                     throw constants_1.ERRORS.TypedError('Runtime', 'GetAccountInfo: descriptor not found');
                 }
-                const blockchain = await (0, BlockchainLink_1.initBlockchain)(request.coinInfo, this.postMessage);
+                const blockchain = await (0, BlockchainLink_1.initBlockchain)(request.coinInfo, this.postMessage, request.identity);
                 if (this.disposed)
                     break;
                 const info = await blockchain.getAccountInfo({
@@ -256,8 +244,8 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
         return this.hasBundle ? responses : responses[0];
     }
     async discover(request) {
-        const { coinInfo, defaultAccountType } = request;
-        const blockchain = await (0, BlockchainLink_1.initBlockchain)(coinInfo, this.postMessage);
+        const { coinInfo, identity, defaultAccountType } = request;
+        const blockchain = await (0, BlockchainLink_1.initBlockchain)(coinInfo, this.postMessage, identity);
         const dfd = this.createUiPromise(events_1.UI.RECEIVE_ACCOUNT);
         const discovery = new Discovery_1.Discovery({
             blockchain,

package/lib/api/getAddress.d.ts

@@ -9,7 +9,6 @@ type Params = PROTO.GetAddress & {
 export default class GetAddress extends AbstractMethod<'getAddress', Params[]> {
     hasBundle?: boolean;
     progress: number;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
     getButtonRequestData(code: string): {
@@ -17,8 +16,10 @@ export default class GetAddress extends AbstractMethod<'getAddress', Params[]> {
         serializedPath: string;
         address: string;
     } | undefined;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-address";
+        label: string;
+    } | undefined;
     _call({ address_n, show_display, multisig, script_type, coinInfo, unlockPath, chunkify, }: Params): Promise<{
         path: number[];
         serializedPath: string;

package/lib/api/getAddress.js

@@ -15,6 +15,7 @@ class GetAddress extends AbstractMethod_1.AbstractMethod {
         this.progress = 0;
     }
     init() {
+        this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
         this.hasBundle = !!this.payload.bundle;
         const payload = !this.payload.bundle
@@ -61,7 +62,6 @@ class GetAddress 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;
     }
     get info() {
@@ -84,27 +84,13 @@ class GetAddress 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, {
-            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;
+    get confirmation() {
+        return !this.useUi
+            ? undefined
+            : {
+                view: 'export-address',
+                label: this.info,
+            };
     }
     async _call({ address_n, show_display, multisig, script_type, coinInfo, unlockPath, chunkify, }) {
         const cmd = this.device.getCommands();

package/lib/api/getCoinInfo.d.ts

@@ -21,6 +21,7 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
             T1B1: string | false;
             T2T1: string | false;
             T2B1: string | false;
+            T3T1: string | false;
             connect: boolean;
         };
         decimals: number;
@@ -76,6 +77,7 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
             T1B1: string | false;
             T2T1: string | false;
             T2B1: string | false;
+            T3T1: string | false;
             connect: boolean;
         };
         decimals: number;
@@ -106,6 +108,7 @@ export default class GetCoinInfo extends AbstractMethod<'getCoinInfo', Params> {
             T1B1: string | false;
             T2T1: string | false;
             T2B1: string | false;
+            T3T1: string | false;
             connect: boolean;
         };
         decimals: number;

package/lib/api/getFeatures.d.ts

@@ -12,6 +12,7 @@ export default class GetFeatures extends AbstractMethod<'getFeatures'> {
         homescreen_height?: number | undefined;
         bootloader_locked?: boolean | undefined;
         language_version_matches?: boolean | undefined;
+        unit_packaging?: number | undefined;
         flags: number | null;
         language: string | null;
         label: string | null;

package/lib/api/getOwnershipId.d.ts

@@ -2,10 +2,12 @@ import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
 export default class GetOwnershipId extends AbstractMethod<'getOwnershipId', PROTO.GetOwnershipId[]> {
     hasBundle?: boolean;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-address";
+        label: string;
+    };
     run(): Promise<import("../types/api/getOwnershipId").OwnershipId | import("../types/api/getOwnershipId").OwnershipId[]>;
 }
 //# sourceMappingURL=getOwnershipId.d.ts.map

package/lib/api/getOwnershipId.js

@@ -32,22 +32,11 @@ class GetOwnershipId extends AbstractMethod_1.AbstractMethod {
     get info() {
         return 'Export ownership id';
     }
-    async confirmation() {
-        if (this.confirmed)
-            return true;
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION, this.device);
-        let label = this.info;
-        if (this.params.length > 1) {
-            label = 'Export multiple ownership proof ids';
-        }
-        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 ownership proof ids' : this.info,
+        };
     }
     async run() {
         const responses = [];

package/lib/api/getOwnershipProof.d.ts

@@ -2,10 +2,12 @@ import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
 export default class GetOwnershipProof extends AbstractMethod<'getOwnershipProof', PROTO.GetOwnershipProof[]> {
     hasBundle?: boolean;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-address";
+        label: string;
+    };
     run(): Promise<import("../types/api/getOwnershipProof").OwnershipProof | import("../types/api/getOwnershipProof").OwnershipProof[]>;
 }
 //# sourceMappingURL=getOwnershipProof.d.ts.map

package/lib/api/getOwnershipProof.js

@@ -38,22 +38,11 @@ class GetOwnershipProof extends AbstractMethod_1.AbstractMethod {
     get info() {
         return 'Export ownership proof';
     }
-    async confirmation() {
-        if (this.confirmed)
-            return true;
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION, this.device);
-        let label = this.info;
-        if (this.params.length > 1) {
-            label = 'Export multiple ownership proofs';
-        }
-        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 ownership proofs' : this.info,
+        };
     }
     async run() {
         const responses = [];

package/lib/api/getPublicKey.d.ts

@@ -2,17 +2,18 @@ import { AbstractMethod } from '../core/AbstractMethod';
 import type { BitcoinNetworkInfo } from '../types';
 import type { PROTO } from '../constants';
 type Params = PROTO.GetPublicKey & {
-    coinInfo?: BitcoinNetworkInfo;
+    coinInfo: BitcoinNetworkInfo;
     suppressBackupWarning?: boolean;
     unlockPath?: PROTO.UnlockPath;
 };
 export default class GetPublicKey extends AbstractMethod<'getPublicKey', Params[]> {
     hasBundle?: boolean;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(allowSuppression?: boolean): Promise<boolean>;
+    get confirmation(): {
+        view: "export-xpub";
+        label: string;
+    };
     run(): Promise<{
         xpubSegwit?: string | undefined;
         descriptorChecksum?: string | undefined;

package/lib/api/getPublicKey.js

@@ -18,6 +18,7 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
             : this.payload;
         (0, schema_utils_1.Assert)((0, types_1.Bundle)(getPublicKey_1.GetPublicKey), payload);
         this.params = payload.bundle.map(batch => {
+            var _a;
             let coinInfo;
             if (batch.coin) {
                 coinInfo = (0, coinInfo_1.getBitcoinNetwork)(batch.coin);
@@ -27,11 +28,9 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
                 (0, paramsValidator_1.validateCoinPath)(address_n, coinInfo);
             }
             else if (!coinInfo) {
-                coinInfo = (0, coinInfo_1.getBitcoinNetwork)(address_n);
-            }
-            if (coinInfo) {
-                this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, coinInfo, this.firmwareRange);
+                coinInfo = (_a = (0, coinInfo_1.getBitcoinNetwork)(address_n)) !== null && _a !== void 0 ? _a : (0, coinInfo_1.getBitcoinNetwork)('btc');
             }
+            this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, coinInfo, this.firmwareRange);
             return {
                 address_n,
                 coin_name: coinInfo === null || coinInfo === void 0 ? void 0 : coinInfo.name,
@@ -44,42 +43,20 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
                 suppress_backup_warning: batch.suppressBackupWarning,
             };
         });
+        this.noBackupConfirmationMode = this.params.every(batch => batch.suppressBackupWarning || !batch.show_display)
+            ? 'popup-only'
+            : 'always';
     }
     get info() {
         return 'Export 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 public keys';
-        }
-        else {
-            label = (0, accountUtils_1.getPublicKeyLabel)(this.params[0].address_n, this.params[0].coinInfo);
-        }
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_CONFIRMATION, {
+    get confirmation() {
+        return {
             view: 'export-xpub',
-            label,
-        }));
-        const uiResp = await uiPromise.promise;
-        this.confirmed = uiResp.payload;
-        return this.confirmed;
-    }
-    async noBackupConfirmation(allowSuppression) {
-        if (allowSuppression &&
-            this.params.every(batch => batch.suppressBackupWarning || !batch.show_display)) {
-            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;
+            label: this.params.length > 1
+                ? 'Export multiple public keys'
+                : (0, accountUtils_1.getPublicKeyLabel)(this.params[0].address_n, this.params[0].coinInfo),
+        };
     }
     async run() {
         const responses = [];