@trezor/connect 9.5.5 → 9.6.0

package/CHANGELOG.md

@@ -1,16 +1,59 @@
 |             Package              | Stable |    Canary    |
 | :------------------------------: | :----: | :----------: |
-|       npm @trezor/connect        | 9.5.5  |      -       |
-|     npm @trezor/connect-web      | 9.5.5  |      -       |
-| npm @trezor/connect-webextension | 9.5.5  |      -       |
+|       npm @trezor/connect        | 9.6.0  |      -       |
+|     npm @trezor/connect-web      | 9.6.0  |      -       |
+| npm @trezor/connect-webextension | 9.6.0  |      -       |
 |    npm @trezor/connect-mobile    |   -    | 0.0.1-beta.1 |
 
 |     Deployment     | Stable | Canary |
 | :----------------: | :----: | :----: |
-| connect.trezor.io/ | 9.5.5  |   -    |
+| connect.trezor.io/ | 9.6.0  |   -    |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
+# 9.6.0
+
+Starting with Connect version 9.6.0, we are introducing a new integration with Trezor Suite. The new flow is designed to provide a more seamless and user-friendly experience for users interacting with Trezor devices.
+To learn more, please take a look at the full [New Connect flow in Trezor Suite](https://connect.trezor.io/9.6.0-beta.1/guides/new-connect-flow-in-trezor-suite/) article.
+We encourage you to try out the new flow to make sure everything works as expected. If you encounter any issues, please let us know.
+
+This requires one change in the manifest - there is an additional required field `appName` that is used in the permission prompt. Optionally, you can also provide an `appIcon` which will be shown in the future.
+
+```javascript
+TrezorConnect.init({
+    manifest: {
+        email: 'developer@xyz.com',
+        appName: 'Your Application',
+        appUrl: 'http://your.application.com',
+        appIcon: 'http://your.application.com/icon-64.png',
+    },
+});
+```
+
+## Features
+
+- Use suite-desktop by default (73d8a0a)
+- `appName` in manifest now required (6103a68)
+- New `discoverAccount` method (0b584aa, 3a07e81, 8389827, e2f66ef, f0f9197, 084089d, 978c2f5, dc1a77d)
+
+## Chain Support
+
+- Improved support for Stellar (180265b, 48b5ca0), including testnet (4231425)
+- Removed support for old Binance beacon chain (97a2dfd)
+- Use Solana token definitions (4be5bea)
+
+## Fixes
+
+- Do not throw entropy check failure during backup (81d582e)
+- Keep session dispose error (f2dcd3a)
+- `getAccountDescriptor` polished (e5b2cff)
+
+## Chores
+
+- Update Ethereum libs (ab5ad7b)
+- Update Solana libs (f58d9b6)
+- Update dependencies (47b7a34, 7bf17ef, 680cc6b, 2c97fed, 3c05b26)
+
 # 9.5.5
 
 This release is mostly about refactoring and preparatory work for the new way of using TrezorConnect together with Trezor Suite as its UI.

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.5.5
+API version 9.6.0
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)

package/lib/api/cardano/api/cardanoSignTransaction.d.ts

@@ -56,8 +56,8 @@ export default class CardanoSignTransaction extends AbstractMethod<'cardanoSignT
         witnesses: {
             chainCode?: string | undefined;
             type: PROTO.CardanoTxWitnessType;
-            signature: string;
             pubKey: string;
+            signature: string;
         }[];
     } | {
         serializedTx: string;
@@ -70,8 +70,8 @@ export default class CardanoSignTransaction extends AbstractMethod<'cardanoSignT
         witnesses: {
             chainCode?: string | undefined;
             type: PROTO.CardanoTxWitnessType;
-            signature: string;
             pubKey: string;
+            signature: string;
         }[];
     }>;
 }

package/lib/api/discoverAccounts.d.ts

