@trezor/connect 9.0.2 → 9.0.3

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.0.2
+API version 9.0.3
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/connect-test.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/connect-test.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)
@@ -8,7 +8,7 @@ API version 9.0.2
 
 Trezor Connect is a platform for easy integration of Trezor into 3rd party services, as well as into Trezor Suite. It provides an API with functionality to access public keys, sign transactions and authenticate users.
 
-This package is intended to be used in node.js environment. If you wan't to build a web application please refer to [@trezor/connect-web package](../connect-web/README.md).
+This package is intended to be used in node.js environment. If you wan't to build a web application please refer to [@trezor/connect-web package](https://github.com/trezor/trezor-suite/blob/develop/packages/connect-web/README.md).
 
 ## Installation
 
@@ -32,7 +32,7 @@ ES6
 import TrezorConnect from '@trezor/connect';
 ```
 
-For more instructions [refer to this document](../../docs/packages/connect/index.md)
+For more instructions [refer to this document](https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/index.md)
 
 ## Version 9 (stable)
 
@@ -61,11 +61,11 @@ For deployment process of trezor-connect v8 refer to [trezor/connect repository]
 
 Interactive API explorer is available on https://connect.trezor.io/9/#/
 
-Documentation is available [docs/packages/connect](../../docs/packages/connect/index.md)
+Documentation is available [docs/packages/connect](https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/index.md)
 
 ## Examples
 
-A collection of examples on how to implement @trezor/connect in various environments is available in [packages/connect-examples](../connect-examples/README.md)
+A collection of examples on how to implement @trezor/connect in various environments is available in [packages/connect-examples](https://github.com/trezor/trezor-suite/tree/develop/packages/connect-examples)
 
 ## Tests
 

package/lib/api/bitcoin/TransactionComposer.js

@@ -28,11 +28,12 @@ class TransactionComposer {
             if (!u.required && new bignumber_js_1.default(u.amount).lte(this.coinInfo.dustLimit))
                 return [];
             const addressPath = (0, pathUtils_1.getHDPath)(u.path);
+            const [chain, index] = addressPath.slice(addressPath.length - 2);
             return {
                 index: u.vout,
                 transactionHash: u.txid,
                 value: u.amount,
-                addressPath: [addressPath[3], addressPath[4]],
+                addressPath: [chain, index],
                 height: u.blockHeight,
                 tsize: 0,
                 vsize: 0,

package/lib/api/bitcoin/outputs.js

@@ -22,10 +22,8 @@ const validateTrezorOutputs = (outputs, coinInfo) => {
             Object.prototype.hasOwnProperty.call(output, 'address')) {
             throw constants_1.ERRORS.TypedError('Method_InvalidParameter', 'Cannot use address and address_n in one output');
         }
-        if (output.address_n) {
-            const scriptType = (0, pathUtils_1.getOutputScriptType)(output.address_n);
-            if (output.script_type !== scriptType)
-                throw constants_1.ERRORS.TypedError('Method_InvalidParameter', `Output change script_type should be set to ${scriptType}`);
+        if (output.address_n && !output.script_type) {
+            output.script_type = (0, pathUtils_1.getOutputScriptType)(output.address_n);
         }
         if ('address' in output &&
             typeof output.address === 'string' &&

package/lib/api/bitcoin/signtxVerify.d.ts

@@ -1,8 +1,8 @@
 import { PROTO } from '../../constants';
 import type { BitcoinNetworkInfo } from '../../types';
-import type { HDNodeResponse } from '../../types/api/getPublicKey';
-declare type GetHDNode = (path: number[], coinInfo?: BitcoinNetworkInfo, validation?: boolean) => Promise<HDNodeResponse>;
-export declare const verifyTx: (getHDNode: GetHDNode, inputs: PROTO.TxInputType[], outputs: PROTO.TxOutputType[], serializedTx: string, coinInfo: BitcoinNetworkInfo) => Promise<import("packages/utxo-lib/lib/transaction/base").TransactionBase<undefined> | import("packages/utxo-lib/lib/transaction/base").TransactionBase<import("packages/utxo-lib/lib/transaction/dash").DashSpecific> | import("packages/utxo-lib/lib/transaction/base").TransactionBase<import("packages/utxo-lib/lib/transaction/zcash").ZcashSpecific>>;
+import type { DeviceCommands } from '../../device/DeviceCommands';
+declare type GetHDNode = DeviceCommands['getHDNode'];
+export declare const verifyTx: (getHDNode: GetHDNode, inputs: PROTO.TxInputType[], outputs: PROTO.TxOutputType[], serializedTx: string, coinInfo: BitcoinNetworkInfo, unlockPath?: PROTO.UnlockPath) => Promise<import("packages/utxo-lib/lib/transaction/base").TransactionBase<undefined> | import("packages/utxo-lib/lib/transaction/base").TransactionBase<import("packages/utxo-lib/lib/transaction/dash").DashSpecific> | import("packages/utxo-lib/lib/transaction/base").TransactionBase<import("packages/utxo-lib/lib/transaction/zcash").ZcashSpecific>>;
 export declare const verifyTicketTx: (getHDNode: GetHDNode, inputs: PROTO.TxInputType[], outputs: PROTO.TxOutputType[], serializedTx: string, coinInfo: BitcoinNetworkInfo) => Promise<void>;
 export {};
 //# sourceMappingURL=signtxVerify.d.ts.map

package/lib/api/bitcoin/signtxVerify.js

@@ -3,17 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyTicketTx = exports.verifyTx = void 0;
 const utxo_lib_1 = require("@trezor/utxo-lib");
 const constants_1 = require("../../constants");
-const pathUtils_1 = require("../../utils/pathUtils");
-const derivePubKeyHash = async (address_n, getHDNode, coinInfo) => {
+const derivePubKeyHash = async (address_n, getHDNode, coinInfo, unlockPath) => {
     if (address_n.length === 5) {
-        const response = await getHDNode(address_n.slice(0, 4), coinInfo);
+        const response = await getHDNode({ address_n: address_n.slice(0, 4) }, { coinInfo, unlockPath });
         const node = utxo_lib_1.bip32.fromBase58(response.xpub, coinInfo.network);
         return node.derive(address_n[address_n.length - 1]);
     }
-    const response = await getHDNode(address_n, coinInfo);
+    const response = await getHDNode({ address_n }, { coinInfo, unlockPath });
     return utxo_lib_1.bip32.fromBase58(response.xpub, coinInfo.network);
 };
-const deriveOutputScript = async (getHDNode, output, coinInfo) => {
+const deriveOutputScript = async (getHDNode, output, coinInfo, unlockPath) => {
     if ('multisig' in output)
         return;
     if ('op_return_data' in output) {
@@ -26,32 +25,34 @@ const deriveOutputScript = async (getHDNode, output, coinInfo) => {
     if (!output.address_n) {
         throw constants_1.ERRORS.TypedError('Runtime', 'deriveOutputScript: Neither address or address_n is set');
     }
-    const scriptType = (0, pathUtils_1.getOutputScriptType)(output.address_n);
-    const node = await derivePubKeyHash(output.address_n, getHDNode, coinInfo);
+    const node = await derivePubKeyHash(output.address_n, getHDNode, coinInfo, unlockPath);
     const payment = { hash: node.identifier, network: coinInfo.network };
-    if (scriptType === 'PAYTOADDRESS') {
+    if (output.script_type === 'PAYTOADDRESS') {
         return utxo_lib_1.payments.p2pkh(payment).output;
     }
-    if (scriptType === 'PAYTOSCRIPTHASH') {
+    if (output.script_type === 'PAYTOSCRIPTHASH') {
         return utxo_lib_1.payments.p2sh(payment).output;
     }
-    if (scriptType === 'PAYTOP2SHWITNESS') {
+    if (output.script_type === 'PAYTOP2SHWITNESS') {
         return utxo_lib_1.payments.p2sh({
             redeem: utxo_lib_1.payments.p2wpkh(payment),
         }).output;
     }
-    if (scriptType === 'PAYTOWITNESS') {
+    if (output.script_type === 'PAYTOWITNESS') {
         return utxo_lib_1.payments.p2wpkh(payment).output;
     }
-    if (scriptType === 'PAYTOTAPROOT') {
+    if (output.script_type === 'PAYTOTAPROOT') {
         return utxo_lib_1.payments.p2tr({
             pubkey: node.publicKey,
             network: coinInfo.network,
         }).output;
     }
-    throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: Unknown script type ${scriptType}`);
+    if (output.script_type === 'PAYTOMULTISIG') {
+        throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: script_type PAYTOMULTISIG not expected without multisig defined`);
+    }
+    throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: Unknown script type ${output.script_type}`);
 };
