@trezor/connect 9.5.3 → 9.5.4

package/lib/device/DeviceCurrentSession.js

@@ -0,0 +1,209 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceCurrentSession = void 0;
+const protobuf_1 = require("@trezor/protobuf");
+const schema_utils_1 = require("@trezor/schema-utils");
+const utils_1 = require("@trezor/utils");
+const constants_1 = require("../constants");
+const events_1 = require("../events");
+const debug_1 = require("../utils/debug");
+const blacklist = {
+    PassphraseAck: ['passphrase'],
+    CipheredKeyValue: ['value'],
+    GetPublicKey: ['address_n'],
+    PublicKey: ['node', 'xpub'],
+    DecryptedMessage: ['message', 'address'],
+    Features: true,
+};
+const filterForLog = (type, msg) => blacklist[type] === true
+    ? '(redacted...)'
+    : (blacklist[type] ?? []).reduce((prev, cur) => ({ ...prev, [cur]: '(redacted...)' }), msg);
+const logger = (0, debug_1.initLog)('DeviceCommands');
+const success = (payload) => ({ success: true, payload });
+const error = (error) => ({ success: false, error });
+const fail = (msg, cause) => error(new Error(msg, cause ? { cause } : undefined));
+const disposed = () => error(constants_1.ERRORS.TypedError('Runtime', 'typedCall: DeviceCommands already disposed'));
+class DeviceCurrentSession {
+    device;
+    transport;
+    protocol;
+    session;
+    disposed;
+    callPromise;
+    abortController;
+    constructor(device, transport, protocol, session) {
+        this.device = device;
+        this.transport = transport;
+        this.protocol = protocol;
+        this.session = session;
+        this.disposed = false;
+    }
+    isDisposed() {
+        return this.disposed;
+    }
+    async typedCall(type, resType, msg = {}) {
+        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.MessageType.properties[type], msg);
+        this.abortController = new AbortController();
+        const { signal } = this.abortController;
+        const abortPromise = new Promise(resolve => signal.addEventListener('abort', () => resolve(error(signal.reason))));
+        const callPromise = this.callLoop(type, msg, abortPromise);
+        this.callPromise = callPromise;
+        const response = await callPromise;
+        this.callPromise = undefined;
+        this.abortController = undefined;
+        if (!response.success)
+            throw response.error;
+        const { payload } = response;
+        if (!(Array.isArray(resType) ? resType : resType.split('|')).includes(payload.type)) {
+            await (0, utils_1.scheduleAction)(abort => this.transport.receive({
+                session: this.session,
+                protocol: this.protocol,
+                signal: abort,
+            }), { timeout: 500 }).catch(() => { });
+            throw constants_1.ERRORS.TypedError('Runtime', `assertType: Response of unexpected type: ${payload.type}. Should be ${resType}`);
+        }
+        return payload;
+    }
+    needCancelWorkaround() {
+        return (this.transport.name === 'BridgeTransport' &&
+            !utils_1.versionUtils.isNewer(this.transport.version, '2.0.28'));
+    }
+    async callLoop(type, msg, abortPromise) {
+        let [name, data] = [type, msg];
+        const { protocol, session } = this;
+        let pinUnlocked = false;
+        while (true) {
+            if (this.disposed)
+                return disposed();
+            const callPromise = this.call({ session, name, data, protocol });
+            const abortedDuringCall = await Promise.race([
+                callPromise.then(() => false),
+                abortPromise.then(() => true),
+            ]);
+            if (name === 'ButtonAck' && abortedDuringCall && !this.disposed) {
+                if (this.needCancelWorkaround()) {
+                    try {
+                        await (0, utils_1.resolveAfter)(1);
+                        await this.device.acquire();
+                        await this.device.getCurrentSession().cancelCall(false);
+                        await this.device.release();
+                    }
+                    catch {
+                    }
+                }
+                else {
+                    await this.cancelCall(false);
+                }
+            }
+            const response = await callPromise;
+            if (this.disposed)
+                return disposed();
+            if (!response.success)
+                return response;
+            const res = response.payload;
+            switch (res.type) {
+                case 'Failure': {
+                    const { code, message } = res.message;
+                    const err = message ||
+                        (code === 'Failure_FirmwareError' && 'Firmware installation failed') ||
+                        (code === 'Failure_ActionCancelled' && 'Action cancelled by user') ||
+                        'Failure_UnknownMessage';
+                    return error(new constants_1.ERRORS.TrezorError(code || 'Failure_UnknownCode', err));
+                }
+                case 'ButtonRequest': {
+                    if (res.message.code === 'ButtonRequest_PassphraseEntry') {
+                        this.device.emit(events_1.DEVICE.PASSPHRASE_ON_DEVICE);
+                    }
+                    else {
+                        this.device.emit(events_1.DEVICE.BUTTON, {
+                            device: this.device,
+                            payload: res.message,
+                        });
+                    }
+                    [name, data] = ['ButtonAck', {}];
+                    break;
+                }
+                case 'PinMatrixRequest': {
+                    const promptRes = await Promise.race([
+                        this.device.prompt(events_1.DEVICE.PIN, { type: res.message.type }),
+                        abortPromise,
+                    ]);
+                    if (!promptRes.success) {
+                        const cancelRes = await this.cancelCall();
+                        return cancelRes.success ? promptRes : cancelRes;
+                    }
+                    pinUnlocked = true;
+                    [name, data] = ['PinMatrixAck', { pin: promptRes.payload }];
+                    break;
+                }
+                case 'PassphraseRequest': {
+                    const promptRes = await Promise.race([
+                        this.device.prompt(events_1.DEVICE.PASSPHRASE, {}),
+                        abortPromise,
+                    ]);
+                    if (!promptRes.success) {
+                        const cancelRes = await this.cancelCall();
+                        return cancelRes.success ? promptRes : cancelRes;
+                    }
+                    const payload = promptRes.payload.passphraseOnDevice
+                        ? { on_device: true }
+                        : { passphrase: promptRes.payload.value.normalize('NFKD') };
+                    [name, data] = ['PassphraseAck', payload];
+                    break;
+                }
+                case 'WordRequest': {
+                    const promptRes = await Promise.race([
+                        this.device.prompt(events_1.DEVICE.WORD, { type: res.message.type }),
+                        abortPromise,
+                    ]);
+                    if (!promptRes.success) {
+                        const cancelRes = await this.cancelCall();
+                        return cancelRes.success ? promptRes : cancelRes;
+                    }
+                    [name, data] = ['WordAck', { word: promptRes.payload }];
+                    break;
+                }
+                default: {
+                    if (!this.disposed && pinUnlocked && !this.device.features.unlocked) {
+                        await this.device.getFeatures();
+                    }
+                    return success(res);
+                }
+            }
+        }
+    }
+    async call(params) {
+        logger.debug('Sending', params.name, filterForLog(params.name, params.data));
+        const result = await this.transport.call(params);
+        if (result.success) {
+            const { type, message } = result.payload;
+            logger.debug('Received', type, filterForLog(type, message));
+        }
+        else {
+            logger.warn('Received transport error', result.error, result.message);
+        }
+        return result.success ? success(result.payload) : fail(result.error, 'transport-error');
+    }
+    async cancelCall(expectResponse = true) {
+        if (this.disposed)
+            return Promise.resolve(disposed());
+        const { protocol, session } = this;
+        const cancelArgs = { session, name: 'Cancel', data: {}, protocol };
+        const response = expectResponse
+            ? await this.transport.call(cancelArgs)
+            : await this.transport.send(cancelArgs);
+        return response.success ? success(response.payload) : fail(response.error);
+    }
+    async abort(reason) {
+        this.abortController?.abort(reason);
+        await this.callPromise;
+    }
+    async dispose() {
+        if (!this.disposed) {
+            this.disposed = true;
+            await this.abort(constants_1.ERRORS.TypedError('Runtime', 'typedCall: DeviceCommands already disposed'));
+        }
+    }
+}
+exports.DeviceCurrentSession = DeviceCurrentSession;
+//# sourceMappingURL=DeviceCurrentSession.js.map

