@trezor/connect 9.7.3 → 10.0.0-beta.1

package/lib/api/getAccountInfo.js

@@ -1,38 +1,28 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const resolveAfter_1 = require("@trezor/utils/lib/resolveAfter");
-const BlockchainLink_1 = require("../backend/BlockchainLink");
-const constants_1 = require("../constants");
-const AbstractMethod_1 = require("../core/AbstractMethod");
-const coinInfo_1 = require("../data/coinInfo");
-const events_1 = require("../events");
-const Discovery_1 = require("./common/Discovery");
-const paramsValidator_1 = require("./common/paramsValidator");
-const accountUtils_1 = require("../utils/accountUtils");
-const pathUtils_1 = require("../utils/pathUtils");
-class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
+import { UI_REQUEST, createUiMessage } from "@trezor/connect-common";
+import { ERRORS } from "@trezor/connect-common/lib/constants/index.js";
+import { fromHardenedPathPart } from "@trezor/crypto-utils";
+import { assertBackendSupported, initBlockchain } from "../backend/BlockchainLink.js";
+import { AbstractMethod } from "../core/AbstractMethod.js";
+import { getCoinInfoOrThrow } from "../data/coinInfo.js";
+import { bundlify, validateParams } from "./common/paramsValidator.js";
+import { getAccountLabel, isUtxoBased } from "../utils/accountUtils.js";
+import { buildOutputDescriptor } from "../utils/buildOutputDescriptor.js";
+import { getScriptType, validatePath } from "../utils/pathUtils.js";
+export default class GetAccountInfo extends AbstractMethod {
   disposed = false;
   hasBundle;
-  discovery;
-  init() {
-    this.requiredPermissions = ['read'];
-    this.useDevice = true;
-    this.useUi = true;
+  constructor(message) {
     let willUseDevice = false;
-    this.hasBundle = !!this.payload.bundle;
-    const payload = !this.payload.bundle ? {
-      ...this.payload,
-      bundle: [this.payload]
-    } : this.payload;
-    (0, paramsValidator_1.validateParams)(payload, [{
+    const {
+      hasBundle,
+      payload
+    } = bundlify(message.payload);
+    validateParams(payload, [{
       name: 'bundle',
       type: 'array'
     }]);
-    this.params = payload.bundle.map(batch => {
-      (0, paramsValidator_1.validateParams)(batch, [{
+    const params = payload.bundle.map(batch => {
+      validateParams(batch, [{
         name: 'coin',
         type: 'string',
         required: true
@@ -72,6 +62,12 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
       }, {
         name: 'marker',
         type: 'object'
+      }, {
+        name: 'protocols',
+        type: 'array'
+      }, {
+        name: 'confirmedNonce',
+        type: 'boolean'
       }, {
         name: 'defaultAccountType',
         type: 'string'
@@ -82,105 +78,73 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
         name: 'suppressBackupWarning',
         type: 'boolean'
       }]);
-      const coinInfo = (0, coinInfo_1.getCoinInfo)(batch.coin);
-      if (!coinInfo) {
-        throw constants_1.ERRORS.TypedError('Method_UnknownCoin');
-      }
-      (0, BlockchainLink_1.isBackendSupported)(coinInfo);
+      const coinInfo = getCoinInfoOrThrow(batch.coin);
+      assertBackendSupported(coinInfo);
       let address_n = [];
       if (batch.path) {
-        address_n = (0, pathUtils_1.validatePath)(batch.path, 3);
+        address_n = validatePath(batch.path, 3);
         willUseDevice = typeof batch.descriptor !== 'string';
       }
       if (!batch.path && !batch.descriptor) {
-        if (payload.bundle.length > 1) {
-          throw Error('Discovery for multiple coins in not supported');
-        }
-        willUseDevice = true;
+        throw ERRORS.TypedError('Method_InvalidParameter', 'GetAccountInfo: path or descriptor is required');
       }
-      this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, coinInfo, this.firmwareRange);
       return {
         ...batch,
         address_n,
         coinInfo
       };
     });
+    super(message, params);
+    this.hasBundle = hasBundle;
     this.useDevice = willUseDevice;
     this.useDeviceState = willUseDevice;
     this.useUi = willUseDevice;
-    this.noBackupConfirmationMode = this.params.every(batch => batch.suppressBackupWarning) ? 'popup-only' : 'always';
+    this.confirmMissingBackup = !params.every(batch => batch.suppressBackupWarning);
+    this.requiredFirmwareCoins = params.map(({
+      coinInfo
+    }) => coinInfo);
+  }
+  get requiredPermissions() {
+    return this.coinPerms('read_account_info', this.requiredFirmwareCoins);
   }
   get info() {
     return 'Export account info';
   }
   get confirmation() {
-    if (this.params.length === 1 && !this.params[0].path && !this.params[0].descriptor) {
-      return {
-        view: 'export-account-info',
-        label: `Export info for ${this.params[0].coinInfo.label} account of your selection`,
-        customConfirmButton: {
-          label: 'Proceed to account selection',
-          className: 'not-empty-css'
-        }
-      };
-    } else {
-      const keys = {};
-      this.params.forEach(b => {
-        if (!keys[b.coinInfo.label]) {
-          keys[b.coinInfo.label] = {
-            coinInfo: b.coinInfo,
-            values: []
-          };
+    const keys = {};
+    this.params.forEach(b => {
+      if (!keys[b.coinInfo.label]) {
+        keys[b.coinInfo.label] = {
+          coinInfo: b.coinInfo,
+          values: []
+        };
+      }
+      const entry = keys[b.coinInfo.label];
+      entry.values.push(b.descriptor || b.address_n);
+    });
+    const str = [];
+    Object.keys(keys).forEach((k, _i, _a) => {
+      const details = keys[k];
+      details.values.forEach(acc => {
+        str.push(k);
+        str.push(' ');
+        if (typeof acc === 'string') {
+          str.push(acc);
+        } else {
+          str.push(getAccountLabel(acc, details.coinInfo));
         }
-        keys[b.coinInfo.label].values.push(b.descriptor || b.address_n);
-      });
-      const str = [];
-      Object.keys(keys).forEach((k, _i, _a) => {
-        const details = keys[k];
-        details.values.forEach(acc => {
-          str.push(k);
-          str.push(' ');
-          if (typeof acc === 'string') {
-            str.push(acc);
-          } else {
-            str.push((0, accountUtils_1.getAccountLabel)(acc, details.coinInfo));
-          }
-        });
       });
-      return {
-        view: 'export-account-info',
-        label: `Export info for: ${str.join('')}`
-      };
-    }
-  }
-  checkFirmwareRange() {
-    if (this.params.length === 1) {
-      return super.checkFirmwareRange();
-    }
-    const invalid = [];
-    for (let i = 0; i < this.params.length; i++) {
-      this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, this.params[i].coinInfo, AbstractMethod_1.DEFAULT_FIRMWARE_RANGE);
-      const exception = super.checkFirmwareRange();
-      if (exception) {
-        invalid.push({
-          index: i,
-          exception,
-          coin: this.params[i].coin
-        });
-      }
-    }
-    if (invalid.length > 0) {
-      throw constants_1.ERRORS.TypedError('Method_Discovery_BundleException', JSON.stringify(invalid));
-    }
+    });
+    return {
+      view: 'export-account-info',
+      label: `Export info for: ${str.join('')}`
+    };
   }
-  async run() {
-    if (this.params.length === 1 && !this.params[0].path && !this.params[0].descriptor) {
-      return this.discover(this.params[0]);
-    }
+  async run(context) {
     const responses = [];
     const sendProgress = (progress, response, error) => {
-      if (!this.hasBundle || this.device?.getCurrentSession().isDisposed()) return;
-      this.postMessage((0, events_1.createUiMessage)(events_1.UI.BUNDLE_PROGRESS, {
+      if (!this.hasBundle || this.getDevice()?.getCurrentSession().isDisposed()) return;
+      context.sendCoreMessage(createUiMessage(UI_REQUEST.BUNDLE_PROGRESS, {
         total: this.params.length,
         progress,
         response,
@@ -188,7 +152,8 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
       }));
     };
     for (let i = 0; i < this.params.length; i++) {
-      const request = this.params[i];
+      const allParams = this.params;
+      const request = allParams[i];
       const {
         address_n
       } = request;
@@ -197,14 +162,27 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
       } = request;
       let legacyXpub;
       let descriptorChecksum;
+      let rootFingerprint;
+      let outputDescriptorBip380;
       if (this.disposed) break;
       if (address_n && typeof descriptor !== 'string') {
         try {
-          const accountDescriptor = await this.device.getCommands().getAccountDescriptor(request.coinInfo, address_n, request.derivationType);
+          const accountDescriptor = await this.getDevice().getCommands().getAccountDescriptor(request.coinInfo, address_n, request.derivationType);
           if (accountDescriptor) {
             descriptor = accountDescriptor.descriptor;
             legacyXpub = accountDescriptor.legacyXpub;
             descriptorChecksum = accountDescriptor.descriptorChecksum;
+            rootFingerprint = accountDescriptor.rootFingerprint;
+            const accountIndex = address_n[2];
+            const purposeIndex = address_n[0];
+            outputDescriptorBip380 = accountDescriptor.outputDescriptorBip380 ?? (request.coinInfo.type === 'bitcoin' && legacyXpub ? buildOutputDescriptor({
+              coin: request.coinInfo.name,
+              account: fromHardenedPathPart(accountIndex),
+              purpose: fromHardenedPathPart(purposeIndex),
+              scriptType: getScriptType(address_n),
+              xpub: legacyXpub,
+              rootFingerprint
+            }) : undefined);
           }
         } catch (error) {
           if (this.hasBundle) {
@@ -219,9 +197,9 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
       if (this.disposed) break;
       try {
         if (typeof descriptor !== 'string') {
-          throw constants_1.ERRORS.TypedError('Runtime', 'GetAccountInfo: descriptor not found');
+          throw ERRORS.TypedError('Runtime', 'GetAccountInfo: descriptor not found');
         }
-        const blockchain = await (0, BlockchainLink_1.initBlockchain)(request.coinInfo, this.postMessage, request.identity);
+        const blockchain = await initBlockchain(request.coinInfo, context.sendCoreMessage, request.identity);
         if (this.disposed) break;
         const info = await blockchain.getAccountInfo({
           descriptor,
@@ -235,11 +213,13 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
           contractFilter: request.contractFilter,
           gap: request.gap,
           marker: request.marker,
-          tokenAccountsPubKeys: request.tokenAccountsPubKeys
+          tokenAccountsPubKeys: request.tokenAccountsPubKeys,
+          protocols: request.protocols,
+          confirmedNonce: request.confirmedNonce
         });
         if (this.disposed) break;
         let utxo;
-        if ((0, accountUtils_1.isUtxoBased)(request.coinInfo) && typeof request.details === 'string' && request.details !== 'basic') {
+        if (isUtxoBased(request.coinInfo) && typeof request.details === 'string' && request.details !== 'basic') {
           utxo = await blockchain.getAccountUtxo(descriptor);
         }
         if (this.disposed) break;
@@ -249,7 +229,8 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
           descriptor,
           legacyXpub,
           utxo,
-          descriptorChecksum
+          descriptorChecksum,
+          outputDescriptorBip380
         };
         responses.push(account);
         sendProgress(i, account);
@@ -266,80 +247,7 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
     if (this.disposed) return new Promise(() => []);
     return this.hasBundle ? responses : responses[0];
   }
-  async discover(request) {
-    const {
-      coinInfo,
-      identity,
-      defaultAccountType,
-      derivationType
-    } = request;
-    const blockchain = await (0, BlockchainLink_1.initBlockchain)(coinInfo, this.postMessage, identity);
-    const dfd = this.createUiPromise(events_1.UI.RECEIVE_ACCOUNT);
-    const discovery = new Discovery_1.Discovery({
-      blockchain,
-      getDescriptor: path => this.device.getCommands().getAccountDescriptor(coinInfo, path, derivationType)
-    });
-    discovery.on('progress', accounts => {
-      this.postMessage((0, events_1.createUiMessage)(events_1.UI.SELECT_ACCOUNT, {
-        type: 'progress',
-        coinInfo,
-        accounts
-      }));
-    });
-    discovery.on('complete', () => {
-      this.postMessage((0, events_1.createUiMessage)(events_1.UI.SELECT_ACCOUNT, {
-        type: 'end',
-        coinInfo
-      }));
-    });
-    discovery.start().catch(error => {
-      dfd.reject(error);
-    });
-    this.postMessage((0, events_1.createUiMessage)(events_1.UI.SELECT_ACCOUNT, {
-      type: 'start',
-      accountTypes: discovery.types.map(t => t.type),
-      defaultAccountType,
-      coinInfo
-    }));
-    const uiResp = await dfd.promise;
-    discovery.stop();
-    const account = discovery.accounts[uiResp.payload];
-    if (!discovery.completed) {
-      await (0, resolveAfter_1.resolveAfter)(501);
-    }
-    const info = await blockchain.getAccountInfo({
-      descriptor: account.descriptor,
-      details: request.details,
-      tokens: request.tokens,
-      page: request.page,
-      pageSize: request.pageSize,
-      pageCursor: request.pageCursor,
-      from: request.from,
-      to: request.to,
-      contractFilter: request.contractFilter,
-      gap: request.gap,
-      marker: request.marker
-    });
-    let utxo;
-    if ((0, accountUtils_1.isUtxoBased)(coinInfo) && typeof request.details === 'string' && request.details !== 'basic') {
-      utxo = await blockchain.getAccountUtxo(account.descriptor);
-    }
-    return {
-      path: (0, pathUtils_1.getSerializedPath)(account.address_n),
-      ...info,
-      utxo
-    };
-  }
   dispose() {
     this.disposed = true;
-    const {
-      discovery
-    } = this;
-    if (discovery) {
-      discovery.removeAllListeners();
-      discovery.stop();
-    }
   }
-}
-exports.default = GetAccountInfo;
-//# sourceMappingURL=getAccountInfo.js.map
+}

package/lib/api/getAddress.d.ts

@@ -1,38 +1,45 @@
-import { PROTO } from '../constants';
-import { AbstractMethod } from '../core/AbstractMethod';
-import { type BitcoinNetworkInfo } from '../types';
-type Params = PROTO.GetAddress & {
-    address?: string;
-    coinInfo: BitcoinNetworkInfo;
-    unlockPath?: PROTO.UnlockPath;
+import { type BitcoinNetworkInfo, type PROTO, type PermissionRequest } from '@trezor/connect-common';
+import type { MethodContext, MethodMessage } from "../core/AbstractMethod.js";
+import { AbstractMethod } from "../core/AbstractMethod.js";
+type Params = {
+  proto: PROTO.GetAddress;
+  address?: string;
+  coinInfo: BitcoinNetworkInfo;
+  unlockPath?: PROTO.UnlockPath;
 };
 export default class GetAddress extends AbstractMethod<'getAddress', Params[]> {
-    hasBundle?: boolean;
-    progress: number;
-    init(): void;
-    get info(): string;
-    getButtonRequestData(code: string): {
-        type: "address";
-        serializedPath: string;
-        address: string;
-    } | undefined;
-    get confirmation(): {
-        view: "export-address";
-        label: string;
-    } | undefined;
-    _call({ address_n, show_display, multisig, script_type, coinInfo, unlockPath, chunkify, }: Params): Promise<{
-        path: number[];
-        serializedPath: string;
-        address: string;
-        mac: string | undefined;
-    }>;
-    run(): Promise<(import("../types").Address & {
-        mac?: string | undefined;
-        address: string;
-    }) | (import("../types").Address & {
-        mac?: string | undefined;
-        address: string;
-    })[]>;
+  hasBundle?: boolean;
+  progress: number;
+  constructor(message: MethodMessage<'getAddress'>);
+  get requiredPermissions(): PermissionRequest[];
+  get info(): string;
+  getButtonRequestData(code: string): {
+    type: "address";
+    serializedPath: string;
+    address: string;
+  } | undefined;
+  get confirmation(): {
+    view: "export-address";
+    label: string;
+  } | undefined;
+  _call({
+    proto,
+    coinInfo,
+    unlockPath
+  }: Params): Promise<{
+    path: number[];
+    serializedPath: string;
+    address: string;
+    mac: string | undefined;
+  }>;
+  run({
+    sendCoreMessage
+  }: MethodContext): Promise<(import("@trezor/connect-common").Address & {
+    mac?: string | undefined;
+    address: string;
+  }) | (import("@trezor/connect-common").Address & {
+    mac?: string | undefined;
+    address: string;
+  })[]>;
 }
-export {};
-//# sourceMappingURL=getAddress.d.ts.map
+export {};