@@ -0,0 +1,33 @@
+import { AbstractMethod } from '../core/AbstractMethod';
+import type { CoinInfo, FirmwareRange } from '../types';
+import { AccountTypeItem, AdditionalParams, CARDANO_DERIVATIONS } from '../types/api/discoverAccounts';
+type CardanoDerivation = (typeof CARDANO_DERIVATIONS)[keyof typeof CARDANO_DERIVATIONS];
+type Request = AdditionalParams & {
+    account: AccountTypeItem;
+    derivation?: CardanoDerivation;
+    firmwareRange: FirmwareRange;
+    coinInfo: CoinInfo;
+    offset: number;
+    skip: number;
+};
+export default class DiscoverAccounts extends AbstractMethod<'discoverAccounts', Request[]> {
+    disposed: boolean;
+    init(): void;
+    private progress;
+    private updateProgress;
+    private sendProgress;
+    run(): Promise<{
+        empty: number;
+        nonempty: number;
+        failed: number;
+    }>;
+    private filterUnsupportedAccounts;
+    private filterCardanoDerivations;
+    private readonly descriptorLock;
+    private readonly descriptorCache;
+    private getDescriptor;
+    private discoverAccount;
+    dispose(): void;
+}
+export {};
+//# sourceMappingURL=discoverAccounts.d.ts.map

package/lib/api/discoverAccounts.js