package/lib/device/DeviceList.js

@@ -162,7 +162,7 @@ class DeviceList extends utils_1.TypedEmitter {
             await this.initializeTransport(transport, pendingTransportEvent, signal);
         }
         catch (err) {
-            await this.stopTransport(transport);
+            this.stopTransport(transport);
             throw err;
         }
     }
@@ -231,15 +231,13 @@ class DeviceList extends utils_1.TypedEmitter {
         const promises = Object.values(this.transportManagers).map(manager => manager.dispose());
         await Promise.all(promises);
     }
-    async stopTransport(transport) {
+    stopTransport(transport) {
         const devices = this.devices.clear(transport);
         devices.forEach(device => {
             this.emit(events_1.DEVICE.DISCONNECT, device);
-        });
-        await Promise.all(devices.map(async (device) => {
             this.authPenaltyManager.remove(device);
-            await device.dispose();
-        }));
+            device.dispose();
+        });
         transport?.stop();
     }
     async enumerate() {

package/lib/device/TransportManager.d.ts

@@ -6,7 +6,7 @@ type TransportManagerEvents = {
 };
 type TransportManagerParams = {
     startTransport: (transport: Transport, pendingTransportEvent: boolean, signal: AbortSignal) => Promise<void>;
-    stopTransport: (transport: Transport) => Promise<void>;
+    stopTransport: (transport: Transport) => void;
 };
 type InitParams = {
     transports: Transport[];

package/lib/device/TransportManager.js

@@ -53,13 +53,14 @@ class TransportManager extends utils_1.TypedEmitter {
     }
     dispose() {
         this.removeAllListeners();
-        return this.lock.override('Disposing', async () => {
+        return this.lock.override('Disposing', () => {
             const { activeTransport } = this;
             if (activeTransport) {
                 clearTimeout(this.upgradeTimeout);
                 delete this.activeTransport;
-                await this.stopTransport(activeTransport);
+                this.stopTransport(activeTransport);
             }
+            return Promise.resolve();
         });
     }
     async selectTransport([transport, ...rest], signal) {
@@ -103,7 +104,7 @@ class TransportManager extends utils_1.TypedEmitter {
                 if (activeTransport) {
                     clearTimeout(this.upgradeTimeout);
                     delete this.activeTransport;
-                    await this.stopTransport(activeTransport);
+                    this.stopTransport(activeTransport);
                 }
                 if (transport) {
                     await this.startTransport(transport, pendingTransportEvent, abortSignal);
@@ -113,7 +114,7 @@ class TransportManager extends utils_1.TypedEmitter {
                         this.lock
                             .override('Transport error', async (signal) => {
                             delete this.activeTransport;
-                            await this.stopTransport(transport);
+                            this.stopTransport(transport);
                             if (this.transportReconnect) {
                                 await (0, utils_1.resolveAfter)(1000, signal);
                                 await this.createInitPromise(pendingTransportEvent, signal);

package/lib/events/ui-response.d.ts

@@ -39,11 +39,11 @@ export interface UiResponseDevice {
 }
 export interface UiResponsePin {
     type: typeof UI_RESPONSE.RECEIVE_PIN;
-    payload: string | undefined;
+    payload: string;
 }
 export interface UiResponseWord {
     type: typeof UI_RESPONSE.RECEIVE_WORD;
-    payload: string | undefined;
+    payload: string;
 }
 export interface UiResponsePassphrase {
     type: typeof UI_RESPONSE.RECEIVE_PASSPHRASE;
@@ -51,7 +51,7 @@ export interface UiResponsePassphrase {
         value: string;
         passphraseOnDevice?: boolean;
         save?: boolean;
-    } | undefined;
+    };
 }
 export interface UiResponsePassphraseAction {
     type: typeof UI_RESPONSE.INVALID_PASSPHRASE_ACTION;

package/lib/impl/dynamic.d.ts

@@ -10,6 +10,7 @@ type TrezorConnectDynamicParams<ImplType, SettingsType extends Record<string, an
         impl: ImplInterface;
     }[];
     getInitTarget: (settings: InitFullSettings<SettingsType>) => ImplType;
+    handleBeforeCall: () => Promise<void>;
     handleErrorFallback: (errorCode: string) => Promise<boolean>;
 };
 export declare class TrezorConnectDynamic<ImplType, SettingsType extends Record<string, any>, ImplInterface extends ConnectFactoryDependencies<SettingsType>> implements ConnectFactoryDependencies<SettingsType> {
@@ -17,10 +18,12 @@ export declare class TrezorConnectDynamic<ImplType, SettingsType extends Record<
     private currentTarget;
     private implementations;
     private getInitTarget;
+    private handleBeforeCall;
     private handleErrorFallback;
     lastSettings?: InitFullSettings<SettingsType>;
-    constructor({ implementations, getInitTarget, handleErrorFallback, }: TrezorConnectDynamicParams<ImplType, SettingsType, ImplInterface>);
+    constructor({ implementations, getInitTarget, handleBeforeCall, handleErrorFallback, }: TrezorConnectDynamicParams<ImplType, SettingsType, ImplInterface>);
     getTarget(): ImplInterface;
+    getTargetType(): ImplType;
     switchTarget(target: ImplType): Promise<void>;
     manifest(manifest: Manifest): void;
     init(settings: InitFullSettings<SettingsType>): Promise<void>;

package/lib/impl/dynamic.js

@@ -8,18 +8,23 @@ class TrezorConnectDynamic {
     currentTarget;
     implementations;
     getInitTarget;
+    handleBeforeCall;
     handleErrorFallback;
     lastSettings;
-    constructor({ implementations, getInitTarget, handleErrorFallback, }) {
+    constructor({ implementations, getInitTarget, handleBeforeCall, handleErrorFallback, }) {
         this.implementations = implementations;
         this.currentTarget = this.implementations[0].type;
         this.getInitTarget = getInitTarget;
+        this.handleBeforeCall = handleBeforeCall;
         this.handleErrorFallback = handleErrorFallback;
         this.eventEmitter = new proxy_event_emitter_1.ProxyEventEmitter(this.implementations.map(impl => impl.impl.eventEmitter));
     }
     getTarget() {
         return this.implementations.find(impl => impl.type === this.currentTarget).impl;
     }
+    getTargetType() {
+        return this.currentTarget;
+    }
     async switchTarget(target) {
         if (this.currentTarget === target) {
             return;
@@ -27,9 +32,16 @@ class TrezorConnectDynamic {
         if (!this.lastSettings) {
             throw constants_1.ERRORS.TypedError('Init_NotInitialized');
         }
-        await this.getTarget().dispose();
-        this.currentTarget = target;
-        await this.getTarget().init(this.lastSettings);
+        const oldTargetType = this.getTargetType();
+        const oldTarget = this.getTarget();
+        try {
+            this.currentTarget = target;
+            await this.getTarget().init(this.lastSettings);
+            await oldTarget.dispose();
+        }
+        catch {
+            this.currentTarget = oldTargetType;
+        }
     }
     manifest(manifest) {
         this.lastSettings = { ...this.lastSettings, manifest };
@@ -56,6 +68,7 @@ class TrezorConnectDynamic {
         this.getTarget().setTransports({ transports });
     }
     async call(params) {
+        await this.handleBeforeCall();
         const response = await this.getTarget().call(params);
         if (!response.success) {
             if (await this.handleErrorFallback(response.payload.code)) {

package/lib/tsconfig.lib.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/exports.ts","../src/factory.ts","../src/index-browser.ts","../src/index.ts","../src/api/applyFlags.ts","../src/api/applySettings.ts","../src/api/authenticateDevice.ts","../src/api/authorizeCoinjoin.ts","../src/api/backupDevice.ts","../src/api/blockchainDisconnect.ts","../src/api/blockchainEstimateFee.ts","../src/api/blockchainEvmRpcCall.ts","../src/api/blockchainGetAccountBalanceHistory.ts","../src/api/blockchainGetCurrentFiatRates.ts","../src/api/blockchainGetFiatRatesForTimestamps.ts","../src/api/blockchainGetInfo.ts","../src/api/blockchainGetTransactions.ts","../src/api/blockchainSetCustomBackend.ts","../src/api/blockchainSubscribe.ts","../src/api/blockchainSubscribeFiatRates.ts","../src/api/blockchainUnsubscribe.ts","../src/api/blockchainUnsubscribeFiatRates.ts","../src/api/cancelCoinjoinAuthorization.ts","../src/api/changeLanguage.ts","../src/api/changePin.ts","../src/api/changeWipeCode.ts","../src/api/cipherKeyValue.ts","../src/api/composeTransaction.ts","../src/api/getAccountDescriptor.ts","../src/api/getAccountInfo.ts","../src/api/getAddress.ts","../src/api/getCoinInfo.ts","../src/api/getDeviceState.ts","../src/api/getFeatures.ts","../src/api/getFirmwareHash.ts","../src/api/getOwnershipId.ts","../src/api/getOwnershipProof.ts","../src/api/getPublicKey.ts","../src/api/getSettings.ts","../src/api/index.ts","../src/api/loadDevice.ts","../src/api/pushTransaction.ts","../src/api/recoveryDevice.ts","../src/api/requestLogin.ts","../src/api/resetDevice.ts","../src/api/setBrightness.ts","../src/api/setBusy.ts","../src/api/setProxy.ts","../src/api/showDeviceTutorial.ts","../src/api/signMessage.ts","../src/api/signTransaction.ts","../src/api/unlockPath.ts","../src/api/verifyMessage.ts","../src/api/wipeDevice.ts","../src/api/binance/binanceSignTx.ts","../src/api/binance/api/binanceGetAddress.ts","../src/api/binance/api/binanceGetPublicKey.ts","../src/api/binance/api/binanceSignTransaction.ts","../src/api/binance/api/index.ts","../src/api/bitcoin/BitcoinFees.ts","../src/api/bitcoin/TransactionComposer.ts","../src/api/bitcoin/createPendingTx.ts","../src/api/bitcoin/enhanceSignTx.ts","../src/api/bitcoin/index.ts","../src/api/bitcoin/inputs.ts","../src/api/bitcoin/outputs.ts","../src/api/bitcoin/refTx.ts","../src/api/bitcoin/signtx.ts","../src/api/bitcoin/signtxLegacy.ts","../src/api/bitcoin/signtxVerify.ts","../src/api/cardano/cardanoAddressParameters.ts","../src/api/cardano/cardanoAuxiliaryData.ts","../src/api/cardano/cardanoCertificate.ts","../src/api/cardano/cardanoInputs.ts","../src/api/cardano/cardanoOutputs.ts","../src/api/cardano/cardanoTokenBundle.ts","../src/api/cardano/cardanoUtils.ts","../src/api/cardano/cardanoWitnesses.ts","../src/api/cardano/api/cardanoComposeTransaction.ts","../src/api/cardano/api/cardanoGetAddress.ts","../src/api/cardano/api/cardanoGetNativeScriptHash.ts","../src/api/cardano/api/cardanoGetPublicKey.ts","../src/api/cardano/api/cardanoSignTransaction.ts","../src/api/cardano/api/index.ts","../src/api/common/Discovery.ts","../src/api/common/MiscFees.ts","../src/api/common/paramsValidator.ts","../src/api/eos/eosSignTx.ts","../src/api/eos/api/eosGetPublicKey.ts","../src/api/eos/api/eosSignTransaction.ts","../src/api/eos/api/index.ts","../src/api/ethereum/EthereumFees.ts","../src/api/ethereum/ethereumDefinitions.ts","../src/api/ethereum/ethereumSignTx.ts","../src/api/ethereum/ethereumSignTypedData.ts","../src/api/ethereum/api/ethereumGetAddress.ts","../src/api/ethereum/api/ethereumGetPublicKey.ts","../src/api/ethereum/api/ethereumSignMessage.ts","../src/api/ethereum/api/ethereumSignTransaction.ts","../src/api/ethereum/api/ethereumSignTypedData.ts","../src/api/ethereum/api/ethereumVerifyMessage.ts","../src/api/ethereum/api/index.ts","../src/api/firmware/calculateFirmwareHash.ts","../src/api/firmware/getBinary.ts","../src/api/firmware/getBinaryForFirmwareUpgrade.ts","../src/api/firmware/index.ts","../src/api/firmware/modifyFirmware.ts","../src/api/firmware/parseFirmwareHeaders.ts","../src/api/firmware/uploadFirmware.ts","../src/api/firmware/verifyAuthenticityProof.ts","../src/api/firmware/verifyEntropy.ts","../src/api/firmware/x509certificate.ts","../src/api/nem/nemSignTx.ts","../src/api/nem/api/index.ts","../src/api/nem/api/nemGetAddress.ts","../src/api/nem/api/nemSignTransaction.ts","../src/api/ripple/api/index.ts","../src/api/ripple/api/rippleGetAddress.ts","../src/api/ripple/api/rippleSignTransaction.ts","../src/api/solana/additionalInfo.ts","../src/api/solana/solanaUtils.ts","../src/api/solana/api/index.ts","../src/api/solana/api/solanaComposeTransaction.ts","../src/api/solana/api/solanaGetAddress.ts","../src/api/solana/api/solanaGetPublicKey.ts","../src/api/solana/api/solanaSignTransaction.ts","../src/api/stellar/stellarSignTx.ts","../src/api/stellar/api/index.ts","../src/api/stellar/api/stellarGetAddress.ts","../src/api/stellar/api/stellarSignTransaction.ts","../src/api/tezos/tezosSignTx.ts","../src/api/tezos/api/index.ts","../src/api/tezos/api/tezosGetAddress.ts","../src/api/tezos/api/tezosGetPublicKey.ts","../src/api/tezos/api/tezosSignTransaction.ts","../src/backend/BackendManager.ts","../src/backend/Blockchain.ts","../src/backend/BlockchainLink.ts","../src/constants/cardano.ts","../src/constants/errors.ts","../src/constants/firmware.ts","../src/constants/index.ts","../src/constants/nem.ts","../src/constants/network.ts","../src/constants/utxo.ts","../src/core/AbstractMethod.ts","../src/core/index.ts","../src/core/method.native.ts","../src/core/method.ts","../src/core/onCallFirmwareUpdate.ts","../src/data/DataManager.ts","../src/data/analyticsInfo.ts","../src/data/coinInfo.ts","../src/data/config.ts","../src/data/connectSettings.ts","../src/data/defaultFeeLevels.ts","../src/data/deviceAuthenticityConfig.ts","../src/data/deviceAuthenticityConfigTypes.ts","../src/data/downloadReleasesMetadata.ts","../src/data/firmwareInfo.ts","../src/data/getLanguage.ts","../src/data/models.ts","../src/data/transportInfo.ts","../src/data/udevInfo.ts","../src/data/version.ts","../src/device/Device.ts","../src/device/DeviceCommands.ts","../src/device/DeviceList.ts","../src/device/StateStorage.ts","../src/device/TransportList.ts","../src/device/TransportManager.ts","../src/device/calculateRevisionForDevice.ts","../src/device/checkFirmwareRevision.ts","../src/device/prompts.ts","../src/device/resolveDescriptorForTaproot.ts","../src/events/blockchain.ts","../src/events/call.ts","../src/events/core.ts","../src/events/device.ts","../src/events/iframe.ts","../src/events/index.ts","../src/events/popup.ts","../src/events/transport.ts","../src/events/ui-promise.ts","../src/events/ui-request.ts","../src/events/ui-response.ts","../src/events/webextension.ts","../src/impl/core-in-module.ts","../src/impl/dynamic.ts","../src/types/account.ts","../src/types/coinInfo.ts","../src/types/device.ts","../src/types/fees.ts","../src/types/firmware.ts","../src/types/index.ts","../src/types/params.ts","../src/types/settings.ts","../src/types/utils.ts","../src/types/api/applyFlags.ts","../src/types/api/applySettings.ts","../src/types/api/authenticateDevice.ts","../src/types/api/authorizeCoinjoin.ts","../src/types/api/backupDevice.ts","../src/types/api/binanceGetAddress.ts","../src/types/api/binanceGetPublicKey.ts","../src/types/api/binanceSignTransaction.ts","../src/types/api/blockchainDisconnect.ts","../src/types/api/blockchainEstimateFee.ts","../src/types/api/blockchainEvmRpcCall.ts","../src/types/api/blockchainGetAccountBalanceHistory.ts","../src/types/api/blockchainGetCurrentFiatRates.ts","../src/types/api/blockchainGetFiatRatesForTimestamps.ts","../src/types/api/blockchainGetInfo.ts","../src/types/api/blockchainGetTransactions.ts","../src/types/api/blockchainSetCustomBackend.ts","../src/types/api/blockchainSubscribe.ts","../src/types/api/blockchainSubscribeFiatRates.ts","../src/types/api/blockchainUnsubscribe.ts","../src/types/api/blockchainUnsubscribeFiatRates.ts","../src/types/api/cancel.ts","../src/types/api/cancelCoinjoinAuthorization.ts","../src/types/api/cardanoComposeTransaction.ts","../src/types/api/cardanoGetAddress.ts","../src/types/api/cardanoGetNativeScriptHash.ts","../src/types/api/cardanoGetPublicKey.ts","../src/types/api/cardanoSignTransaction.ts","../src/types/api/changeLanguage.ts","../src/types/api/changePin.ts","../src/types/api/changeWipeCode.ts","../src/types/api/cipherKeyValue.ts","../src/types/api/composeTransaction.ts","../src/types/api/device.ts","../src/types/api/disableWebUSB.ts","../src/types/api/dispose.ts","../src/types/api/eosGetPublicKey.ts","../src/types/api/eosSignTransaction.ts","../src/types/api/ethereumGetAddress.ts","../src/types/api/ethereumGetPublicKey.ts","../src/types/api/ethereumSignMessage.ts","../src/types/api/ethereumSignTransaction.ts","../src/types/api/ethereumSignTypedData.ts","../src/types/api/ethereumVerifyMessage.ts","../src/types/api/firmwareUpdate.ts","../src/types/api/getAccountDescriptor.ts","../src/types/api/getAccountInfo.ts","../src/types/api/getAddress.ts","../src/types/api/getCoinInfo.ts","../src/types/api/getDeviceState.ts","../src/types/api/getFeatures.ts","../src/types/api/getFirmwareHash.ts","../src/types/api/getOwnershipId.ts","../src/types/api/getOwnershipProof.ts","../src/types/api/getPublicKey.ts","../src/types/api/getSettings.ts","../src/types/api/index.ts","../src/types/api/init.ts","../src/types/api/loadDevice.ts","../src/types/api/manifest.ts","../src/types/api/nemGetAddress.ts","../src/types/api/nemSignTransaction.ts","../src/types/api/off.ts","../src/types/api/on.ts","../src/types/api/pushTransaction.ts","../src/types/api/recoveryDevice.ts","../src/types/api/removeAllListeners.ts","../src/types/api/renderWebUSBButton.ts","../src/types/api/requestLogin.ts","../src/types/api/requestWebUSBDevice.ts","../src/types/api/resetDevice.ts","../src/types/api/rippleGetAddress.ts","../src/types/api/rippleSignTransaction.ts","../src/types/api/setBrightness.ts","../src/types/api/setBusy.ts","../src/types/api/setProxy.ts","../src/types/api/setTransports.ts","../src/types/api/showDeviceTutorial.ts","../src/types/api/signMessage.ts","../src/types/api/signTransaction.ts","../src/types/api/solanaComposeTransaction.ts","../src/types/api/solanaGetAddress.ts","../src/types/api/solanaGetPublicKey.ts","../src/types/api/solanaSignTransaction.ts","../src/types/api/stellarGetAddress.ts","../src/types/api/stellarSignTransaction.ts","../src/types/api/tezosGetAddress.ts","../src/types/api/tezosGetPublicKey.ts","../src/types/api/tezosSignTransaction.ts","../src/types/api/uiResponse.ts","../src/types/api/unlockPath.ts","../src/types/api/verifyMessage.ts","../src/types/api/wipeDevice.ts","../src/types/api/binance/index.ts","../src/types/api/bitcoin/index.ts","../src/types/api/cardano/index.ts","../src/types/api/eos/index.ts","../src/types/api/ethereum/index.ts","../src/types/api/nem/index.ts","../src/types/api/ripple/index.ts","../src/types/api/solana/index.ts","../src/types/api/stellar/index.ts","../src/types/api/tezos/index.ts","../src/utils/accountUtils.ts","../src/utils/addressUtils.ts","../src/utils/assetUtils.ts","../src/utils/assets-browser.ts","../src/utils/assets.native.ts","../src/utils/assets.ts","../src/utils/assetsTypes.ts","../src/utils/debug.ts","../src/utils/deviceFeaturesUtils.ts","../src/utils/ethereumUtils.ts","../src/utils/firmwareUtils.ts","../src/utils/formatUtils.ts","../src/utils/hdnodeUtils.ts","../src/utils/interactionTimeout.ts","../src/utils/pathUtils.ts","../src/utils/popupPromiseManager.ts","../src/utils/proxy-event-emitter.ts","../src/utils/uiPromiseManager.ts","../src/utils/urlUtils.ts","../src/utils/versionCheck.ts","../src/workers/workers-browser.ts","../src/workers/workers.native.ts","../src/workers/workers.ts"],"version":"5.8.2"}
+{"root":["../src/exports.ts","../src/factory.ts","../src/index-browser.ts","../src/index.ts","../src/api/applyFlags.ts","../src/api/applySettings.ts","../src/api/authenticateDevice.ts","../src/api/authorizeCoinjoin.ts","../src/api/backupDevice.ts","../src/api/blockchainDisconnect.ts","../src/api/blockchainEstimateFee.ts","../src/api/blockchainEvmRpcCall.ts","../src/api/blockchainGetAccountBalanceHistory.ts","../src/api/blockchainGetCurrentFiatRates.ts","../src/api/blockchainGetFiatRatesForTimestamps.ts","../src/api/blockchainGetInfo.ts","../src/api/blockchainGetTransactions.ts","../src/api/blockchainSetCustomBackend.ts","../src/api/blockchainSubscribe.ts","../src/api/blockchainSubscribeFiatRates.ts","../src/api/blockchainUnsubscribe.ts","../src/api/blockchainUnsubscribeFiatRates.ts","../src/api/cancelCoinjoinAuthorization.ts","../src/api/changeLanguage.ts","../src/api/changePin.ts","../src/api/changeWipeCode.ts","../src/api/cipherKeyValue.ts","../src/api/composeTransaction.ts","../src/api/getAccountDescriptor.ts","../src/api/getAccountInfo.ts","../src/api/getAddress.ts","../src/api/getCoinInfo.ts","../src/api/getDeviceState.ts","../src/api/getFeatures.ts","../src/api/getFirmwareHash.ts","../src/api/getOwnershipId.ts","../src/api/getOwnershipProof.ts","../src/api/getPublicKey.ts","../src/api/getSettings.ts","../src/api/index.ts","../src/api/loadDevice.ts","../src/api/pushTransaction.ts","../src/api/recoveryDevice.ts","../src/api/requestLogin.ts","../src/api/resetDevice.ts","../src/api/setBrightness.ts","../src/api/setBusy.ts","../src/api/setProxy.ts","../src/api/showDeviceTutorial.ts","../src/api/signMessage.ts","../src/api/signTransaction.ts","../src/api/unlockPath.ts","../src/api/verifyMessage.ts","../src/api/wipeDevice.ts","../src/api/binance/binanceSignTx.ts","../src/api/binance/api/binanceGetAddress.ts","../src/api/binance/api/binanceGetPublicKey.ts","../src/api/binance/api/binanceSignTransaction.ts","../src/api/binance/api/index.ts","../src/api/bitcoin/BitcoinFees.ts","../src/api/bitcoin/TransactionComposer.ts","../src/api/bitcoin/createPendingTx.ts","../src/api/bitcoin/enhanceSignTx.ts","../src/api/bitcoin/index.ts","../src/api/bitcoin/inputs.ts","../src/api/bitcoin/outputs.ts","../src/api/bitcoin/refTx.ts","../src/api/bitcoin/signtx.ts","../src/api/bitcoin/signtxLegacy.ts","../src/api/bitcoin/signtxVerify.ts","../src/api/cardano/cardanoAddressParameters.ts","../src/api/cardano/cardanoAuxiliaryData.ts","../src/api/cardano/cardanoCertificate.ts","../src/api/cardano/cardanoInputs.ts","../src/api/cardano/cardanoOutputs.ts","../src/api/cardano/cardanoTokenBundle.ts","../src/api/cardano/cardanoUtils.ts","../src/api/cardano/cardanoWitnesses.ts","../src/api/cardano/api/cardanoComposeTransaction.ts","../src/api/cardano/api/cardanoGetAddress.ts","../src/api/cardano/api/cardanoGetNativeScriptHash.ts","../src/api/cardano/api/cardanoGetPublicKey.ts","../src/api/cardano/api/cardanoSignTransaction.ts","../src/api/cardano/api/index.ts","../src/api/common/Discovery.ts","../src/api/common/MiscFees.ts","../src/api/common/paramsValidator.ts","../src/api/eos/eosSignTx.ts","../src/api/eos/api/eosGetPublicKey.ts","../src/api/eos/api/eosSignTransaction.ts","../src/api/eos/api/index.ts","../src/api/ethereum/EthereumFees.ts","../src/api/ethereum/ethereumDefinitions.ts","../src/api/ethereum/ethereumSignTx.ts","../src/api/ethereum/ethereumSignTypedData.ts","../src/api/ethereum/api/ethereumGetAddress.ts","../src/api/ethereum/api/ethereumGetPublicKey.ts","../src/api/ethereum/api/ethereumSignMessage.ts","../src/api/ethereum/api/ethereumSignTransaction.ts","../src/api/ethereum/api/ethereumSignTypedData.ts","../src/api/ethereum/api/ethereumVerifyMessage.ts","../src/api/ethereum/api/index.ts","../src/api/firmware/calculateFirmwareHash.ts","../src/api/firmware/getBinary.ts","../src/api/firmware/getBinaryForFirmwareUpgrade.ts","../src/api/firmware/index.ts","../src/api/firmware/modifyFirmware.ts","../src/api/firmware/parseFirmwareHeaders.ts","../src/api/firmware/uploadFirmware.ts","../src/api/firmware/verifyAuthenticityProof.ts","../src/api/firmware/verifyEntropy.ts","../src/api/firmware/x509certificate.ts","../src/api/nem/nemSignTx.ts","../src/api/nem/api/index.ts","../src/api/nem/api/nemGetAddress.ts","../src/api/nem/api/nemSignTransaction.ts","../src/api/ripple/api/index.ts","../src/api/ripple/api/rippleGetAddress.ts","../src/api/ripple/api/rippleSignTransaction.ts","../src/api/solana/additionalInfo.ts","../src/api/solana/solanaUtils.ts","../src/api/solana/api/index.ts","../src/api/solana/api/solanaComposeTransaction.ts","../src/api/solana/api/solanaGetAddress.ts","../src/api/solana/api/solanaGetPublicKey.ts","../src/api/solana/api/solanaSignTransaction.ts","../src/api/stellar/stellarSignTx.ts","../src/api/stellar/api/index.ts","../src/api/stellar/api/stellarGetAddress.ts","../src/api/stellar/api/stellarSignTransaction.ts","../src/api/tezos/tezosSignTx.ts","../src/api/tezos/api/index.ts","../src/api/tezos/api/tezosGetAddress.ts","../src/api/tezos/api/tezosGetPublicKey.ts","../src/api/tezos/api/tezosSignTransaction.ts","../src/backend/BackendManager.ts","../src/backend/Blockchain.ts","../src/backend/BlockchainLink.ts","../src/constants/cardano.ts","../src/constants/errors.ts","../src/constants/firmware.ts","../src/constants/index.ts","../src/constants/nem.ts","../src/constants/network.ts","../src/constants/utxo.ts","../src/core/AbstractMethod.ts","../src/core/index.ts","../src/core/method.native.ts","../src/core/method.ts","../src/core/onCallFirmwareUpdate.ts","../src/data/DataManager.ts","../src/data/analyticsInfo.ts","../src/data/coinInfo.ts","../src/data/config.ts","../src/data/connectSettings.ts","../src/data/defaultFeeLevels.ts","../src/data/deviceAuthenticityConfig.ts","../src/data/deviceAuthenticityConfigTypes.ts","../src/data/downloadReleasesMetadata.ts","../src/data/firmwareInfo.ts","../src/data/getLanguage.ts","../src/data/models.ts","../src/data/transportInfo.ts","../src/data/udevInfo.ts","../src/data/version.ts","../src/device/Device.ts","../src/device/DeviceCommands.ts","../src/device/DeviceCurrentSession.ts","../src/device/DeviceList.ts","../src/device/StateStorage.ts","../src/device/TransportList.ts","../src/device/TransportManager.ts","../src/device/calculateRevisionForDevice.ts","../src/device/checkFirmwareRevision.ts","../src/device/resolveDescriptorForTaproot.ts","../src/events/blockchain.ts","../src/events/call.ts","../src/events/core.ts","../src/events/device.ts","../src/events/iframe.ts","../src/events/index.ts","../src/events/popup.ts","../src/events/transport.ts","../src/events/ui-promise.ts","../src/events/ui-request.ts","../src/events/ui-response.ts","../src/events/webextension.ts","../src/impl/core-in-module.ts","../src/impl/dynamic.ts","../src/types/account.ts","../src/types/coinInfo.ts","../src/types/device.ts","../src/types/fees.ts","../src/types/firmware.ts","../src/types/index.ts","../src/types/params.ts","../src/types/settings.ts","../src/types/utils.ts","../src/types/api/applyFlags.ts","../src/types/api/applySettings.ts","../src/types/api/authenticateDevice.ts","../src/types/api/authorizeCoinjoin.ts","../src/types/api/backupDevice.ts","../src/types/api/binanceGetAddress.ts","../src/types/api/binanceGetPublicKey.ts","../src/types/api/binanceSignTransaction.ts","../src/types/api/blockchainDisconnect.ts","../src/types/api/blockchainEstimateFee.ts","../src/types/api/blockchainEvmRpcCall.ts","../src/types/api/blockchainGetAccountBalanceHistory.ts","../src/types/api/blockchainGetCurrentFiatRates.ts","../src/types/api/blockchainGetFiatRatesForTimestamps.ts","../src/types/api/blockchainGetInfo.ts","../src/types/api/blockchainGetTransactions.ts","../src/types/api/blockchainSetCustomBackend.ts","../src/types/api/blockchainSubscribe.ts","../src/types/api/blockchainSubscribeFiatRates.ts","../src/types/api/blockchainUnsubscribe.ts","../src/types/api/blockchainUnsubscribeFiatRates.ts","../src/types/api/cancel.ts","../src/types/api/cancelCoinjoinAuthorization.ts","../src/types/api/cardanoComposeTransaction.ts","../src/types/api/cardanoGetAddress.ts","../src/types/api/cardanoGetNativeScriptHash.ts","../src/types/api/cardanoGetPublicKey.ts","../src/types/api/cardanoSignTransaction.ts","../src/types/api/changeLanguage.ts","../src/types/api/changePin.ts","../src/types/api/changeWipeCode.ts","../src/types/api/cipherKeyValue.ts","../src/types/api/composeTransaction.ts","../src/types/api/device.ts","../src/types/api/disableWebUSB.ts","../src/types/api/dispose.ts","../src/types/api/eosGetPublicKey.ts","../src/types/api/eosSignTransaction.ts","../src/types/api/ethereumGetAddress.ts","../src/types/api/ethereumGetPublicKey.ts","../src/types/api/ethereumSignMessage.ts","../src/types/api/ethereumSignTransaction.ts","../src/types/api/ethereumSignTypedData.ts","../src/types/api/ethereumVerifyMessage.ts","../src/types/api/firmwareUpdate.ts","../src/types/api/getAccountDescriptor.ts","../src/types/api/getAccountInfo.ts","../src/types/api/getAddress.ts","../src/types/api/getCoinInfo.ts","../src/types/api/getDeviceState.ts","../src/types/api/getFeatures.ts","../src/types/api/getFirmwareHash.ts","../src/types/api/getOwnershipId.ts","../src/types/api/getOwnershipProof.ts","../src/types/api/getPublicKey.ts","../src/types/api/getSettings.ts","../src/types/api/index.ts","../src/types/api/init.ts","../src/types/api/loadDevice.ts","../src/types/api/manifest.ts","../src/types/api/nemGetAddress.ts","../src/types/api/nemSignTransaction.ts","../src/types/api/off.ts","../src/types/api/on.ts","../src/types/api/pushTransaction.ts","../src/types/api/recoveryDevice.ts","../src/types/api/removeAllListeners.ts","../src/types/api/renderWebUSBButton.ts","../src/types/api/requestLogin.ts","../src/types/api/requestWebUSBDevice.ts","../src/types/api/resetDevice.ts","../src/types/api/rippleGetAddress.ts","../src/types/api/rippleSignTransaction.ts","../src/types/api/setBrightness.ts","../src/types/api/setBusy.ts","../src/types/api/setProxy.ts","../src/types/api/setTransports.ts","../src/types/api/showDeviceTutorial.ts","../src/types/api/signMessage.ts","../src/types/api/signTransaction.ts","../src/types/api/solanaComposeTransaction.ts","../src/types/api/solanaGetAddress.ts","../src/types/api/solanaGetPublicKey.ts","../src/types/api/solanaSignTransaction.ts","../src/types/api/stellarGetAddress.ts","../src/types/api/stellarSignTransaction.ts","../src/types/api/tezosGetAddress.ts","../src/types/api/tezosGetPublicKey.ts","../src/types/api/tezosSignTransaction.ts","../src/types/api/uiResponse.ts","../src/types/api/unlockPath.ts","../src/types/api/verifyMessage.ts","../src/types/api/wipeDevice.ts","../src/types/api/binance/index.ts","../src/types/api/bitcoin/index.ts","../src/types/api/cardano/index.ts","../src/types/api/eos/index.ts","../src/types/api/ethereum/index.ts","../src/types/api/nem/index.ts","../src/types/api/ripple/index.ts","../src/types/api/solana/index.ts","../src/types/api/stellar/index.ts","../src/types/api/tezos/index.ts","../src/utils/accountUtils.ts","../src/utils/addressUtils.ts","../src/utils/assetUtils.ts","../src/utils/assets-browser.ts","../src/utils/assets.native.ts","../src/utils/assets.ts","../src/utils/assetsTypes.ts","../src/utils/debug.ts","../src/utils/deviceFeaturesUtils.ts","../src/utils/ethereumUtils.ts","../src/utils/firmwareUtils.ts","../src/utils/formatUtils.ts","../src/utils/hdnodeUtils.ts","../src/utils/interactionTimeout.ts","../src/utils/pathUtils.ts","../src/utils/popupPromiseManager.ts","../src/utils/proxy-event-emitter.ts","../src/utils/uiPromiseManager.ts","../src/utils/urlUtils.ts","../src/utils/versionCheck.ts","../src/workers/workers-browser.ts","../src/workers/workers.native.ts","../src/workers/workers.ts"],"version":"5.8.2"}

package/lib/types/api/getPublicKey.d.ts

@@ -18,18 +18,20 @@ export declare const GetPublicKey: import("@trezor/schema-utils").TIntersect<[im
     }>>;
 }>]>;
 export type HDNodeResponse = Static<typeof HDNodeResponse>;
-export declare const HDNodeResponse: import("@trezor/schema-utils").TObject<{
+export declare const HDNodeResponse: import("@trezor/schema-utils").TIntersect<[import("@trezor/schema-utils").TObject<{
+    publicKey: import("@trezor/schema-utils").TString;
     path: import("@trezor/schema-utils").TArray<import("@trezor/schema-utils").TNumber>;
     serializedPath: import("@trezor/schema-utils").TString;
+}>, import("@trezor/schema-utils").TObject<{
     childNum: import("@trezor/schema-utils").TNumber;
     xpub: import("@trezor/schema-utils").TString;
     xpubSegwit: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TString>;
     descriptorChecksum: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TString>;
     chainCode: import("@trezor/schema-utils").TString;
-    publicKey: import("@trezor/schema-utils").TString;
     fingerprint: import("@trezor/schema-utils").TNumber;
     depth: import("@trezor/schema-utils").TNumber;
-}>;
+    descriptor: import("@trezor/schema-utils").TOptional<import("@trezor/schema-utils").TString>;
+}>]>;
 export declare function getPublicKey(params: Params<GetPublicKey>): Response<HDNodeResponse>;
 export declare function getPublicKey(params: BundledParams<GetPublicKey>): Response<HDNodeResponse[]>;
 //# sourceMappingURL=getPublicKey.d.ts.map

package/lib/types/api/getPublicKey.js

@@ -18,16 +18,17 @@ exports.GetPublicKey = schema_utils_1.Type.Intersect([
         unlockPath: schema_utils_1.Type.Optional(constants_1.PROTO.UnlockPath),
     }),
 ]);
-exports.HDNodeResponse = schema_utils_1.Type.Object({
-    path: schema_utils_1.Type.Array(schema_utils_1.Type.Number()),
-    serializedPath: schema_utils_1.Type.String(),
-    childNum: schema_utils_1.Type.Number(),
-    xpub: schema_utils_1.Type.String(),
-    xpubSegwit: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),
-    descriptorChecksum: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),
-    chainCode: schema_utils_1.Type.String(),
-    publicKey: schema_utils_1.Type.String(),
-    fingerprint: schema_utils_1.Type.Number(),
-    depth: schema_utils_1.Type.Number(),
-});
+exports.HDNodeResponse = schema_utils_1.Type.Intersect([
+    params_1.PublicKey,
+    schema_utils_1.Type.Object({
+        childNum: schema_utils_1.Type.Number(),
+        xpub: schema_utils_1.Type.String(),
+        xpubSegwit: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),
+        descriptorChecksum: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),
+        chainCode: schema_utils_1.Type.String(),
+        fingerprint: schema_utils_1.Type.Number(),
+        depth: schema_utils_1.Type.Number(),
+        descriptor: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),
+    }),
+]);
 //# sourceMappingURL=getPublicKey.js.map