@ledgerhq/live-common 27.3.2 → 27.4.0-next.1

package/src/families/bitcoin/wallet-btc/xpub.ts

@@ -1,7 +1,6 @@
 import { maxBy, range, some } from "lodash";
 import BigNumber from "bignumber.js";
 import { TX, Address, IStorage } from "./storage/types";
-import EventEmitter from "./utils/eventemitter";
 import { IExplorer } from "./explorer/types";
 import { ICrypto } from "./crypto/types";
 import { PickingStrategy } from "./pickingstrategies/types";
@@ -9,7 +8,7 @@ import * as utils from "./utils";
 import { TransactionInfo, InputInfo, OutputInfo } from "./types";
 
 // names inside this class and discovery logic respect BIP32 standard
-class Xpub extends EventEmitter {
+class Xpub {
   storage: IStorage;
 
   explorer: IExplorer;
@@ -30,8 +29,6 @@ class Xpub extends EventEmitter {
 
   GAP = 20;
 
-  syncing: { [key: string]: boolean } = {};
-
   // need to be bigger than the number of tx from the same address that can be in the same block
   txsSyncArraySize = 1000;
 
@@ -48,7 +45,6 @@ class Xpub extends EventEmitter {
     xpub: string;
     derivationMode: string;
   }) {
-    super();
     this.storage = storage;
     this.explorer = explorer;
     this.crypto = crypto;
@@ -58,7 +54,7 @@ class Xpub extends EventEmitter {
     this.freshAddressIndex = 0;
   }
 
-  async syncAddress(account: number, index: number) {
+  async syncAddress(account: number, index: number): Promise<boolean> {
     const address = await this.crypto.getAddress(
       this.derivationMode,
       this.xpub,
@@ -70,43 +66,22 @@ class Xpub extends EventEmitter {
       `${this.crypto.network.name}-${this.derivationMode}-${this.xpub}-${account}-${index}`,
       address
     );
-    await this.whenSynced("address", address);
-
-    const data = {
-      type: "address",
-      key: address,
-      account,
-      index,
-      address,
-    };
-
-    this.emitSyncing(data);
 
     // TODO handle eventual reorg case using lastBlock
+    // TODO perf: bad : looping in the tx array
+    await this.checkAddressReorg(account, index);
 
-    let total = 0;
-    try {
-      // TODO perf: bad : looping in the tx array
-      await this.checkAddressReorg(account, index);
-
-      // in case pendings have changed we clean them out
-      // TODO perf : bad : looping in the tx array
-      const hasPendings = !!this.storage.getLastTx({
-        confirmed: false,
-        account,
-        index,
-      });
-      if (hasPendings) {
-        this.storage.removePendingTxs({ account, index });
-      }
-      total = await this.fetchHydrateAndStoreNewTxs(address, account, index);
-    } catch (e) {
-      this.emitSyncedFailed(data);
-      throw e;
+    // in case pendings have changed we clean them out
+    // TODO perf : bad : looping in the tx array
+    const hasPendings = !!this.storage.getLastTx({
+      confirmed: false,
+      account,
+      index,
+    });
+    if (hasPendings) {
+      this.storage.removePendingTxs({ account, index });
     }
-
-    this.emitSynced({ ...data, total });
-
+    await this.fetchHydrateAndStoreNewTxs(address, account, index);
     const lastTx = this.storage.getLastTx({
       account,
       index,
@@ -117,65 +92,31 @@ class Xpub extends EventEmitter {
     return !!lastTx;
   }
 
-  async checkAddressesBlock(account: number, index: number) {
+  async checkAddressesBlock(account: number, index: number): Promise<boolean> {
     const addressesResults = await Promise.all(
       range(this.GAP).map((_, key) => this.syncAddress(account, index + key))
     );
     return some(addressesResults, (lastTx) => !!lastTx);
   }
 
-  async syncAccount(account: number) {
-    await this.whenSynced("account", account.toString());
-
-    this.emitSyncing({
-      type: "account",
-      key: account,
-      account,
-    });
-
+  async syncAccount(account: number): Promise<number> {
     let index = 0;
-
-    try {
-      // eslint-disable-next-line no-await-in-loop
-      while (await this.checkAddressesBlock(account, index)) {
-        index += this.GAP;
-      }
-    } catch (e) {
-      this.emitSyncedFailed({
-        type: "account",
-        key: account,
-        account,
-      });
-      throw e;
+    // eslint-disable-next-line no-await-in-loop
+    while (await this.checkAddressesBlock(account, index)) {
+      index += this.GAP;
     }
-
-    this.emitSynced({
-      type: "account",
-      key: account,
-      account,
-      index,
-    });
     return index;
   }
 
   // TODO : test fail case + incremental
-  async sync() {
-    await this.whenSynced("all");
-    this.emitSyncing({ type: "all" });
+  async sync(): Promise<number> {
     this.freshAddressIndex = 0;
     let account = 0;
-    try {
-      // eslint-disable-next-line no-await-in-loop
-      while (account < 2 && (await this.syncAccount(account))) {
-        // account=0 for receive address; account=1 for change address. No need to handle account>1
-        account += 1;
-      }
-    } catch (e) {
-      this.emitSyncedFailed({ type: "all" });
-      throw e;
+    // eslint-disable-next-line no-await-in-loop
+    while (account < 2 && (await this.syncAccount(account))) {
+      // account=0 for receive address; account=1 for change address. No need to handle account>1
+      account += 1;
     }
-
-    this.emitSynced({ type: "all", account });
     this.freshAddress = await this.crypto.getAddress(
       this.derivationMode,
       this.xpub,
@@ -185,46 +126,33 @@ class Xpub extends EventEmitter {
     return account;
   }
 
-  async getXpubBalance() {
-    await this.whenSynced("all");
-
+  async getXpubBalance(): Promise<BigNumber> {
     const addresses = await this.getXpubAddresses();
-
     return this.getAddressesBalance(addresses);
   }
 
-  async getAccountBalance(account: number) {
-    await this.whenSynced("account", account.toString());
-
+  async getAccountBalance(account: number): Promise<BigNumber> {
     const addresses = await this.getAccountAddresses(account);
-
     return this.getAddressesBalance(addresses);
   }
 
-  async getAddressBalance(address: Address) {
-    await this.whenSynced("address", address.address);
-
+  async getAddressBalance(address: Address): Promise<BigNumber> {
     const unspentUtxos = this.storage.getAddressUnspentUtxos(address);
-
     return unspentUtxos.reduce(
       (total, { value }) => total.plus(value),
       new BigNumber(0)
     );
   }
 
-  async getXpubAddresses() {
-    await this.whenSynced("all");
+  async getXpubAddresses(): Promise<Address[]> {
     return this.storage.getUniquesAddresses({});
   }
 
-  async getAccountAddresses(account: number) {
-    await this.whenSynced("account", account.toString());
+  async getAccountAddresses(account: number): Promise<Address[]> {
     return this.storage.getUniquesAddresses({ account });
   }
 
-  async getNewAddress(account: number, gap: number) {
-    await this.whenSynced("account", account.toString());
-
+  async getNewAddress(account: number, gap: number): Promise<Address> {
     const accountAddresses = await this.getAccountAddresses(account);
     const lastIndex = (maxBy(accountAddresses, "index") || { index: -1 }).index;
     let index: number;
@@ -254,8 +182,6 @@ class Xpub extends EventEmitter {
     utxoPickingStrategy: PickingStrategy;
     sequence: number;
   }): Promise<TransactionInfo> {
-    await this.whenSynced("all");
-
     const outputs: OutputInfo[] = [];
 
     // outputs splitting
@@ -318,9 +244,12 @@ class Xpub extends EventEmitter {
       };
     });
     const associatedDerivations: [number, number][] = unspentUtxoSelected.map(
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      (utxo, index) => [txs[index].account, txs[index].index]
+      (_utxo, index) => {
+        if (txs[index] == null) {
+          throw new Error("Invalid index in txs[index]");
+        }
+        return [txs[index]?.account || 0, txs[index]?.index || 0];
+      }
     );
 
     const txSize = utils.maxTxSizeCeil(
@@ -334,7 +263,7 @@ class Xpub extends EventEmitter {
     // Abandon the change output if change output amount is less than dust amount
     if (
       needChangeoutput &&
-      total.minus(params.amount).minus(fee) > dustAmount
+      total.minus(params.amount).minus(fee).gt(dustAmount)
     ) {
       outputs.push({
         script: this.crypto.toOutputScript(params.changeAddress.address),
@@ -358,12 +287,12 @@ class Xpub extends EventEmitter {
     };
   }
 
-  async broadcastTx(rawTxHex: string) {
+  async broadcastTx(rawTxHex: string): Promise<any> {
     return this.explorer.broadcast(rawTxHex);
   }
 
   // internal
-  async getAddressesBalance(addresses: Address[]) {
+  async getAddressesBalance(addresses: Address[]): Promise<BigNumber> {
     const balances = await Promise.all(
       addresses.map((address) => this.getAddressBalance(address))
     );
@@ -374,49 +303,11 @@ class Xpub extends EventEmitter {
     );
   }
 
-  // TODO : test the different syncing protection logic
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  emitSyncing(data: any) {
-    this.syncing[`${data.type}-${data.key}`] = true;
-    this.emit("syncing", data);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  emitSynced(data: any) {
-    this.syncing[`${data.type}-${data.key}`] = false;
-    this.emit("synced", data);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  emitSyncedFailed(data: any) {
-    this.syncing[`${data.type}-${data.key}`] = false;
-    this.emit("syncfail", data);
-  }
-
-  whenSynced(type: string, key?: string): Promise<void> {
-    return new Promise((resolve) => {
-      if (!this.syncing[`${type}-${key}`]) {
-        resolve();
-      } else {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const handler = (evt: any) => {
-          if (evt.type === type && evt.key === key) {
-            resolve();
-            this.removeListener("synced", handler);
-          }
-        };
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        this.on("synced", handler);
-      }
-    });
-  }
-
   async fetchHydrateAndStoreNewTxs(
     address: string,
     account: number,
     index: number
-  ) {
+  ): Promise<number> {
     let pendingTxs: TX[] = [];
     let txs: TX[] = [];
     let inserted = 0;
@@ -441,7 +332,7 @@ class Xpub extends EventEmitter {
     return inserted;
   }
 
-  async checkAddressReorg(account: number, index: number) {
+  async checkAddressReorg(account: number, index: number): Promise<void> {
     const lastTx = this.storage.getLastTx({
       account,
       index,

package/src/families/cardano/js-synchronisation.ts

@@ -232,7 +232,7 @@ export const getAccountShape: GetAccountShape = async (
     newTransactions,
     tokens: tokenBalance,
     accountCredentialsMap,
-  });
+  }).filter((a) => !blacklistedTokenIds?.includes(a.token.id));
 
   const newOperations = newTransactions.map((t) =>
     mapTxToAccountOperation(t, accountId, accountCredentialsMap, subAccounts)

package/src/families/cardano/specs.ts

@@ -31,7 +31,7 @@ const cardano: AppSpec<Transaction> = {
   },
   minViableAmount: minBalanceRequired,
   genericDeviceAction: acceptTransaction,
-  testTimeout: 2 * 60 * 1000,
+  testTimeout: 5 * 60 * 1000,
   mutations: [
     {
       testDestination: genericTestDestination,

package/src/families/celo/specs/createSendMutation.ts

@@ -1,6 +1,6 @@
 import invariant from "invariant";
 import { getCryptoCurrencyById, parseCurrencyUnit } from "../../../currencies";
-import { genericTestDestination, pickSiblings } from "../../../bot/specs";
+import { pickSiblings } from "../../../bot/specs";
 import { MutationSpec } from "../../../bot/types";
 import type { Transaction } from "../types";
 
@@ -11,7 +11,6 @@ export const minimalAmount = parseCurrencyUnit(currency.units[0], "0.001");
 export const createSend50PercentMutation = (): MutationSpec<Transaction> => ({
   name: "Celo: Move 50% to another account",
   maxRun: 1,
-  testDestination: genericTestDestination,
   transaction: ({ account, siblings, bridge, maxSpendable }) => {
     invariant(
       maxSpendable.gt(minimalAmount),
@@ -30,7 +29,6 @@ export const createSend50PercentMutation = (): MutationSpec<Transaction> => ({
 export const createSendMaxMutation = (): MutationSpec<Transaction> => ({
   name: "Celo: Send max to another account",
   maxRun: 1,
-  testDestination: genericTestDestination,
   transaction: ({ account, siblings, bridge, maxSpendable }) => {
     invariant(
       maxSpendable.gt(minimalAmount),

package/src/families/celo/specs.ts

@@ -34,7 +34,7 @@ const celo: AppSpec<Transaction> = {
     model: DeviceModelId.nanoS,
     appName: "Celo",
   },
-  testTimeout: 2 * 60 * 1000,
+  testTimeout: 4 * 60 * 1000,
   genericDeviceAction: acceptTransaction,
   minViableAmount: minimalAmount,
   mutations: [

package/src/families/crypto_org/specs.ts

@@ -31,7 +31,8 @@ const sharedMutations = ({ maxAccount }) => [
 ];
 
 const crypto_org_croeseid: AppSpec<Transaction> = {
-  name: "Crypto.org Testnet",
+  disabled: true, // explorers are not correctly working. we will focus on crypto_org spec for now
+  name: "Crypto org Testnet",
   currency: getCryptoCurrencyById("crypto_org_croeseid"),
   appQuery: {
     model: DeviceModelId.nanoS,
@@ -45,7 +46,7 @@ const crypto_org_croeseid: AppSpec<Transaction> = {
 };
 
 const crypto_org: AppSpec<Transaction> = {
-  name: "Crypto.org",
+  name: "Crypto org",
   currency: getCryptoCurrencyById("crypto_org"),
   appQuery: {
     model: DeviceModelId.nanoS,

package/src/families/ethereum/specs.ts

@@ -21,7 +21,7 @@ import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { CompoundAccountSummary } from "../../compound/types";
 import { acceptTransaction } from "./speculos-deviceActions";
 
-const testTimeout = 5 * 60 * 1000;
+const testTimeout = 8 * 60 * 1000;
 
 const ethereumBasicMutations = ({ maxAccount }) => [
   {
@@ -131,7 +131,7 @@ const ethereum: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   genericDeviceAction: acceptTransaction,
   testTimeout,
@@ -403,7 +403,7 @@ const ethereumGoerli: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   genericDeviceAction: acceptTransaction,
   testTimeout,

package/src/families/evm/specs.ts

@@ -7,7 +7,7 @@ import { botTest, genericTestDestination, pickSiblings } from "../../bot/specs";
 import type { AppSpec } from "../../bot/types";
 import type { Transaction } from "./types";
 
-const testTimeout = 5 * 60 * 1000;
+const testTimeout = 6 * 60 * 1000;
 
 const transactionCheck =
   (currencyId: string) =>
@@ -68,7 +68,7 @@ const cronos: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   testTimeout,
   transactionCheck: transactionCheck("cronos"),
@@ -84,7 +84,7 @@ const fantom: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   testTimeout,
   transactionCheck: transactionCheck("fantom"),
@@ -100,7 +100,7 @@ const moonbeam: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   testTimeout,
   transactionCheck: transactionCheck("moonbeam"),
@@ -116,7 +116,7 @@ const songbird: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   testTimeout,
   transactionCheck: transactionCheck("songbird"),
@@ -132,7 +132,7 @@ const flare: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.9.20-dev", // FIXME remove this line once 1.9.20 lands on coin-apps (branch ledger-live-bot)
+    appVersion: "1.9.20",
   },
   testTimeout,
   transactionCheck: transactionCheck("flare"),

package/src/families/filecoin/__snapshots__/bridge.integration.test.ts.snap

@@ -18,7 +18,7 @@ Array [
     "index": 0,
     "name": "Filecoin 1",
     "nfts": undefined,
-    "operationsCount": 0,
+    "operationsCount": 1,
     "pendingOperations": Array [],
     "seedIdentifier": "04ca7b02cafdf36e8b4caaf530a96b949764af71b956b2a3328b7a10940794c860f574a9199be98bde3c261887fec8e5fd94bc5f104908bf5f992f52ef2a89abb0",
     "spendableBalance": "1000000000000000",
@@ -85,7 +85,29 @@ Array [
 
 exports[`filecoin currency bridge scanAccounts filecoin seed 1 2`] = `
 Array [
-  Array [],
+  Array [
+    Object {
+      "accountId": "js:2:filecoin:t15lauyzdivqj7m3yob3rxmzdsy7uyhfflwyheuri:gliflegacy",
+      "blockHash": null,
+      "blockHeight": 1899682,
+      "contract": undefined,
+      "extra": Object {},
+      "fee": "0",
+      "hash": "bafy2bzaceawypi647m4rz5czma3xm7syif67bfzce5q2w2tifd5jrvqeaowok",
+      "id": "js:2:filecoin:t15lauyzdivqj7m3yob3rxmzdsy7uyhfflwyheuri:gliflegacy-bafy2bzaceawypi647m4rz5czma3xm7syif67bfzce5q2w2tifd5jrvqeaowok-IN",
+      "operator": undefined,
+      "recipients": Array [
+        "t15lauyzdivqj7m3yob3rxmzdsy7uyhfflwyheuri",
+      ],
+      "senders": Array [
+        "f1ov6d42tujoyexkbdh34oik2vhe5unqo2a5ocqoq",
+      ],
+      "standard": undefined,
+      "tokenId": undefined,
+      "type": "IN",
+      "value": "1000000000000000",
+    },
+  ],
   Array [
     Object {
       "accountId": "js:2:filecoin:f1p74d4mlmeyc4agflhjqsnvoyzyfdai7fmkyso2a:",

package/src/families/filecoin/specs.ts

@@ -19,7 +19,7 @@ const filecoinSpecs: AppSpec<Transaction> = {
     appName: "Filecoin",
   },
   genericDeviceAction: acceptTransaction,
-  testTimeout: 5 * 60 * 1000,
+  testTimeout: 6 * 60 * 1000,
   minViableAmount: MIN_SAFE,
   transactionCheck: ({ maxSpendable }) => {
     invariant(maxSpendable.gt(MIN_SAFE), "balance is too low");
@@ -59,7 +59,6 @@ const filecoinSpecs: AppSpec<Transaction> = {
     {
       name: "Transfer Max",
       maxRun: 1,
-      testDestination: genericTestDestination,
       transaction: ({ account, siblings, bridge }) => {
         return {
           transaction: bridge.createTransaction(account),

package/src/families/hedera/api/network.ts

@@ -3,6 +3,7 @@ import * as hedera from "@hashgraph/sdk";
 import { Account } from "@ledgerhq/types-live";
 import { Transaction } from "../types";
 import { AccountId } from "@hashgraph/sdk";
+import { HederaAddAccountError } from "../errors";
 
 export function broadcastTransaction(
   transaction: hedera.Transaction
@@ -37,9 +38,15 @@ export async function getAccountBalance(
   address: string
 ): Promise<AccountBalance> {
   const accountId = AccountId.fromString(address);
-  const accountBalance = await new hedera.AccountBalanceQuery({
-    accountId,
-  }).execute(getClient());
+  let accountBalance;
+
+  try {
+    accountBalance = await new hedera.AccountBalanceQuery({
+      accountId,
+    }).execute(getClient());
+  } catch {
+    throw new HederaAddAccountError();
+  }
 
   return {
     balance: accountBalance.hbars.to(hedera.HbarUnit.Tinybar),

package/src/families/hedera/errors.ts

@@ -0,0 +1,5 @@
+import { createCustomErrorClass } from "@ledgerhq/errors";
+
+export const HederaAddAccountError = createCustomErrorClass(
+  "HederaAddAccountError"
+);

package/src/families/hedera/specs.ts

@@ -102,23 +102,6 @@ const hedera: AppSpec<Transaction> = {
           updates: [{ recipient }, { useAllAmount: true }],
         };
       },
-      test: ({
-        accountBeforeTransaction,
-        account,
-        operation,
-        transaction,
-      }: TransactionTestInput<Transaction>): void => {
-        const accountBalanceAfterTx = account.balance.toNumber();
-
-        // NOTE: operation.fee is the ACTUAL (not estimated) fee cost of the transaction
-        const amount = accountBeforeTransaction.balance
-          .minus(transaction.amount.plus(operation.fee))
-          .toNumber();
-
-        botTest("account balance moved with operation", () =>
-          expect(accountBalanceAfterTx).toBe(amount)
-        );
-      },
     },
     {
       name: "Memo",