@@ -0,0 +1,180 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@trezor/utils");
+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 paramsValidator_1 = require("./common/paramsValidator");
+const discoverAccounts_1 = require("../types/api/discoverAccounts");
+const accountUtils_1 = require("../utils/accountUtils");
+const pathUtils_1 = require("../utils/pathUtils");
+const ACCOUNT_LIMIT = 10;
+const TXS_PER_PAGE = 25;
+const DETAILS = 'txs';
+const isCardano = (account) => account.symbol === 'ada' || account.symbol === 'tada';
+const isCardanoRequest = (request) => isCardano(request.account);
+const isEvmLedger = (account, coinInfo) => coinInfo.type === 'ethereum' && account.type === 'ledger';
+const getAccountTypeKey = ({ symbol, type }) => `${symbol}-${type}`;
+class DiscoverAccounts extends AbstractMethod_1.AbstractMethod {
+    disposed = false;
+    init() {
+        this.requiredPermissions = ['read'];
+        this.useDevice = true;
+        this.useDeviceState = true;
+        this.useUi = false;
+        const { payload } = this;
+        (0, paramsValidator_1.validateParams)(payload, [{ name: 'accounts', type: 'array' }]);
+        this.params = payload.accounts.flatMap(item => {
+            (0, paramsValidator_1.validateParams)(item, [
+                { name: 'symbol', type: 'string', required: true },
+                { name: 'type', type: 'string' },
+                { name: 'identity', type: 'string' },
+                { name: 'details', type: 'string' },
+                { name: 'pageSize', type: 'number' },
+                { name: 'skip', type: 'number' },
+            ]);
+            const { symbol, type, ...rest } = item;
+            const coinInfo = (0, coinInfo_1.getCoinInfo)(item.symbol);
+            if (!coinInfo) {
+                throw constants_1.ERRORS.TypedError('Method_UnknownCoin');
+            }
+            (0, BlockchainLink_1.isBackendSupported)(coinInfo);
+            const firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, coinInfo, AbstractMethod_1.DEFAULT_FIRMWARE_RANGE);
+            return discoverAccounts_1.ACCOUNT_TYPES.filter(a => a.symbol === symbol && (!type || a.type === type)).map(account => ({
+                pageSize: TXS_PER_PAGE,
+                details: DETAILS,
+                coinInfo,
+                firmwareRange,
+                skip: 0,
+                account,
+                ...rest,
+                offset: isEvmLedger(account, coinInfo) ? 1 : 0,
+                derivation: isCardano(account) ? discoverAccounts_1.CARDANO_DERIVATIONS[account.type] : undefined,
+            }));
+        });
+    }
+    progress = {};
+    updateProgress(account, done, last = false) {
+        const progress = last ? 1 : done / Math.max(ACCOUNT_LIMIT, done + 1);
+        const key = getAccountTypeKey(account);
+        this.progress[key] = progress;
+    }
+    sendProgress(account) {
+        const progress = Object.values(this.progress).reduce((sum, typeProgress) => sum + typeProgress, 0) /
+            (Object.keys(this.progress).length || 1);
+        this.postMessage((0, events_1.createUiMessage)(events_1.UI.BUNDLE_PROGRESS, {
+            total: 100,
+            progress: 100 * progress,
+            response: account,
+        }));
+    }
+    async run() {
+        const [unsupported, supported] = this.filterUnsupportedAccounts(this.params);
+        unsupported.forEach(({ account: { path, ...rest }, error }) => this.sendProgress({ ...rest, index: 0, error }));
+        const [cardanoAccounts, otherAccounts] = (0, utils_1.arrayPartition)(supported, isCardanoRequest);
+        const [_, filteredCardanoAccounts] = await this.filterCardanoDerivations(cardanoAccounts);
+        const accounts = [...otherAccounts, ...filteredCardanoAccounts];
+        accounts.forEach(({ account, skip }) => this.updateProgress(account, skip));
+        const counts = await Promise.all(accounts.map(account => this.discoverAccount(account)));
+        const nonempty = counts.reduce((sum, acc) => sum + acc.nonempty, 0);
+        const failed = counts.filter(acc => acc.error).length;
+        const empty = counts.length - failed;
+        return { empty, nonempty, failed };
+    }
+    filterUnsupportedAccounts(accounts) {
+        const version = this.device.getVersion();
+        const model = this.device.features?.internal_model;
+        if (!version || !model)
+            return [[], accounts];
+        return (0, utils_1.arrayPartition)(accounts.map(item => {
+            const { min, max } = item.firmwareRange[model];
+            let error;
+            if (min === '0') {
+                error = events_1.UI.FIRMWARE_NOT_SUPPORTED;
+            }
+            else if (!utils_1.versionUtils.isNewerOrEqual(version, min)) {
+                error = events_1.UI.FIRMWARE_OLD;
+            }
+            else if (max !== '0' && utils_1.versionUtils.isNewer(version, max)) {
+                error = events_1.UI.FIRMWARE_NOT_COMPATIBLE;
+            }
+            return error ? { ...item, error } : item;
+        }), item => 'error' in item);
+    }
+    async filterCardanoDerivations(accounts) {
+        const tryGetDescriptor = (coin) => coin && this.getDescriptor(coin.coinInfo, coin.account.path, coin.derivation, 0);
+        const normal = await tryGetDescriptor(accounts.find(a => a.account.type === 'normal'));
+        const ledger = await tryGetDescriptor(accounts.find(a => a.account.type === 'ledger'));
+        const legacy = await tryGetDescriptor(accounts.find(a => a.account.type === 'legacy'));
+        const omitLegacy = legacy && legacy.descriptor === (normal ?? ledger)?.descriptor;
+        const omitLedger = ledger && ledger.descriptor === normal?.descriptor;
+        return (0, utils_1.arrayPartition)(accounts.map(item => (item.account.type === 'legacy' && omitLegacy) ||
+            (item.account.type === 'ledger' && omitLedger)
+            ? { ...item, error: 'ignored cardano derivation' }
+            : item), item => 'error' in item);
+    }
+    descriptorLock = (0, utils_1.getSynchronize)();
+    descriptorCache = {};
+    async getDescriptor(coinInfo, bip43PathTemplate, derivationType, index) {
+        const path = bip43PathTemplate.replace('i', String(index));
+        const { address_n: _, ...descriptorRest } = await this.descriptorLock(async () => {
+            const key = `${path}-${derivationType}`;
+            if (!this.descriptorCache[key]) {
+                const address_n = (0, pathUtils_1.validatePath)(path, 3);
+                this.descriptorCache[key] = await this.device
+                    .getCommands()
+                    .getAccountDescriptor(coinInfo, address_n, derivationType);
+            }
+            return this.descriptorCache[key];
+        });
+        return { path, ...descriptorRest };
+    }
+    async discoverAccount(request) {
+        const { details, identity, pageSize, coinInfo, derivation, offset, skip } = request;
+        const { path, ...accountKey } = request.account;
+        const utxoRequired = (0, accountUtils_1.isUtxoBased)(coinInfo) && details && details !== 'basic';
+        let index = skip;
+        let blockchain;
+        try {
+            blockchain = await (0, BlockchainLink_1.initBlockchain)(coinInfo, this.postMessage, identity);
+        }
+        catch (error) {
+            this.updateProgress(accountKey, index + 1, true);
+            this.sendProgress({ ...accountKey, index, error: error.message });
+            return { nonempty: 0, error: error.message };
+        }
+        let descPromise = this.getDescriptor(coinInfo, path, derivation, offset + index);
+        while (true) {
+            try {
+                const { descriptor, ...descRest } = await descPromise;
+                descPromise = this.getDescriptor(coinInfo, path, derivation, offset + index + 1);
+                const info = await blockchain.getAccountInfo({ descriptor, details, pageSize });
+                const utxo = !utxoRequired
+                    ? undefined
+                    : info.empty
+                        ? []
+                        : await blockchain.getAccountUtxo(descriptor);
+                this.updateProgress(accountKey, index + 1, info.empty);
+                this.sendProgress({ ...info, descriptor, ...descRest, utxo, ...accountKey, index });
+                if (info.empty) {
+                    await descPromise.catch(() => { });
+                    return { nonempty: index - skip };
+                }
+            }
+            catch (error) {
+                descPromise.catch(() => { });
+                this.updateProgress(accountKey, index + 1, true);
+                this.sendProgress({ ...accountKey, index, error: error.message });
+                return { nonempty: index - skip, error };
+            }
+            index++;
+        }
+    }
+    dispose() {
+        this.disposed = true;
+    }
+}
+exports.default = DiscoverAccounts;
+//# sourceMappingURL=discoverAccounts.js.map

