@trezor/connect 9.7.3 → 10.0.0-beta.1

package/lib/device/DeviceCommands.d.ts

@@ -1,74 +1,87 @@
-import { MessagesSchema as Messages } from '@trezor/protobuf';
-import type { TypedCallProvider } from '../device/DeviceCurrentSession';
-import type { BitcoinNetworkInfo, CoinInfo } from '../types/coinInfo';
+import type { BitcoinNetworkInfo, CoinInfo } from '@trezor/connect-common/lib/types/coinInfo';
+import type { MessagesSchema as Messages } from '@trezor/protobuf';
+import type { TypedCallProvider } from "../types/typed-call-provider.js";
 type TypedCall = Messages.TypedCall;
 export type { TypedCall };
 export type AccountDescriptor = {
-    descriptor: string;
-    legacyXpub?: string;
-    address_n: number[];
-    descriptorChecksum?: string;
+  descriptor: string;
+  legacyXpub?: string;
+  address_n: number[];
+  descriptorChecksum?: string;
+  fingerprint?: number;
+  rootFingerprint?: number;
+  outputDescriptorBip380?: string;
 };
 export declare const DeviceCommands: (deviceTypedCall: TypedCallProvider) => {
-    unlockPath: (params?: Messages.UnlockPath) => Promise<{
-        type: "UnlockedPathRequest";
-        message: {
-            mac: string;
-        };
-    }>;
-    getPublicKey: (params: Messages.GetPublicKey, unlock?: Messages.UnlockPath) => Promise<{
-        root_fingerprint?: number | undefined;
-        descriptor?: string | undefined;
-        node: {
-            private_key?: string | undefined;
-            depth: number;
-            fingerprint: number;
-            child_num: number;
-            chain_code: string;
-            public_key: string;
-        };
-        xpub: string;
-    }>;
-    getAddress: ({ address_n, show_display, multisig, script_type, chunkify }: Messages.GetAddress, coinInfo: BitcoinNetworkInfo) => Promise<{
-        mac?: string | undefined;
-        address: string;
-    }>;
-    ethereumGetPublicKey: ({ address_n, show_display, }: Messages.EthereumGetPublicKey) => Promise<{
-        node: {
-            private_key?: string | undefined;
-            depth: number;
-            fingerprint: number;
-            child_num: number;
-            chain_code: string;
-            public_key: string;
-        };
-        xpub: string;
-    }>;
-    ethereumGetAddress: (params: Messages.EthereumGetAddress) => Promise<{
-        mac?: string | undefined;
-        _old_address?: string | undefined;
-        address: string;
-    }>;
-    getHDNode: (params: Messages.GetPublicKey, options: {
-        coinInfo: BitcoinNetworkInfo;
-        validation?: boolean;
-        unlockPath?: Messages.UnlockPath;
-    }) => Promise<{
-        path: number[];
-        publicKey: string;
-        serializedPath: string;
-    } & {
-        descriptor?: string | undefined;
-        xpubSegwit?: string | undefined;
-        descriptorChecksum?: string | undefined;
-        depth: number;
-        fingerprint: number;
-        xpub: string;
-        childNum: number;
-        chainCode: string;
-    }>;
-    preauthorize: (throwError: boolean) => Promise<boolean>;
-    getAccountDescriptor: (coinInfo: CoinInfo, address_n: number[], derivationType?: Messages.CardanoDerivationType) => Promise<AccountDescriptor>;
-    typedCall: Messages.TypedCall;
-};
-//# sourceMappingURL=DeviceCommands.d.ts.map
+  unlockPath: (params?: Messages.UnlockPath) => Promise<{
+    type: "UnlockedPathRequest";
+    message: {
+      mac: string;
+    };
+  }>;
+  getPublicKey: (params: Messages.GetPublicKey, unlock?: Messages.UnlockPath) => Promise<{
+    descriptor?: string | undefined;
+    root_fingerprint?: number | undefined;
+    xpub: string;
+    node: {
+      private_key?: string | undefined;
+      fingerprint: number;
+      depth: number;
+      child_num: number;
+      chain_code: string;
+      public_key: string;
+    };
+  }>;
+  getAddress: ({
+    address_n,
+    show_display,
+    multisig,
+    script_type,
+    chunkify
+  }: Messages.GetAddress, coinInfo: BitcoinNetworkInfo) => Promise<{
+    mac?: string | undefined;
+    address: string;
+  }>;
+  ethereumGetPublicKey: ({
+    address_n,
+    show_display
+  }: Messages.EthereumGetPublicKey) => Promise<{
+    xpub: string;
+    node: {
+      private_key?: string | undefined;
+      fingerprint: number;
+      depth: number;
+      child_num: number;
+      chain_code: string;
+      public_key: string;
+    };
+  }>;
+  ethereumGetAddress: (params: Messages.EthereumGetAddress) => Promise<{
+    mac?: string | undefined;
+    _old_address?: string | undefined;
+    address: string;
+  }>;
+  getHDNode: (params: Messages.GetPublicKey, options: {
+    coinInfo: BitcoinNetworkInfo;
+    validation?: boolean;
+    unlockPath?: Messages.UnlockPath;
+  }) => Promise<{
+    publicKey: string;
+    path: number[];
+    serializedPath: string;
+    displayablePublicKey: string;
+  } & {
+    xpubSegwit?: string | undefined;
+    descriptorChecksum?: string | undefined;
+    rootFingerprint?: number | undefined;
+    descriptor?: string | undefined;
+    childNum: number;
+    xpub: string;
+    chainCode: string;
+    fingerprint: number;
+    depth: number;
+  }>;
+  preauthorize: (throwError: boolean) => Promise<boolean>;
+  getAccountDescriptor: (coinInfo: CoinInfo, address_n: number[], derivationType?: Messages.CardanoDerivationType) => Promise<AccountDescriptor>;
+  typedCall: Messages.TypedCall;
+};

