@trezor/connect 9.2.3 → 9.2.4-beta.2

package/lib/api/solana/api/solanaGetAddress.js

@@ -15,6 +15,7 @@ class SolanaGetAddress extends AbstractMethod_1.AbstractMethod {
         this.progress = 0;
     }
     init() {
+        this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, (0, coinInfo_1.getMiscNetwork)('Solana'), this.firmwareRange);
         this.hasBundle = !!this.payload.bundle;
@@ -35,7 +36,6 @@ class SolanaGetAddress 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() {
@@ -53,34 +53,13 @@ class SolanaGetAddress extends AbstractMethod_1.AbstractMethod {
             };
         }
     }
-    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 Solana addresses';
-        }
-        else {
-            label = `Export Solana address 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;
-    }
-    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;
+            label: this.params.length > 1
+                ? 'Export multiple Solana addresses'
+                : `Export Solana address for account #${(0, pathUtils_1.fromHardened)(this.params[0].address_n[2]) + 1}`,
+        };
     }
     async _call({ address_n, show_display, chunkify }) {
         const cmd = this.device.getCommands();

package/lib/api/solana/api/solanaGetPublicKey.d.ts

@@ -2,11 +2,12 @@ import { PROTO } from '../../../constants';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 export default class SolanaGetPublicKey extends AbstractMethod<'solanaGetPublicKey', PROTO.SolanaGetPublicKey[]> {
     hasBundle?: boolean;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-xpub";
+        label: string;
+    };
     run(): Promise<({
         path: number[];
         publicKey: string;

package/lib/api/solana/api/solanaGetPublicKey.js

@@ -9,6 +9,7 @@ const schema_utils_1 = require("@trezor/schema-utils");
 const types_1 = require("../../../types");
 class SolanaGetPublicKey extends AbstractMethod_1.AbstractMethod {
     init() {
+        this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, (0, coinInfo_1.getMiscNetwork)('Solana'), this.firmwareRange);
         this.hasBundle = !!this.payload.bundle;
@@ -27,34 +28,13 @@ class SolanaGetPublicKey extends AbstractMethod_1.AbstractMethod {
     get info() {
         return 'Export Solana 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 Solana public keys';
-        }
-        else {
-            label = `Export Solana 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-xpub',
-            label,
-        }));
-        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;
+            label: this.params.length > 1
+                ? 'Export multiple Solana public keys'
+                : `Export Solana public key for account #${(0, pathUtils_1.fromHardened)(this.params[0].address_n[2]) + 1}`,
+        };
     }
     async run() {
         const responses = [];

package/lib/api/stellar/api/stellarGetAddress.d.ts

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

package/lib/api/stellar/api/stellarGetAddress.js

@@ -15,6 +15,7 @@ class StellarGetAddress extends AbstractMethod_1.AbstractMethod {
         this.progress = 0;
     }
     init() {
+        this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, (0, coinInfo_1.getMiscNetwork)('Stellar'), this.firmwareRange);
         this.hasBundle = !!this.payload.bundle;
@@ -35,7 +36,6 @@ class StellarGetAddress 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() {
@@ -53,27 +53,11 @@ class StellarGetAddress 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;
+        };
     }
     async _call({ address_n, show_display, chunkify }) {
         const cmd = this.device.getCommands();

package/lib/api/tezos/api/tezosGetAddress.d.ts

@@ -6,7 +6,6 @@ type Params = PROTO.TezosGetAddress & {
 export default class TezosGetAddress extends AbstractMethod<'tezosGetAddress', Params[]> {
     hasBundle?: boolean;
     progress: number;
-    confirmed?: boolean;
     init(): void;
     get info(): string;
     getButtonRequestData(code: string): {
@@ -14,8 +13,10 @@ export default class TezosGetAddress extends AbstractMethod<'tezosGetAddress', P
         serializedPath: string;
         address: string;
     } | undefined;
-    confirmation(): Promise<boolean>;
-    noBackupConfirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "export-address";
+        label: string;
+    };
     _call({ address_n, show_display, chunkify }: Params): Promise<{
         address: string;
     }>;

package/lib/api/tezos/api/tezosGetAddress.js

@@ -15,6 +15,7 @@ class TezosGetAddress extends AbstractMethod_1.AbstractMethod {
         this.progress = 0;
     }
     init() {
+        this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, (0, coinInfo_1.getMiscNetwork)('Tezos'), this.firmwareRange);
         this.hasBundle = !!this.payload.bundle;
@@ -35,7 +36,6 @@ class TezosGetAddress 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() {
@@ -53,27 +53,11 @@ class TezosGetAddress 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;
+        };
     }
     async _call({ address_n, show_display, chunkify }) {
         const cmd = this.device.getCommands();

package/lib/api/tezos/api/tezosGetPublicKey.d.ts

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

package/lib/api/tezos/api/tezosGetPublicKey.js

@@ -28,25 +28,13 @@ class TezosGetPublicKey extends AbstractMethod_1.AbstractMethod {
     get info() {
         return 'Export Tezos 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 Tezos public keys';
-        }
-        else {
-            label = `Export Tezos 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 Tezos public keys'
+                : `Export Tezos public key for account #${(0, pathUtils_1.fromHardened)(this.params[0].address_n[2]) + 1}`,
+        };
     }
     async run() {
         const responses = [];

package/lib/api/wipeDevice.d.ts

@@ -1,8 +1,14 @@
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class WipeDevice extends AbstractMethod<'wipeDevice'> {
-    confirmed?: boolean;
     init(): void;
-    confirmation(): Promise<boolean>;
+    get confirmation(): {
+        view: "device-management";
+        customConfirmButton: {
+            className: string;
+            label: string;
+        };
+        label: string;
+    };
     get info(): string;
     run(): Promise<{
         message: string;

package/lib/api/wipeDevice.js

@@ -10,22 +10,15 @@ class WipeDevice extends AbstractMethod_1.AbstractMethod {
         this.requiredPermissions = ['management'];
         this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
     }
-    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: 'device-management',
             customConfirmButton: {
                 className: 'wipe',
                 label: `Wipe ${this.device.toMessageObject().label}`,
             },
             label: 'Are you sure you want to wipe your device?',
-        }));
-        const uiResp = await uiPromise.promise;
-        this.confirmed = uiResp.payload;
-        return this.confirmed;
+        };
     }
     get info() {
         return 'Wipe device';

package/lib/backend/Blockchain.d.ts

@@ -31,7 +31,7 @@ export declare class Blockchain {
         token?: string;
     }): Promise<{
         ts: number;
-        rates: import("@trezor/blockchain-link").FiatRatesLegacy;
+        rates: import("@trezor/blockchain-link").FiatRatesBySymbol;
     }>;
     getFiatRatesForTimestamps(params: {
         currencies?: string[];
@@ -40,7 +40,7 @@ export declare class Blockchain {
     }): Promise<{
         tickers: {
             ts: number;
-            rates: import("@trezor/blockchain-link").FiatRatesLegacy;
+            rates: import("@trezor/blockchain-link").FiatRatesBySymbol;
         }[];
     }>;
     getAccountBalanceHistory(params: BlockchainLinkParams<'getAccountBalanceHistory'>): Promise<import("@trezor/blockchain-link").AccountBalanceHistory[]>;

package/lib/constants/errors.d.ts

@@ -33,6 +33,7 @@ export declare const ERROR_CODES: {
     Device_UsedElsewhere: string;
     Device_InvalidState: string;
     Device_CallInProgress: string;
+    Device_MultipleNotSupported: string;
 };
 export declare class TrezorError extends Error {
     code: string;

package/lib/constants/errors.js

@@ -36,6 +36,7 @@ exports.ERROR_CODES = {
     Device_UsedElsewhere: 'Device is used in another window',
     Device_InvalidState: 'Passphrase is incorrect',
     Device_CallInProgress: 'Device call in progress',
+    Device_MultipleNotSupported: 'Multiple devices are not supported',
 };
 class TrezorError extends Error {
     constructor(code, message) {

package/lib/core/AbstractMethod.d.ts

@@ -1,6 +1,5 @@
-import { Deferred } from '@trezor/utils';
 import { NETWORK } from '../constants';
-import { CallMethodPayload, CallMethodResponse, UiRequestButtonData, UiPromiseCreator, CoreEventMessage } from '../events';
+import { CallMethodPayload, CallMethodResponse, UiRequestButtonData, UiPromiseCreator, CoreEventMessage, UiRequestConfirmation } from '../events';
 import type { Device } from '../device/Device';
 import type { FirmwareRange } from '../types';
 export type Payload<M> = Extract<CallMethodPayload, {
@@ -25,6 +24,7 @@ export declare abstract class AbstractMethod<Name extends CallMethodPayload['met
     name: Name;
     payload: Payload<Name>;
     get info(): string;
+    get confirmation(): UiRequestConfirmation['payload'] | undefined;
     useUi: boolean;
     useDevice: boolean;
     useDeviceState: boolean;
@@ -37,24 +37,20 @@ export declare abstract class AbstractMethod<Name extends CallMethodPayload['met
     requireDeviceMode: string[];
     network: NETWORK.NetworkType;
     useCardanoDerivation: boolean;
-    confirmation?(): Promise<boolean | undefined>;
-    noBackupConfirmation?(allowSuppression?: boolean): Promise<boolean>;
+    noBackupConfirmationMode: 'never' | 'always' | 'popup-only';
     getButtonRequestData?(code: string): UiRequestButtonData | undefined;
     postMessage: (message: CoreEventMessage) => void;
-    getPopupPromise: () => Deferred<void>;
     createUiPromise: UiPromiseCreator;
-    removeUiPromise: (promise: Deferred<any>) => void;
     initAsync?(): Promise<void>;
     constructor(message: {
         id?: number;
         payload: Payload<Name>;
     });
     setDevice(device: Device): void;
-    requestPermissions(): Promise<boolean>;
     private getOriginPermissions;
     checkPermissions(): void;
     savePermissions(temporary?: boolean): void;
-    checkFirmwareRange(isUsingPopup?: boolean): Promise<"ui-device_firmware_old" | "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined>;
+    checkFirmwareRange(): "ui-device_firmware_old" | "ui-device_firmware_unsupported" | "ui-device_firmware_not_compatible" | "ui-device_firmware_not_installed" | undefined;
     isManagementRestricted(): boolean | undefined;
     abstract init(): void;
     abstract run(): Promise<MethodReturnType<Name>>;

package/lib/core/AbstractMethod.js

@@ -17,6 +17,9 @@ class AbstractMethod {
     get info() {
         return '';
     }
+    get confirmation() {
+        return undefined;
+    }
     constructor(message) {
         var _a, _b;
         const { payload } = message;
@@ -59,6 +62,7 @@ class AbstractMethod {
             typeof payload.useCardanoDerivation === 'boolean'
                 ? payload.useCardanoDerivation
                 : payload.method.startsWith('cardano');
+        this.noBackupConfirmationMode = 'never';
     }
     setDevice(device) {
         this.device = device;
@@ -66,21 +70,6 @@ class AbstractMethod {
         const originalFn = this.createUiPromise;
         this.createUiPromise = (t, d) => originalFn(t, d || device);
     }
-    async requestPermissions() {
-        await this.getPopupPromise().promise;
-        const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_PERMISSION);
-        this.postMessage((0, events_1.createUiMessage)(events_1.UI.REQUEST_PERMISSION, {
-            permissions: this.requiredPermissions,
-            device: this.device.toMessageObject(),
-        }));
-        const uiResp = await uiPromise.promise;
-        const { granted, remember } = uiResp.payload;
-        if (granted) {
-            this.savePermissions(!remember);
-            return true;
-        }
-        return false;
-    }
     getOriginPermissions() {
         var _a;
         const origin = DataManager_1.DataManager.getSettings('origin');
@@ -128,7 +117,7 @@ class AbstractMethod {
             this.postMessage((0, events_1.createDeviceMessage)(events_1.DEVICE.CONNECT, this.device.toMessageObject()));
         }
     }
-    async checkFirmwareRange(isUsingPopup) {
+    checkFirmwareRange() {
         if (this.skipFirmwareCheck) {
             return;
         }
@@ -151,18 +140,7 @@ class AbstractMethod {
             return events_1.UI.FIRMWARE_OLD;
         }
         if (range.max !== '0' && utils_1.versionUtils.isNewer(version, range.max)) {
-            if (isUsingPopup) {
-                await this.getPopupPromise().promise;
-                const uiPromise = this.createUiPromise(events_1.UI.RECEIVE_CONFIRMATION);
-                this.postMessage((0, events_1.createUiMessage)(events_1.UI.FIRMWARE_NOT_COMPATIBLE, device.toMessageObject()));
-                const uiResp = await uiPromise.promise;
-                if (!uiResp.payload) {
-                    throw constants_1.ERRORS.TypedError('Method_PermissionsNotGranted');
-                }
-            }
-            else {
-                return events_1.UI.FIRMWARE_NOT_COMPATIBLE;
-            }
+            return events_1.UI.FIRMWARE_NOT_COMPATIBLE;
         }
     }
     isManagementRestricted() {

package/lib/core/index.d.ts

@@ -5,8 +5,9 @@ import { AbstractMethod } from './AbstractMethod';
 import { LogWriter } from '../utils/debug';
 import type { ConnectSettings } from '../types';
 export declare class Core extends EventEmitter {
+    abortController: AbortController;
     handleMessage(message: CoreRequestMessage): void;
-    dispose(): Promise<void>;
+    dispose(): void;
     getCurrentMethod(): Promise<AbstractMethod<any, undefined>>;
     getTransportInfo(): TransportInfo | undefined;
     enumerate(): void;