package/lib/api/eos/eosSignTx.d.ts

@@ -17,21 +17,21 @@ export declare const validate: (tx: EosSDKTransaction) => {
             data_chunk: string;
         } | undefined;
         transfer?: {
-            memo: string;
             quantity: {
                 symbol: string;
                 amount: string | number;
             };
-            sender: string;
+            memo: string;
             receiver: string;
+            sender: string;
         } | undefined;
         refund?: {
             owner: string;
         } | undefined;
         delegate?: {
             transfer: boolean;
-            sender: string;
             receiver: string;
+            sender: string;
             net_quantity: {
                 symbol: string;
                 amount: string | number;
@@ -42,8 +42,8 @@ export declare const validate: (tx: EosSDKTransaction) => {
             };
         } | undefined;
         undelegate?: {
-            sender: string;
             receiver: string;
+            sender: string;
             net_quantity: {
                 symbol: string;
                 amount: string | number;

package/lib/api/ethereum/ethereumSignTx.js

@@ -36,11 +36,13 @@ const processTxRequest = async (typedCall, request, data, chain_id) => {
 };
 const deepHexPrefix = (0, formatUtils_1.deepTransform)(formatUtils_1.addHexPrefix);
 const getCommonForChain = (chainId) => {
-    if (common_1.Common.isSupportedChainId(BigInt(chainId)))
-        return new common_1.Common({ chain: chainId });
-    if (chainId === 61)
-        return common_1.Common.custom({ name: 'ethereum-classic', networkId: 1, chainId: 61 }, { baseChain: common_1.Chain.Mainnet, hardfork: common_1.Hardfork.Petersburg });
-    return common_1.Common.custom({ chainId });
+    if (chainId === 61) {
+        return (0, common_1.createCustomCommon)({
+            chainId: 61,
+            defaultHardfork: common_1.Hardfork.Petersburg,
+        }, common_1.Mainnet);
+    }
+    return (0, common_1.createCustomCommon)({ chainId }, common_1.Mainnet);
 };
 exports.getCommonForChain = getCommonForChain;
 const serializeEthereumTx = (tx, signature, isLegacy) => {
@@ -64,7 +66,7 @@ const serializeEthereumTx = (tx, signature, isLegacy) => {
     const txOptions = {
         common: (0, exports.getCommonForChain)(tx.chainId),
     };
-    const ethTx = tx_1.TransactionFactory.fromTxData(txData, txOptions);
+    const ethTx = (0, tx_1.createTx)(txData, txOptions);
     return `0x${Buffer.from(ethTx.serialize()).toString('hex')}`;
 };
 exports.serializeEthereumTx = serializeEthereumTx;

package/lib/api/firmware/getBinary.d.ts

@@ -1,4 +1,4 @@
-import { FirmwareRelease } from '../../types';
+import type { FirmwareRelease } from '@trezor/device-utils';
 interface GetBinaryProps {
     baseUrl: string;
     btcOnly?: boolean;

package/lib/api/getAccountInfo.d.ts

@@ -49,6 +49,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
                 [key: string]: import("@trezor/blockchain-link-types/lib/blockbook-api").AddressAlias;
             };
             sequence?: number;
+            stellarSequence?: string;
             reserve?: string;
             rewards?: string;
             staking?: {
@@ -79,6 +80,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
             ledger: number;
             seq: number;
         };
+        stellarCursor?: string;
         path: string;
     }>;
     discover(request: Request): Promise<{
@@ -105,6 +107,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
                 [key: string]: import("@trezor/blockchain-link-types/lib/blockbook-api").AddressAlias;
             };
             sequence?: number;
+            stellarSequence?: string;
             reserve?: string;
             rewards?: string;
             staking?: {
@@ -135,6 +138,7 @@ export default class GetAccountInfo extends AbstractMethod<'getAccountInfo', Req
             ledger: number;
             seq: number;
         };
+        stellarCursor?: string;
         path: string;
     }>;
     dispose(): void;

package/lib/api/getAccountInfo.js

@@ -198,6 +198,7 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
                     tokens: request.tokens,
                     page: request.page,
                     pageSize: request.pageSize,
+                    pageCursor: request.pageCursor,
                     from: request.from,
                     to: request.to,
                     contractFilter: request.contractFilter,
@@ -283,6 +284,7 @@ class GetAccountInfo extends AbstractMethod_1.AbstractMethod {
             tokens: request.tokens,
             page: request.page,
             pageSize: request.pageSize,
+            pageCursor: request.pageCursor,
             from: request.from,
             to: request.to,
             contractFilter: request.contractFilter,

package/lib/api/getFeatures.d.ts

@@ -42,7 +42,7 @@ export default class GetFeatures extends AbstractMethod<'getFeatures'> {
         unfinished_backup: boolean | null;
         no_backup: boolean | null;
         recovery_status: "Nothing" | "Recovery" | "Backup" | null;
-        capabilities: ("Capability_Bitcoin" | "Capability_Bitcoin_like" | "Capability_Binance" | "Capability_Cardano" | "Capability_Crypto" | "Capability_EOS" | "Capability_Ethereum" | "Capability_Lisk" | "Capability_Monero" | "Capability_NEM" | "Capability_Ripple" | "Capability_Stellar" | "Capability_Tezos" | "Capability_U2F" | "Capability_Shamir" | "Capability_ShamirGroups" | "Capability_PassphraseEntry" | "Capability_Solana" | "Capability_Translations" | "Capability_Brightness" | "Capability_Haptic")[];
+        capabilities: ("Capability_Bitcoin" | "Capability_Bitcoin_like" | "Capability_Binance" | "Capability_Cardano" | "Capability_Crypto" | "Capability_EOS" | "Capability_Ethereum" | "Capability_Lisk" | "Capability_Monero" | "Capability_NEM" | "Capability_Ripple" | "Capability_Stellar" | "Capability_Tezos" | "Capability_U2F" | "Capability_Shamir" | "Capability_ShamirGroups" | "Capability_PassphraseEntry" | "Capability_Solana" | "Capability_Translations" | "Capability_Brightness" | "Capability_Haptic" | "Capability_BLE" | "Capability_NFC")[];
         backup_type: "Bip39" | "Slip39_Basic" | "Slip39_Advanced" | "Slip39_Single_Extendable" | "Slip39_Basic_Extendable" | "Slip39_Advanced_Extendable" | null;
         sd_card_present: boolean | null;
         sd_protection: boolean | null;

package/lib/api/index.d.ts

@@ -24,6 +24,7 @@ export { default as changePin } from './changePin';
 export { default as changeWipeCode } from './changeWipeCode';
 export { default as cipherKeyValue } from './cipherKeyValue';
 export { default as composeTransaction } from './composeTransaction';
+export { default as discoverAccounts } from './discoverAccounts';
 export { default as getAccountDescriptor } from './getAccountDescriptor';
 export { default as getAccountInfo } from './getAccountInfo';
 export { default as getAddress } from './getAddress';

package/lib/api/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wipeDevice = exports.verifyMessage = exports.unlockPath = exports.signTransaction = exports.signMessage = exports.setProxy = exports.setBusy = exports.setBrightness = exports.loadDevice = exports.resetDevice = exports.requestLogin = exports.recoveryDevice = exports.pushTransaction = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.getAccountDescriptor = exports.composeTransaction = exports.cipherKeyValue = exports.changeWipeCode = exports.changePin = exports.changeLanguage = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainEvmRpcCall = exports.blockchainGetInfo = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.bleUnpair = exports.backupDevice = exports.showDeviceTutorial = exports.cancelCoinjoinAuthorization = exports.authorizeCoinjoin = exports.authenticateDevice = exports.applySettings = exports.applyFlags = void 0;
+exports.verifyMessage = exports.unlockPath = exports.signTransaction = exports.signMessage = exports.setProxy = exports.setBusy = exports.setBrightness = exports.loadDevice = exports.resetDevice = exports.requestLogin = exports.recoveryDevice = exports.pushTransaction = exports.getSettings = exports.getPublicKey = exports.getOwnershipProof = exports.getOwnershipId = exports.getFirmwareHash = exports.getFeatures = exports.getDeviceState = exports.getCoinInfo = exports.getAddress = exports.getAccountInfo = exports.getAccountDescriptor = exports.discoverAccounts = exports.composeTransaction = exports.cipherKeyValue = exports.changeWipeCode = exports.changePin = exports.changeLanguage = exports.blockchainUnsubscribeFiatRates = exports.blockchainUnsubscribe = exports.blockchainSubscribeFiatRates = exports.blockchainSubscribe = exports.blockchainSetCustomBackend = exports.blockchainGetTransactions = exports.blockchainGetFiatRatesForTimestamps = exports.blockchainEvmRpcCall = exports.blockchainGetInfo = exports.blockchainGetCurrentFiatRates = exports.blockchainGetAccountBalanceHistory = exports.blockchainEstimateFee = exports.blockchainDisconnect = exports.bleUnpair = exports.backupDevice = exports.showDeviceTutorial = exports.cancelCoinjoinAuthorization = exports.authorizeCoinjoin = exports.authenticateDevice = exports.applySettings = exports.applyFlags = void 0;
+exports.wipeDevice = void 0;
 const tslib_1 = require("tslib");
 var applyFlags_1 = require("./applyFlags");
 Object.defineProperty(exports, "applyFlags", { enumerable: true, get: function () { return tslib_1.__importDefault(applyFlags_1).default; } });
@@ -54,6 +55,8 @@ var cipherKeyValue_1 = require("./cipherKeyValue");
 Object.defineProperty(exports, "cipherKeyValue", { enumerable: true, get: function () { return tslib_1.__importDefault(cipherKeyValue_1).default; } });
 var composeTransaction_1 = require("./composeTransaction");
 Object.defineProperty(exports, "composeTransaction", { enumerable: true, get: function () { return tslib_1.__importDefault(composeTransaction_1).default; } });
+var discoverAccounts_1 = require("./discoverAccounts");
+Object.defineProperty(exports, "discoverAccounts", { enumerable: true, get: function () { return tslib_1.__importDefault(discoverAccounts_1).default; } });
 var getAccountDescriptor_1 = require("./getAccountDescriptor");
 Object.defineProperty(exports, "getAccountDescriptor", { enumerable: true, get: function () { return tslib_1.__importDefault(getAccountDescriptor_1).default; } });
 var getAccountInfo_1 = require("./getAccountInfo");

package/lib/api/nem/nemSignTx.d.ts

@@ -2,9 +2,17 @@ import { PROTO } from '../../constants';
 import * as $T from '../../types/api/nem';
 export declare const createTx: (tx: $T.NEMTransaction, address_n: number[], chunkify?: boolean) => {
     chunkify?: boolean | undefined;
+    multisig?: {
+        address_n?: number[] | undefined;
+        network?: number | undefined;
+        signer?: string | undefined;
+        timestamp: number;
+        fee: string | number;
+        deadline: number;
+    } | undefined;
     transfer?: {
-        public_key?: string | undefined;
         payload?: string | undefined;
+        public_key?: string | undefined;
         mosaics?: {
             quantity: number;
             namespace: string;
@@ -13,14 +21,6 @@ export declare const createTx: (tx: $T.NEMTransaction, address_n: number[], chun
         amount: string | number;
         recipient: string;
     } | undefined;
-    multisig?: {
-        address_n?: number[] | undefined;
-        network?: number | undefined;
-        signer?: string | undefined;
-        timestamp: number;
-        fee: string | number;
-        deadline: number;
-    } | undefined;
     cosigning?: boolean | undefined;
     provision_namespace?: {
         parent?: string | undefined;

package/lib/api/resetDevice.d.ts

@@ -1,6 +1,7 @@
 import { PROTO } from '../constants';
 import { AbstractMethod } from '../core/AbstractMethod';
 export default class ResetDevice extends AbstractMethod<'resetDevice', PROTO.ResetDevice> {
+    private isEntropyCheckSuccessful;
     init(): void;
     get info(): string;
     get confirmation(): {

package/lib/api/resetDevice.js

@@ -10,6 +10,7 @@ const events_1 = require("../events");
 const paramsValidator_1 = require("./common/paramsValidator");
 const pathUtils_1 = require("../utils/pathUtils");
 class ResetDevice extends AbstractMethod_1.AbstractMethod {
+    isEntropyCheckSuccessful = false;
     init() {
         this.allowDeviceMode = [events_1.UI.INITIALIZE, events_1.UI.SEEDLESS];
         this.useDeviceState = false;
@@ -86,6 +87,7 @@ class ResetDevice extends AbstractMethod_1.AbstractMethod {
                 for (let i = 0; i < tries; i++) {
                     entropyData = await this.entropyCheck(entropyData);
                 }
+                this.isEntropyCheckSuccessful = true;
                 await cmd.typedCall('EntropyCheckContinue', 'Success', { finish: true });
             }
         }
@@ -94,6 +96,8 @@ class ResetDevice extends AbstractMethod_1.AbstractMethod {
                 errors_groups_1.ERRORS_WITHOUT_DEVICE_INTERACTION.includes(error.message)) {
                 throw error;
             }
+            if (this.isEntropyCheckSuccessful === true)
+                throw error;
             throw constants_1.ERRORS.TypedError('Failure_EntropyCheck', error.message);
         }
         return { message: 'Success' };