-const verifyTx = async (getHDNode, inputs, outputs, serializedTx, coinInfo) => {
+const verifyTx = async (getHDNode, inputs, outputs, serializedTx, coinInfo, unlockPath) => {
     const bitcoinTx = utxo_lib_1.Transaction.fromHex(serializedTx, { network: coinInfo.network });
     if (inputs.length !== bitcoinTx.ins.length) {
         throw constants_1.ERRORS.TypedError('Runtime', 'verifyTx: Signed transaction inputs invalid length');
@@ -67,7 +68,7 @@ const verifyTx = async (getHDNode, inputs, outputs, serializedTx, coinInfo) => {
                 throw constants_1.ERRORS.TypedError('Runtime', `verifyTx: Wrong output amount at output ${i}. Requested: ${amount}, signed: ${bitcoinTx.outs[i].value}`);
             }
         }
-        const scriptA = await deriveOutputScript(getHDNode, outputs[i], coinInfo);
+        const scriptA = await deriveOutputScript(getHDNode, outputs[i], coinInfo, unlockPath);
         if (scriptA && scriptA.compare(scriptB) !== 0) {
             throw constants_1.ERRORS.TypedError('Runtime', `verifyTx: Output ${i} scripts differ`);
         }

package/lib/api/getAddress.d.ts

@@ -4,6 +4,7 @@ import type { BitcoinNetworkInfo } from '../types';
 declare type Params = PROTO.GetAddress & {
     address?: string;
     coinInfo: BitcoinNetworkInfo;
+    unlockPath?: PROTO.UnlockPath;
 };
 export default class GetAddress extends AbstractMethod<'getAddress', Params[]> {
     hasBundle?: boolean;
@@ -17,7 +18,7 @@ export default class GetAddress extends AbstractMethod<'getAddress', Params[]> {
     } | undefined;
     confirmation(): Promise<boolean>;
     noBackupConfirmation(): Promise<boolean>;
-    _call({ address_n, show_display, multisig, script_type, coinInfo }: Params): Promise<{
+    _call({ address_n, show_display, multisig, script_type, coinInfo, unlockPath }: Params): Promise<{
         path: number[];
         serializedPath: string;
         address: string;

package/lib/api/getAddress.js

@@ -29,7 +29,14 @@ class GetAddress extends AbstractMethod_1.AbstractMethod {
                 { name: 'showOnTrezor', type: 'boolean' },
                 { name: 'multisig', type: 'object' },
                 { name: 'scriptType', type: 'string' },
+                { name: 'unlockPath', type: 'object' },
             ]);
+            if (batch.unlockPath) {
+                (0, paramsValidator_1.validateParams)(batch.unlockPath, [
+                    { name: 'address_n', required: true, type: 'array' },
+                    { name: 'mac', required: true, type: 'string' },
+                ]);
+            }
             const path = (0, pathUtils_1.validatePath)(batch.path, 1);
             let coinInfo;
             if (batch.coin) {
@@ -55,6 +62,7 @@ class GetAddress extends AbstractMethod_1.AbstractMethod {
                 multisig: batch.multisig,
                 script_type: batch.scriptType,
                 coinInfo,
+                unlockPath: batch.unlockPath,
             };
         });
         const useEventListener = payload.useEventListener &&
@@ -108,8 +116,11 @@ class GetAddress extends AbstractMethod_1.AbstractMethod {
         const uiResp = await uiPromise.promise;
         return uiResp.payload;
     }
-    _call({ address_n, show_display, multisig, script_type, coinInfo }) {
+    async _call({ address_n, show_display, multisig, script_type, coinInfo, unlockPath }) {
         const cmd = this.device.getCommands();
+        if (unlockPath) {
+            await cmd.unlockPath(unlockPath);
+        }
         return cmd.getAddress({
             address_n,
             show_display,

package/lib/api/getPublicKey.d.ts

@@ -3,6 +3,7 @@ import type { BitcoinNetworkInfo } from '../types';
 import type { PROTO } from '../constants';
 declare type Params = PROTO.GetPublicKey & {
     coinInfo?: BitcoinNetworkInfo;
+    unlockPath?: PROTO.UnlockPath;
 };
 export default class GetPublicKey extends AbstractMethod<'getPublicKey', Params[]> {
     hasBundle?: boolean;

package/lib/api/getPublicKey.js

@@ -21,25 +21,40 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
                 { name: 'coin', type: 'string' },
                 { name: 'crossChain', type: 'boolean' },
                 { name: 'showOnTrezor', type: 'boolean' },
+                { name: 'scriptType', type: ['string', 'number'] },
+                { name: 'ignoreXpubMagic', type: 'boolean' },
+                { name: 'ecdsaCurveName', type: 'boolean' },
+                { name: 'unlockPath', type: 'object' },
             ]);
+            if (batch.unlockPath) {
+                (0, paramsValidator_1.validateParams)(batch.unlockPath, [
+                    { name: 'address_n', required: true, type: 'array' },
+                    { name: 'mac', required: true, type: 'string' },
+                ]);
+            }
             let coinInfo;
             if (batch.coin) {
                 coinInfo = (0, coinInfo_1.getBitcoinNetwork)(batch.coin);
             }
-            const path = (0, pathUtils_1.validatePath)(batch.path, coinInfo ? 3 : 0);
+            const address_n = (0, pathUtils_1.validatePath)(batch.path, coinInfo ? 3 : 0);
             if (coinInfo && !batch.crossChain) {
-                (0, paramsValidator_1.validateCoinPath)(path, coinInfo);
+                (0, paramsValidator_1.validateCoinPath)(address_n, coinInfo);
             }
             else if (!coinInfo) {
-                coinInfo = (0, coinInfo_1.getBitcoinNetwork)(path);
+                coinInfo = (0, coinInfo_1.getBitcoinNetwork)(address_n);
             }
             if (coinInfo) {
                 this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, coinInfo, this.firmwareRange);
             }
             return {
-                address_n: path,
+                address_n,
+                coin_name: coinInfo === null || coinInfo === void 0 ? void 0 : coinInfo.name,
+                show_display: batch.showOnTrezor,
+                script_type: batch.scriptType,
+                ignore_xpub_magic: batch.ignoreXpubMagic,
+                ecdsa_curve_name: batch.ecdsaCurveName,
                 coinInfo,
-                show_display: typeof batch.showOnTrezor === 'boolean' ? batch.showOnTrezor : false,
+                unlockPath: batch.unlockPath,
             };
         });
     }
@@ -67,8 +82,8 @@ class GetPublicKey extends AbstractMethod_1.AbstractMethod {
         const responses = [];
         const cmd = this.device.getCommands();
         for (let i = 0; i < this.params.length; i++) {
-            const batch = this.params[i];
-            const response = await cmd.getHDNode(batch.address_n, batch.coinInfo, true, batch.show_display);
+            const { coinInfo, unlockPath, ...batch } = this.params[i];
+            const response = await cmd.getHDNode(batch, { coinInfo, unlockPath });
             responses.push(response);
             if (this.hasBundle) {
                 this.postMessage((0, events_1.createUiMessage)(events_1.UI.BUNDLE_PROGRESS, {

package/lib/api/index.d.ts

@@ -59,6 +59,7 @@ export { default as stellarSignTransaction } from './stellarSignTransaction';
 export { default as tezosGetAddress } from './tezosGetAddress';
 export { default as tezosGetPublicKey } from './tezosGetPublicKey';
 export { default as tezosSignTransaction } from './tezosSignTransaction';
+export { default as unlockPath } from './unlockPath';
 export { default as verifyMessage } from './verifyMessage';
 export { default as wipeDevice } from './wipeDevice';
 export { default as checkFirmwareAuthenticity } from './checkFirmwareAuthenticity';

package/lib/api/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestLogin = exports.recoveryDevice = exports.rebootToBootloader = exports.pushTransaction = exports.nemSignTransaction = exports.nemGetAddress = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.firmwareUpdate = exports.ethereumVerifyMessage = exports.ethereumSignTypedData = exports.ethereumSignTransaction = exports.ethereumSignMessage = exports.ethereumGetPublicKey = exports.ethereumGetAddress = exports.eosSignTransaction = exports.eosGetPublicKey = exports.composeTransaction = exports.cipherKeyValue = exports.changePin = exports.cardanoSignTransaction = exports.cardanoGetPublicKey = exports.cardanoGetNativeScriptHash = exports.cardanoGetAddress = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.binanceSignTransaction = exports.binanceGetPublicKey = exports.binanceGetAddress = exports.backupDevice = exports.authorizeCoinJoin = exports.applySettings = exports.applyFlags = void 0;
-exports.checkFirmwareAuthenticity = exports.wipeDevice = exports.verifyMessage = exports.tezosSignTransaction = exports.tezosGetPublicKey = exports.tezosGetAddress = exports.stellarSignTransaction = exports.stellarGetAddress = exports.signTransaction = exports.signMessage = exports.setProxy = exports.rippleSignTransaction = exports.rippleGetAddress = exports.resetDevice = void 0;
+exports.checkFirmwareAuthenticity = exports.wipeDevice = exports.verifyMessage = exports.unlockPath = exports.tezosSignTransaction = exports.tezosGetPublicKey = exports.tezosGetAddress = exports.stellarSignTransaction = exports.stellarGetAddress = exports.signTransaction = exports.signMessage = exports.setProxy = exports.rippleSignTransaction = exports.rippleGetAddress = exports.resetDevice = void 0;
 var applyFlags_1 = require("./applyFlags");
 Object.defineProperty(exports, "applyFlags", { enumerable: true, get: function () { return __importDefault(applyFlags_1).default; } });
 var applySettings_1 = require("./applySettings");
@@ -127,6 +127,8 @@ var tezosGetPublicKey_1 = require("./tezosGetPublicKey");
 Object.defineProperty(exports, "tezosGetPublicKey", { enumerable: true, get: function () { return __importDefault(tezosGetPublicKey_1).default; } });
 var tezosSignTransaction_1 = require("./tezosSignTransaction");
 Object.defineProperty(exports, "tezosSignTransaction", { enumerable: true, get: function () { return __importDefault(tezosSignTransaction_1).default; } });
+var unlockPath_1 = require("./unlockPath");
+Object.defineProperty(exports, "unlockPath", { enumerable: true, get: function () { return __importDefault(unlockPath_1).default; } });
 var verifyMessage_1 = require("./verifyMessage");
 Object.defineProperty(exports, "verifyMessage", { enumerable: true, get: function () { return __importDefault(verifyMessage_1).default; } });
 var wipeDevice_1 = require("./wipeDevice");

package/lib/api/signTransaction.d.ts

@@ -12,6 +12,7 @@ declare type Params = {
     coinInfo: BitcoinNetworkInfo;
     push: boolean;
     preauthorized?: boolean;
+    unlockPath?: PROTO.UnlockPath;
 };
 export default class SignTransaction extends AbstractMethod<'signTransaction', Params> {
     init(): void;

package/lib/api/signTransaction.js

@@ -32,7 +32,14 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
             { name: 'push', type: 'boolean' },
             { name: 'preauthorized', type: 'boolean' },
             { name: 'amountUnit', type: ['number', 'string'] },
+            { name: 'unlockPath', type: 'object' },
         ]);
+        if (payload.unlockPath) {
+            (0, paramsValidator_1.validateParams)(payload.unlockPath, [
+                { name: 'address_n', required: true, type: 'array' },
+                { name: 'mac', required: true, type: 'string' },
+            ]);
+        }
         const coinInfo = (0, coinInfo_1.getBitcoinNetwork)(payload.coin);
         if (!coinInfo) {
             throw constants_1.ERRORS.TypedError('Method_UnknownCoin');
@@ -70,6 +77,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
             coinInfo,
             push: typeof payload.push === 'boolean' ? payload.push : false,
             preauthorized: payload.preauthorized,
+            unlockPath: payload.unlockPath,
         };
         this.params.options = (0, bitcoin_1.enhanceSignTx)(this.params.options, coinInfo);
     }
@@ -95,9 +103,10 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
                         if (!accountPath || !accountPath.address_n) {
                             throw constants_1.ERRORS.TypedError('Runtime', 'Account not found');
                         }
+                        const address_n = accountPath.address_n.slice(0, 3);
                         const node = await device
                             .getCommands()
-                            .getHDNode(accountPath.address_n.slice(0, 3), params.coinInfo);
+                            .getHDNode({ address_n }, { coinInfo: params.coinInfo });
                         const account = await blockchain.getAccountInfo({
                             descriptor: node.xpubSegwit || node.xpub,
                             details: 'tokens',
@@ -115,6 +124,9 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
         if (params.preauthorized) {
             await device.getCommands().typedCall('DoPreauthorized', 'PreauthorizedRequest', {});
         }
+        else if (params.unlockPath) {
+            await device.getCommands().unlockPath(params.unlockPath);
+        }
         const signTxMethod = !useLegacySignProcess ? bitcoin_1.signTx : bitcoin_1.signTxLegacy;
         const response = await signTxMethod({
             ...params,
@@ -125,7 +137,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
             await (0, bitcoin_1.verifyTicketTx)(device.getCommands().getHDNode.bind(device.getCommands()), params.inputs, params.outputs, response.serializedTx, params.coinInfo);
         }
         else {
-            const bitcoinTx = await (0, bitcoin_1.verifyTx)(device.getCommands().getHDNode.bind(device.getCommands()), params.inputs, params.outputs, response.serializedTx, params.coinInfo);
+            const bitcoinTx = await (0, bitcoin_1.verifyTx)(device.getCommands().getHDNode.bind(device.getCommands()), params.inputs, params.outputs, response.serializedTx, params.coinInfo, params.unlockPath);
             if (bitcoinTx.hasWitnesses()) {
                 response.witnesses = bitcoinTx.ins.map((_, i) => { var _a; return (_a = bitcoinTx.getWitness(i)) === null || _a === void 0 ? void 0 : _a.toString('hex'); });
             }

package/lib/api/unlockPath.d.ts

@@ -0,0 +1,10 @@
+import { AbstractMethod } from '../core/AbstractMethod';
+import { PROTO } from '../constants';
+export default class UnlockPath extends AbstractMethod<'unlockPath', PROTO.UnlockPath> {
+    init(): void;
+    run(): Promise<{
+        address_n: number[];
+        mac: string | undefined;
+    }>;
+}
+//# sourceMappingURL=unlockPath.d.ts.map

package/lib/api/unlockPath.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AbstractMethod_1 = require("../core/AbstractMethod");
+const pathUtils_1 = require("../utils/pathUtils");
+const paramsValidator_1 = require("./common/paramsValidator");
+class UnlockPath extends AbstractMethod_1.AbstractMethod {
+    init() {
+        this.requiredPermissions = ['read'];
+        this.skipFinalReload = true;
+        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, {
+            1: { min: '0', max: '0' },
+            2: { min: '2.5.3', max: '0' },
+        });
+        const { payload } = this;
+        (0, paramsValidator_1.validateParams)(payload, [
+            { name: 'path', required: true },
+            { name: 'mac', type: 'string' },
+        ]);
+        const path = (0, pathUtils_1.validatePath)(payload.path, 1);
+        this.params = {
+            address_n: path,
+            mac: payload.mac,
+        };
+    }
+    async run() {
+        const cmd = this.device.getCommands();
+        const { message } = await cmd.unlockPath(this.params);
+        return {
+            address_n: this.params.address_n,
+            mac: message.mac,
+        };
+    }
+}
+exports.default = UnlockPath;
+//# sourceMappingURL=unlockPath.js.map

package/lib/core/index.d.ts

@@ -7,7 +7,7 @@ export declare const onCall: (message: CoreMessage) => Promise<void>;
 export declare class Core extends EventEmitter {
     handleMessage(message: any, isTrustedOrigin: boolean): void;
     dispose(): void;
-    getCurrentMethod(): (import("../api").applyFlags | import("../api").applySettings | import("../api").authorizeCoinJoin | import("../api").backupDevice | import("../api").binanceGetAddress | import("../api").binanceGetPublicKey | import("../api").binanceSignTransaction | import("../api").blockchainDisconnect | import("../api").blockchainEstimateFee | import("../api").blockchainGetAccountBalanceHistory | import("../api").blockchainGetCurrentFiatRates | import("../api").blockchainGetFiatRatesForTimestamps | import("../api").blockchainGetTransactions | import("../api").blockchainSetCustomBackend | import("../api").blockchainSubscribe | import("../api").blockchainSubscribeFiatRates | import("../api").blockchainUnsubscribe | import("../api").blockchainUnsubscribeFiatRates | import("../api").cardanoGetAddress | import("../api").cardanoGetNativeScriptHash | import("../api").cardanoGetPublicKey | import("../api").cardanoSignTransaction | import("../api").changePin | import("../api").cipherKeyValue | import("../api").composeTransaction | import("../api").eosGetPublicKey | import("../api").eosSignTransaction | import("../api").ethereumGetAddress | import("../api").ethereumGetPublicKey | import("../api").ethereumSignMessage | import("../api").ethereumSignTransaction | import("../api").ethereumSignTypedData | import("../api").ethereumVerifyMessage | import("../api").firmwareUpdate | import("../api").getAccountInfo | import("../api").getAddress | import("../api").getCoinInfo | import("../api").getDeviceState | import("../api").getFeatures | import("../api").getFirmwareHash | import("../api").getOwnershipId | import("../api").getOwnershipProof | import("../api").getPublicKey | import("../api").getSettings | import("../api").nemGetAddress | import("../api").nemSignTransaction | import("../api").pushTransaction | import("../api").rebootToBootloader | import("../api").recoveryDevice | import("../api").requestLogin | import("../api").resetDevice | import("../api").rippleGetAddress | import("../api").rippleSignTransaction | import("../api").setProxy | import("../api").signMessage | import("../api").signTransaction | import("../api").stellarGetAddress | import("../api").stellarSignTransaction | import("../api").tezosGetAddress | import("../api").tezosGetPublicKey | import("../api").tezosSignTransaction | import("../api").verifyMessage | import("../api").wipeDevice | import("../api").checkFirmwareAuthenticity)[];
+    getCurrentMethod(): (import("../api").applyFlags | import("../api").applySettings | import("../api").authorizeCoinJoin | import("../api").backupDevice | import("../api").binanceGetAddress | import("../api").binanceGetPublicKey | import("../api").binanceSignTransaction | import("../api").blockchainDisconnect | import("../api").blockchainEstimateFee | import("../api").blockchainGetAccountBalanceHistory | import("../api").blockchainGetCurrentFiatRates | import("../api").blockchainGetFiatRatesForTimestamps | import("../api").blockchainGetTransactions | import("../api").blockchainSetCustomBackend | import("../api").blockchainSubscribe | import("../api").blockchainSubscribeFiatRates | import("../api").blockchainUnsubscribe | import("../api").blockchainUnsubscribeFiatRates | import("../api").cardanoGetAddress | import("../api").cardanoGetNativeScriptHash | import("../api").cardanoGetPublicKey | import("../api").cardanoSignTransaction | import("../api").changePin | import("../api").cipherKeyValue | import("../api").composeTransaction | import("../api").eosGetPublicKey | import("../api").eosSignTransaction | import("../api").ethereumGetAddress | import("../api").ethereumGetPublicKey | import("../api").ethereumSignMessage | import("../api").ethereumSignTransaction | import("../api").ethereumSignTypedData | import("../api").ethereumVerifyMessage | import("../api").firmwareUpdate | import("../api").getAccountInfo | import("../api").getAddress | import("../api").getCoinInfo | import("../api").getDeviceState | import("../api").getFeatures | import("../api").getFirmwareHash | import("../api").getOwnershipId | import("../api").getOwnershipProof | import("../api").getPublicKey | import("../api").getSettings | import("../api").nemGetAddress | import("../api").nemSignTransaction | import("../api").pushTransaction | import("../api").rebootToBootloader | import("../api").recoveryDevice | import("../api").requestLogin | import("../api").resetDevice | import("../api").rippleGetAddress | import("../api").rippleSignTransaction | import("../api").setProxy | import("../api").signMessage | import("../api").signTransaction | import("../api").stellarGetAddress | import("../api").stellarSignTransaction | import("../api").tezosGetAddress | import("../api").tezosGetPublicKey | import("../api").tezosSignTransaction | import("../api").unlockPath | import("../api").verifyMessage | import("../api").wipeDevice | import("../api").checkFirmwareAuthenticity)[];
     getTransportInfo(): TransportInfo;
 }
 export declare const initCore: () => Core;

package/lib/core/method.d.ts

@@ -2,5 +2,5 @@ import * as Methods from '../api';
 import type { IFrameCallMessage } from '../events';
 export declare const getMethod: (message: IFrameCallMessage & {
     id?: number;
-}) => Methods.applyFlags | Methods.applySettings | Methods.authorizeCoinJoin | Methods.backupDevice | Methods.binanceGetAddress | Methods.binanceGetPublicKey | Methods.binanceSignTransaction | Methods.blockchainDisconnect | Methods.blockchainEstimateFee | Methods.blockchainGetAccountBalanceHistory | Methods.blockchainGetCurrentFiatRates | Methods.blockchainGetFiatRatesForTimestamps | Methods.blockchainGetTransactions | Methods.blockchainSetCustomBackend | Methods.blockchainSubscribe | Methods.blockchainSubscribeFiatRates | Methods.blockchainUnsubscribe | Methods.blockchainUnsubscribeFiatRates | Methods.cardanoGetAddress | Methods.cardanoGetNativeScriptHash | Methods.cardanoGetPublicKey | Methods.cardanoSignTransaction | Methods.changePin | Methods.cipherKeyValue | Methods.composeTransaction | Methods.eosGetPublicKey | Methods.eosSignTransaction | Methods.ethereumGetAddress | Methods.ethereumGetPublicKey | Methods.ethereumSignMessage | Methods.ethereumSignTransaction | Methods.ethereumSignTypedData | Methods.ethereumVerifyMessage | Methods.firmwareUpdate | Methods.getAccountInfo | Methods.getAddress | Methods.getCoinInfo | Methods.getDeviceState | Methods.getFeatures | Methods.getFirmwareHash | Methods.getOwnershipId | Methods.getOwnershipProof | Methods.getPublicKey | Methods.getSettings | Methods.nemGetAddress | Methods.nemSignTransaction | Methods.pushTransaction | Methods.rebootToBootloader | Methods.recoveryDevice | Methods.requestLogin | Methods.resetDevice | Methods.rippleGetAddress | Methods.rippleSignTransaction | Methods.setProxy | Methods.signMessage | Methods.signTransaction | Methods.stellarGetAddress | Methods.stellarSignTransaction | Methods.tezosGetAddress | Methods.tezosGetPublicKey | Methods.tezosSignTransaction | Methods.verifyMessage | Methods.wipeDevice | Methods.checkFirmwareAuthenticity;
+}) => Methods.applyFlags | Methods.applySettings | Methods.authorizeCoinJoin | Methods.backupDevice | Methods.binanceGetAddress | Methods.binanceGetPublicKey | Methods.binanceSignTransaction | Methods.blockchainDisconnect | Methods.blockchainEstimateFee | Methods.blockchainGetAccountBalanceHistory | Methods.blockchainGetCurrentFiatRates | Methods.blockchainGetFiatRatesForTimestamps | Methods.blockchainGetTransactions | Methods.blockchainSetCustomBackend | Methods.blockchainSubscribe | Methods.blockchainSubscribeFiatRates | Methods.blockchainUnsubscribe | Methods.blockchainUnsubscribeFiatRates | Methods.cardanoGetAddress | Methods.cardanoGetNativeScriptHash | Methods.cardanoGetPublicKey | Methods.cardanoSignTransaction | Methods.changePin | Methods.cipherKeyValue | Methods.composeTransaction | Methods.eosGetPublicKey | Methods.eosSignTransaction | Methods.ethereumGetAddress | Methods.ethereumGetPublicKey | Methods.ethereumSignMessage | Methods.ethereumSignTransaction | Methods.ethereumSignTypedData | Methods.ethereumVerifyMessage | Methods.firmwareUpdate | Methods.getAccountInfo | Methods.getAddress | Methods.getCoinInfo | Methods.getDeviceState | Methods.getFeatures | Methods.getFirmwareHash | Methods.getOwnershipId | Methods.getOwnershipProof | Methods.getPublicKey | Methods.getSettings | Methods.nemGetAddress | Methods.nemSignTransaction | Methods.pushTransaction | Methods.rebootToBootloader | Methods.recoveryDevice | Methods.requestLogin | Methods.resetDevice | Methods.rippleGetAddress | Methods.rippleSignTransaction | Methods.setProxy | Methods.signMessage | Methods.signTransaction | Methods.stellarGetAddress | Methods.stellarSignTransaction | Methods.tezosGetAddress | Methods.tezosGetPublicKey | Methods.tezosSignTransaction | Methods.unlockPath | Methods.verifyMessage | Methods.wipeDevice | Methods.checkFirmwareAuthenticity;
 //# sourceMappingURL=method.d.ts.map

package/lib/data/config.js

@@ -186,7 +186,7 @@ exports.config = {
         {
             capabilities: ['coinjoin'],
             methods: ['authorizeCoinJoin', 'getOwnershipId', 'getOwnershipProof'],
-            min: ['0', '2.4.4'],
+            min: ['0', '2.5.3'],
         },
     ],
 };

package/lib/data/version.d.ts

@@ -1,3 +1,3 @@
-export declare const VERSION = "9.0.2";
+export declare const VERSION = "9.0.3";
 export declare const DEFAULT_DOMAIN: string;
 //# sourceMappingURL=version.d.ts.map

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.0.2';
+exports.VERSION = '9.0.3';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 exports.DEFAULT_DOMAIN = `https://connect.trezor.io/${versionN[0]}/`;
 //# sourceMappingURL=version.js.map

package/lib/device/DeviceCommands.d.ts

@@ -27,8 +27,13 @@ export declare class DeviceCommands {
     constructor(device: Device, transport: Transport, sessionId: string);
     dispose(): void;
     isDisposed(): boolean;
-    getPublicKey(address_n: number[], coin_name?: string, script_type?: Messages.InputScriptType, show_display?: boolean): Promise<Messages.PublicKey>;
-    getHDNode(path: number[], coinInfo?: BitcoinNetworkInfo, validation?: boolean, showOnTrezor?: boolean): Promise<HDNodeResponse>;
+    unlockPath(params?: Messages.UnlockPath): Promise<TypedResponseMessage<"UnlockedPathRequest">>;
+    getPublicKey(params: Messages.GetPublicKey, unlockPath?: Messages.UnlockPath): Promise<Messages.PublicKey>;
+    getHDNode(params: Messages.GetPublicKey, options?: {
+        coinInfo?: BitcoinNetworkInfo;
+        validation?: boolean;
+        unlockPath?: Messages.UnlockPath;
+    }): Promise<HDNodeResponse>;
     getBitcoinHDNode(path: number[], coinInfo?: BitcoinNetworkInfo, validation?: boolean): Promise<HDNodeResponse>;
     getAddress({ address_n, show_display, multisig, script_type }: Messages.GetAddress, coinInfo: BitcoinNetworkInfo): Promise<{
         path: number[];

package/lib/device/DeviceCommands.js

@@ -47,45 +47,55 @@ class DeviceCommands {
     isDisposed() {
         return this.disposed;
     }
-    async getPublicKey(address_n, coin_name = 'Bitcoin', script_type, show_display) {
+    unlockPath(params) {
+        return this.typedCall('UnlockPath', 'UnlockedPathRequest', params);
+    }
+    async getPublicKey(params, unlockPath) {
+        if (unlockPath) {
+            await this.unlockPath(unlockPath);
+        }
         const response = await this.typedCall('GetPublicKey', 'PublicKey', {
-            address_n,
-            coin_name,
-            script_type,
-            show_display,
+            address_n: params.address_n,
+            coin_name: params.coin_name || 'Bitcoin',
+            script_type: params.script_type,
+            show_display: params.show_display,
+            ignore_xpub_magic: params.ignore_xpub_magic,
+            ecdsa_curve_name: params.ecdsa_curve_name,
         });
         return response.message;
     }
-    async getHDNode(path, coinInfo, validation = true, showOnTrezor = false) {
+    async getHDNode(params, options = {}) {
+        const path = params.address_n;
+        const { coinInfo, unlockPath } = options;
+        const validation = typeof options.validation === 'boolean' ? options.validation : true;
         if (!this.device.atLeast(['1.7.2', '2.0.10']) || !coinInfo) {
             return this.getBitcoinHDNode(path, coinInfo);
         }
-        let network;
-        if ((0, pathUtils_1.isMultisigPath)(path)) {
-            network = coinInfo.network;
+        let network = null;
+        if (!params.script_type) {
+            params.script_type = (0, pathUtils_1.getScriptType)(path);
         }
-        else if ((0, pathUtils_1.isSegwitPath)(path)) {
+        if (params.script_type === 'SPENDP2SHWITNESS') {
             network = (0, coinInfo_1.getSegwitNetwork)(coinInfo);
         }
-        else if ((0, pathUtils_1.isBech32Path)(path)) {
+        else if (params.script_type === 'SPENDWITNESS') {
             network = (0, coinInfo_1.getBech32Network)(coinInfo);
         }
-        let scriptType = (0, pathUtils_1.getScriptType)(path);
         if (!network) {
             network = coinInfo.network;
-            if (scriptType !== 'SPENDADDRESS') {
-                scriptType = undefined;
-            }
+        }
+        if (!params.coin_name) {
+            params.coin_name = coinInfo.name;
         }
         let publicKey;
-        if (showOnTrezor || !validation) {
-            publicKey = await this.getPublicKey(path, coinInfo.name, scriptType, showOnTrezor);
+        if (params.show_display || !validation) {
+            publicKey = await this.getPublicKey(params, unlockPath);
         }
         else {
             const suffix = 0;
             const childPath = path.concat([suffix]);
-            const resKey = await this.getPublicKey(path, coinInfo.name, scriptType);
-            const childKey = await this.getPublicKey(childPath, coinInfo.name, scriptType);
+            const resKey = await this.getPublicKey(params, unlockPath);
+            const childKey = await this.getPublicKey({ ...params, address_n: childPath }, unlockPath);
             publicKey = hdnodeUtils.xpubDerive(resKey, childKey, suffix, network, coinInfo.network);
         }
         const response = {
@@ -103,20 +113,22 @@ class DeviceCommands {
             response.xpub = hdnodeUtils.convertXpub(publicKey.xpub, network, coinInfo.network);
         }
         if ((0, pathUtils_1.isTaprootPath)(path)) {
-            response.xpubSegwit = `tr([5c9e228d/86'/${(0, pathUtils_1.fromHardened)(path[1])}'/${(0, pathUtils_1.fromHardened)(path[2])}']${response.xpub}/<0;1>/*)`;
+            const fingerprint = Number(publicKey.root_fingerprint || 0).toString(16);
+            const descriptorPath = `${fingerprint}${response.serializedPath.substring(1)}`;
+            response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
         }
         return response;
     }
     async getBitcoinHDNode(path, coinInfo, validation = true) {
         let publicKey;
         if (!validation) {
-            publicKey = await this.getPublicKey(path);
+            publicKey = await this.getPublicKey({ address_n: path });
         }
         else {
             const suffix = 0;
             const childPath = path.concat([suffix]);
-            const resKey = await this.getPublicKey(path);
-            const childKey = await this.getPublicKey(childPath);
+            const resKey = await this.getPublicKey({ address_n: path });
+            const childKey = await this.getPublicKey({ address_n: childPath });
             publicKey = hdnodeUtils.xpubDerive(resKey, childKey, suffix);
         }
         const response = {
@@ -183,7 +195,7 @@ class DeviceCommands {
     }
     async ethereumGetPublicKey({ address_n, show_display, }) {
         if (!this.device.atLeast(['1.8.1', '2.1.0'])) {
-            return this.getHDNode(address_n);
+            return this.getHDNode({ address_n });
         }
         const suffix = 0;
         const childPath = address_n.concat([suffix]);
@@ -403,7 +415,7 @@ class DeviceCommands {
             ? indexOrPath
             : (0, accountUtils_1.getAccountAddressN)(coinInfo, indexOrPath);
         if (coinInfo.type === 'bitcoin') {
-            const resp = await this.getHDNode(address_n, coinInfo, false);
+            const resp = await this.getHDNode({ address_n }, { coinInfo, validation: false });
             return {
                 descriptor: resp.xpubSegwit || resp.xpub,
                 legacyXpub: resp.xpub,