package/lib/device/DeviceCommands.js

@@ -1,16 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DeviceCommands = void 0;
-const tslib_1 = require("tslib");
-const constants_1 = require("../constants");
-const coinInfo_1 = require("../data/coinInfo");
-const resolveDescriptorForTaproot_1 = require("../device/resolveDescriptorForTaproot");
-const hdnodeUtils = tslib_1.__importStar(require("../utils/hdnodeUtils"));
-const pathUtils_1 = require("../utils/pathUtils");
-const DeviceCommands = deviceTypedCall => {
+import { ERRORS } from "@trezor/connect-common/lib/constants/index.js";
+import { MessagesSchema as PROTO } from "@trezor/protobuf";
+import { getBech32Network, getSegwitNetwork } from "../data/coinInfo.js";
+import { resolveDescriptorForTaproot } from "../device/resolveDescriptorForTaproot.js";
+import * as hdnodeUtils from "../utils/hdnodeUtils.js";
+import { getScriptType, getSerializedPath, isTaprootPath } from "../utils/pathUtils.js";
+export const DeviceCommands = deviceTypedCall => {
   const typedCall = deviceTypedCall.typedCall.bind(deviceTypedCall);
   const unlockPath = params => typedCall('UnlockPath', 'UnlockedPathRequest', params);
   const getPublicKey = async (params, unlock) => {
@@ -36,12 +30,12 @@ const DeviceCommands = deviceTypedCall => {
     const validation = typeof options.validation === 'boolean' ? options.validation : true;
     let network = null;
     if (!params.script_type) {
-      params.script_type = (0, pathUtils_1.getScriptType)(path);
+      params.script_type = getScriptType(path);
     }
     if (params.script_type === 'SPENDP2SHWITNESS') {
-      network = (0, coinInfo_1.getSegwitNetwork)(coinInfo);
+      network = getSegwitNetwork(coinInfo);
     } else if (params.script_type === 'SPENDWITNESS') {
-      network = (0, coinInfo_1.getBech32Network)(coinInfo);
+      network = getBech32Network(coinInfo);
     }
     if (!network) {
       network = coinInfo.network;
@@ -62,31 +56,35 @@ const DeviceCommands = deviceTypedCall => {
       }, unlock);
       publicKey = hdnodeUtils.xpubDerive(resKey, childKey, suffix, network, coinInfo.network);
     }
+    const xpub = network !== coinInfo.network ? hdnodeUtils.convertXpub(publicKey.xpub, network, coinInfo.network) : publicKey.xpub;
+    const xpubSegwit = network !== coinInfo.network ? publicKey.xpub : undefined;
     const response = {
       path,
-      serializedPath: (0, pathUtils_1.getSerializedPath)(path),
+      serializedPath: getSerializedPath(path),
       childNum: publicKey.node.child_num,
-      xpub: publicKey.xpub,
+      xpub,
       chainCode: publicKey.node.chain_code,
       publicKey: publicKey.node.public_key,
       fingerprint: publicKey.node.fingerprint,
+      rootFingerprint: publicKey.root_fingerprint,
       depth: publicKey.node.depth,
-      descriptor: publicKey.descriptor
+      descriptor: publicKey.descriptor,
+      displayablePublicKey: xpubSegwit ?? xpub,
+      ...(xpubSegwit !== undefined && {
+        xpubSegwit
+      })
     };
-    if (network !== coinInfo.network) {
-      response.xpubSegwit = response.xpub;
-      response.xpub = hdnodeUtils.convertXpub(publicKey.xpub, network, coinInfo.network);
-    }
-    if ((0, pathUtils_1.isTaprootPath)(path)) {
+    if (isTaprootPath(path)) {
       const {
         checksum,
-        xpub: xpubSegwit
-      } = (0, resolveDescriptorForTaproot_1.resolveDescriptorForTaproot)({
+        xpub: taprootXpubSegwit
+      } = resolveDescriptorForTaproot({
         response,
         publicKey
       });
-      response.xpubSegwit = xpubSegwit;
+      response.xpubSegwit = taprootXpubSegwit;
       response.descriptorChecksum = checksum;
+      response.displayablePublicKey = taprootXpubSegwit;
     }
     return response;
   };
@@ -98,12 +96,12 @@ const DeviceCommands = deviceTypedCall => {
     chunkify
   }, coinInfo) => {
     if (!script_type) {
-      script_type = (0, pathUtils_1.getScriptType)(address_n);
+      script_type = getScriptType(address_n);
       if (script_type === 'SPENDMULTISIG' && !multisig) {
         script_type = 'SPENDADDRESS';
       }
     }
-    if (multisig && multisig.pubkeys) {
+    if (multisig?.pubkeys) {
       multisig.pubkeys.forEach(pk => {
         if (typeof pk.node === 'string') {
           pk.node = hdnodeUtils.xpubToHDNodeType(pk.node, coinInfo.network);
@@ -149,7 +147,7 @@ const DeviceCommands = deviceTypedCall => {
       return false;
     }
   };
-  const getAccountDescriptor = async (coinInfo, address_n, derivationType = constants_1.PROTO.CardanoDerivationType.ICARUS_TREZOR) => {
+  const getAccountDescriptor = async (coinInfo, address_n, derivationType = PROTO.CardanoDerivationType.ICARUS_TREZOR) => {
     if (coinInfo.type === 'bitcoin') {
       const resp = await getHDNode({
         address_n
@@ -161,7 +159,10 @@ const DeviceCommands = deviceTypedCall => {
         descriptor: resp.xpubSegwit || resp.xpub,
         legacyXpub: resp.xpub,
         address_n,
-        descriptorChecksum: resp.descriptorChecksum
+        descriptorChecksum: resp.descriptorChecksum,
+        fingerprint: resp.fingerprint,
+        rootFingerprint: resp.rootFingerprint,
+        outputDescriptorBip380: resp.descriptor
       };
     }
     if (coinInfo.type === 'ethereum') {
@@ -220,7 +221,7 @@ const DeviceCommands = deviceTypedCall => {
         address_n
       };
     }
-    if (coinInfo.shortcut === 'TRX') {
+    if (coinInfo.shortcut === 'TRX' || coinInfo.shortcut === 'tTRX') {
       const {
         message
       } = await typedCall('TronGetAddress', 'TronAddress', {
@@ -231,7 +232,7 @@ const DeviceCommands = deviceTypedCall => {
         address_n
       };
     }
-    throw constants_1.ERRORS.TypedError('Runtime', 'DeviceCommands.getAccountDescriptor: unsupported coinInfo.type');
+    throw ERRORS.TypedError('Runtime', 'DeviceCommands.getAccountDescriptor: unsupported coinInfo.type');
   };
   return {
     unlockPath,
@@ -244,6 +245,4 @@ const DeviceCommands = deviceTypedCall => {
     getAccountDescriptor,
     typedCall
   };
-};
-exports.DeviceCommands = DeviceCommands;
-//# sourceMappingURL=DeviceCommands.js.map
+};