@ledgerhq/live-common 21.5.1-btcjs.3 → 21.7.1

package/src/__tests__/__snapshots__/portfolio.v2.ts.snap

@@ -1774,7 +1774,6 @@ Object {
         },
       },
       "bitcoinResources": Object {
-        "serializedData": Object {},
         "utxos": Array [],
       },
       "blockHeight": 132858,
@@ -4111,7 +4110,6 @@ Object {
         },
       },
       "bitcoinResources": Object {
-        "serializedData": Object {},
         "utxos": Array [],
       },
       "blockHeight": 132858,
@@ -4747,7 +4745,6 @@ Object {
         },
       },
       "bitcoinResources": Object {
-        "serializedData": Object {},
         "utxos": Array [],
       },
       "blockHeight": 132858,

package/src/__tests__/test-helpers/bridge.ts

@@ -627,7 +627,7 @@ export function testBridge<T extends Transaction>(
               const account = await getSynced();
               const t = { ...bridge.createTransaction(account) };
               const status = await bridge.getTransactionStatus(account, t);
-              expect(status.errors.recipient).toBeInstanceOf(RecipientRequired);
+              expect(status.errors.recipient).toEqual(new RecipientRequired());
             }
           );
           makeTest("invalid recipient have a recipientError", async () => {
@@ -637,7 +637,7 @@ export function testBridge<T extends Transaction>(
               recipient: "invalidADDRESS",
             };
             const status = await bridge.getTransactionStatus(account, t);
-            expect(status.errors.recipient).toBeInstanceOf(InvalidAddress);
+            expect(status.errors.recipient).toEqual(new InvalidAddress());
           });
           const accountDataTest = accountData.test;
 

package/src/account/addAccounts.ts

@@ -27,8 +27,7 @@ function sameAccountIdentity(a: Account, b: Account) {
     a.id === b.id ||
     (a.freshAddress
       ? a.currency === b.currency && a.freshAddress === b.freshAddress
-      : false) ||
-    (a.xpub ? a.currency === b.currency && a.xpub === b.xpub : false)
+      : false)
   );
 }
 

package/src/account/formatters.ts

@@ -72,12 +72,12 @@ function maybeDisplaySumOfOpsIssue(ops, balance, unit) {
 
 const cliFormat = (account, level?: string) => {
   const {
-    id,
     name,
     freshAddress,
     freshAddressPath,
     derivationMode,
     index,
+    xpub,
     operations,
   } = account;
   const balance = formatCurrencyUnit(account.unit, account.balance, {
@@ -87,7 +87,7 @@ const cliFormat = (account, level?: string) => {
   const freshInfo = `${freshAddress} on ${freshAddressPath}`;
   const derivationInfo = `${derivationMode}#${index}`;
   let str = `${name}: ${balance} (${opsCount}) (${freshInfo}) ${derivationInfo} ${
-    id || ""
+    xpub || ""
   }`;
   if (level === "head") return str;
   str += maybeDisplaySumOfOpsIssue(

package/src/account/support.ts

@@ -20,30 +20,7 @@ import { getMainAccount } from "../account";
 import { getAccountBridge } from "../bridge";
 import jsBridges from "../generated/bridge/js";
 
-const experimentalIntegrations = [
-  "bitcoin",
-  "bsc",
-  "bitcoin_cash",
-  "litecoin",
-  "dash",
-  "qtum",
-  "zcash",
-  "bitcoin_gold",
-  "stratis",
-  "dogecoin",
-  "digibyte",
-  "komodo",
-  "pivx",
-  "zencash",
-  "vertcoin",
-  "peercoin",
-  "viacoin",
-  "stakenet",
-  "stealthcoin",
-  "decred",
-  "bitcoin_testnet",
-  "tezos",
-];
+const experimentalIntegrations = ["tezos"];
 export function shouldUseJS(currency: CryptoCurrency) {
   const jsBridge = jsBridges[currency.family];
   if (!jsBridge) return false;

package/src/api/explorerConfig/index.ts

@@ -7,10 +7,6 @@ const initialExplorerConfig: FullConfig = {
   bitcoin: {
     id: "btc",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -21,10 +17,12 @@ const initialExplorerConfig: FullConfig = {
       base: "EXPLORER",
       version: "v2",
     },
+    /*
     experimental: {
       base: "EXPLORER",
       version: "v3",
     },
+    */
   },
   bitcoin_gold: {
     id: "btg",
@@ -37,7 +35,6 @@ const initialExplorerConfig: FullConfig = {
       version: "v3",
     },
   },
-  // FIXME Doesn't seem supported, should we remove?
   clubcoin: {
     id: "club",
     stable: {
@@ -48,10 +45,6 @@ const initialExplorerConfig: FullConfig = {
   dash: {
     id: "dash",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -59,10 +52,6 @@ const initialExplorerConfig: FullConfig = {
   decred: {
     id: "dcr",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -89,7 +78,6 @@ const initialExplorerConfig: FullConfig = {
       version: "v3",
     },
   },
-  // FIXME Doesn't seem supported, should we remove?
   hcash: {
     id: "hsr",
     stable: {
@@ -103,18 +91,16 @@ const initialExplorerConfig: FullConfig = {
       base: "EXPLORER",
       version: "v2",
     },
+    /*
     experimental: {
       base: "EXPLORER",
       version: "v3",
     },
+    */
   },
   litecoin: {
     id: "ltc",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -141,7 +127,6 @@ const initialExplorerConfig: FullConfig = {
       version: "v3",
     },
   },
-  // FIXME Doesn't seem supported, should we remove?
   poswallet: {
     id: "posw",
     stable: {
@@ -166,10 +151,6 @@ const initialExplorerConfig: FullConfig = {
       base: "EXPLORER",
       version: "v2",
     },
-    experimental: {
-      base: "EXPLORER",
-      version: "v3",
-    },
   },
   stratis: {
     id: "strat",
@@ -177,10 +158,6 @@ const initialExplorerConfig: FullConfig = {
       base: "EXPLORER",
       version: "v2",
     },
-    experimental: {
-      base: "EXPLORER",
-      version: "v3",
-    },
   },
   stealthcoin: {
     id: "xst",
@@ -188,10 +165,6 @@ const initialExplorerConfig: FullConfig = {
       base: "EXPLORER",
       version: "v2",
     },
-    experimental: {
-      base: "EXPLORER",
-      version: "v3",
-    },
   },
   vertcoin: {
     id: "vtc",
@@ -251,10 +224,6 @@ const initialExplorerConfig: FullConfig = {
   bsc: {
     id: "bnb",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },

package/src/bot/engine.ts

@@ -554,7 +554,7 @@ export function autoSignTransaction<T extends Transaction>({
                 recentEvents.map((e) => JSON.stringify(e)).join("\n")
             )
           );
-        }, 60 * 1000);
+        }, 20 * 1000);
         sub = transport.automationEvents.subscribe({
           next: (event) => {
             recentEvents.push(event);

package/src/bot/index.ts

@@ -28,11 +28,10 @@ import {
 import { getPortfolio } from "../portfolio";
 type Arg = Partial<{
   currency: string;
-  family: string;
   mutation: string;
 }>;
 const usd = getFiatCurrencyByTicker("USD");
-export async function bot({ currency, family, mutation }: Arg = {}) {
+export async function bot({ currency, mutation }: Arg = {}) {
   const SEED = getEnv("SEED");
   invariant(SEED, "SEED required");
   const libcoreVersion = await withLibcore((core) =>
@@ -44,13 +43,9 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
   const maybeCurrency = currency
     ? findCryptoCurrencyByKeyword(currency)
     : undefined;
-  const maybeFilterOnlyFamily = family;
 
   for (const family in allSpecs) {
     const familySpecs = allSpecs[family];
-    if (maybeFilterOnlyFamily && maybeFilterOnlyFamily !== family) {
-      continue;
-    }
 
     for (const key in familySpecs) {
       let spec = familySpecs[key];
@@ -260,6 +255,27 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
       body += "</details>\n\n";
     }
 
+    const failureSpecNames = results
+      .filter((r) => (r.mutations || []).some((m) => m.error))
+      .map(({ spec }) => spec.name);
+
+    if (failureSpecNames && failureSpecNames.length) {
+      slackBody += `:nogo: _${failureSpecNames.join(", ")}_\n`;
+    }
+
+    const successSpecNames = results
+      .filter(
+        (r) =>
+          r.mutations &&
+          r.mutations.length > 0 &&
+          r.mutations.every((m) => !m.error)
+      )
+      .map(({ spec }) => spec.name);
+
+    if (successSpecNames && successSpecNames.length) {
+      slackBody += `:go: _${successSpecNames.join(", ")}_\n`;
+    }
+
     if (errorCases.length) {
       body += "<details>\n";
       body += `<summary>${errorCases.length} mutation errors</summary>\n\n`;
@@ -410,7 +426,7 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
         body,
       },
     });
-    const { SLACK_API_TOKEN, SLACK_CHANNEL } = process.env;
+    const { SLACK_API_TOKEN } = process.env;
 
     if (SLACK_API_TOKEN && githubComment) {
       const text = `${String(GITHUB_WORKFLOW)}: ${title} (<${
@@ -424,7 +440,7 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
         },
         data: {
           text,
-          channel: SLACK_CHANNEL || "ledger-live-bot",
+          channel: "ledger-live-bot",
         },
       });
     }
@@ -449,7 +465,6 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
       if (c.mutation) txt += `/${c.mutation.name}`;
       txt += ` got ${String(c.error)}\n`;
     });
-    // throw new Error(txt);
-    console.error(txt);
+    throw new Error(txt);
   }
 }

package/src/bot/test.bot.ts

@@ -2,20 +2,15 @@ import { setup } from "../__tests__/test-helpers/libcore-setup";
 import { bot } from ".";
 setup("bot");
 jest.setTimeout(110 * 60 * 1000);
-const { BOT_FILTER_CURRENCY, BOT_FILTER_FAMILY } = process.env;
+const { BOT_FILTER_CURRENCY } = process.env;
 test("bot", async () => {
   const arg: {
     currency?: string;
-    family?: string;
   } = {};
 
   if (BOT_FILTER_CURRENCY) {
     arg.currency = BOT_FILTER_CURRENCY;
   }
 
-  if (BOT_FILTER_FAMILY) {
-    arg.family = BOT_FILTER_FAMILY;
-  }
-
   await bot(arg);
 });

package/src/bridge/jsHelpers.ts

@@ -3,7 +3,6 @@ import { BigNumber } from "bignumber.js";
 import { Observable, from } from "rxjs";
 import { log } from "@ledgerhq/logs";
 import { WrongDeviceForAccount } from "@ledgerhq/errors";
-import Transport from "@ledgerhq/hw-transport";
 import {
   getSeedIdentifierDerivation,
   getDerivationModesForCurrency,
@@ -24,7 +23,6 @@ import {
   emptyHistoryCache,
   generateHistoryFromOperations,
   recalculateAccountBalanceHistories,
-  encodeAccountId,
 } from "../account";
 import { FreshAddressIndexInvalid } from "../errors";
 import type {
@@ -33,22 +31,17 @@ import type {
   ScanAccountEvent,
   SyncConfig,
   CryptoCurrency,
-  DerivationMode,
 } from "../types";
 import type { CurrencyBridge, AccountBridge } from "../types/bridge";
 import getAddress from "../hw/getAddress";
 import { open, close } from "../hw";
 import { withDevice } from "../hw/deviceAccess";
-
 export type GetAccountShape = (
   arg0: {
     currency: CryptoCurrency;
     address: string;
-    index: number;
+    id: string;
     initialAccount?: Account;
-    derivationPath: string;
-    derivationMode: DerivationMode;
-    transport?: Transport;
     rest?: any;
   },
   arg1: SyncConfig
@@ -112,7 +105,6 @@ Operation[] {
 
   return all;
 }
-
 export const makeSync =
   (
     getAccountShape: GetAccountShape,
@@ -121,28 +113,15 @@ export const makeSync =
   (initial, syncConfig): Observable<AccountUpdater> =>
     Observable.create((o) => {
       async function main() {
-        const accountId = encodeAccountId({
-          type: "js",
-          version: "2",
-          currencyId: initial.currency.id,
-          xpubOrAddress: initial.xpub || initial.freshAddress,
-          derivationMode: initial.derivationMode,
-        });
+        const accountId = `js:2:${initial.currency.id}:${initial.freshAddress}:${initial.derivationMode}`;
         const needClear = initial.id !== accountId;
 
         try {
-          const freshAddressPath = getSeedIdentifierDerivation(
-            initial.currency,
-            initial.derivationMode
-          );
-
           const shape = await getAccountShape(
             {
               currency: initial.currency,
-              index: initial.index,
+              id: accountId,
               address: initial.freshAddress,
-              derivationPath: freshAddressPath,
-              derivationMode: initial.derivationMode,
               initialAccount: needClear ? clearAccount(initial) : initial,
             },
             syncConfig
@@ -179,7 +158,6 @@ export const makeSync =
 
       main();
     });
-
 export const makeScanAccounts =
   (getAccountShape: GetAccountShape): CurrencyBridge["scanAccounts"] =>
   ({ currency, deviceId, syncConfig }): Observable<ScanAccountEvent> =>
@@ -198,25 +176,20 @@ export const makeScanAccounts =
         index,
         { address, path: freshAddressPath, ...rest },
         derivationMode,
-        seedIdentifier,
-        transport
+        seedIdentifier
       ): Promise<Account | null | undefined> {
         if (finished) return;
-
+        const accountId = `js:2:${currency.id}:${address}:${derivationMode}`;
         const accountShape: Partial<Account> = await getAccountShape(
           {
-            transport,
             currency,
-            index,
+            id: accountId,
             address,
-            derivationPath: freshAddressPath,
-            derivationMode,
             rest,
           },
           syncConfig
         );
         if (finished) return;
-
         const freshAddress = address;
         const operations = accountShape.operations || [];
         const operationsCount =
@@ -228,11 +201,10 @@ export const makeScanAccounts =
         const balance = accountShape.balance || new BigNumber(0);
         const spendableBalance =
           accountShape.spendableBalance || new BigNumber(0);
-        if (!accountShape.id) throw new Error("account ID must be provided");
         if (balance.isNaN()) throw new Error("invalid balance NaN");
         const initialAccount: Account = {
           type: "Account",
-          id: accountShape.id,
+          id: accountId,
           seedIdentifier,
           freshAddress,
           freshAddressPath,
@@ -341,8 +313,7 @@ export const makeScanAccounts =
                 index,
                 res,
                 derivationMode,
-                seedIdentifier,
-                transport
+                seedIdentifier
               );
               log(
                 "scanAccounts",

package/src/cross.ts

@@ -303,36 +303,8 @@ export const accountDataToAccount = ({
   let freshAddress = inputFreshAddress || "";
   let freshAddressPath = "";
 
-  if (
-    type === "libcore" ||
-    // FIXME Dirty hack, since we have no way here to know if "xpubOrAddress" is one or the other.
-    // Proposed fix: https://ledgerhq.atlassian.net/browse/LL-7437
-    [
-      "bitcoin",
-      "bitcoin_testnet",
-      "bsc",
-      "bitcoin_cash",
-      "litecoin",
-      "dash",
-      "qtum",
-      "zcash",
-      "bitcoin_gold",
-      "stratis",
-      "dogecoin",
-      "digibyte",
-      "komodo",
-      "pivx",
-      "zencash",
-      "vertcoin",
-      "peercoin",
-      "viacoin",
-      "stakenet",
-      "stealthcoin",
-      "decred",
-    ].includes(currency.id)
-  ) {
-    // In libcore implementation, xpubOrAddress field always go in the xpub
-    // In JS implementation, only Bitcoin-like currencies store the xpub
+  if (type === "libcore") {
+    // in libcore implementation, xpubOrAddress field in the xpub
     xpub = xpubOrAddress;
   } else {
     if (!freshAddress) {

package/src/env.ts

@@ -366,6 +366,11 @@ const envDefinitions = {
     parser: stringParser,
     desc: "switch the app into a MOCK mode for test purpose, the value will be used as a seed for the rng. Avoid falsy values.",
   },
+  MOCK_SWAP_KYC: {
+    def: "",
+    parser: stringParser,
+    desc: "mock the server response for the exchange KYC check, options are 'open', 'pending', 'closed' or 'approved'.",
+  },
   OPERATION_ADDRESSES_LIMIT: {
     def: 100,
     parser: intParser,

package/src/exchange/swap/getKYCStatus.ts

@@ -2,11 +2,15 @@ import network from "../../network";
 import { getSwapAPIBaseURL } from "./";
 import type { GetKYCStatus } from "./types";
 import { SwapCheckKYCStatusFailed } from "../../errors";
+import { getEnv } from "../../env";
+import { mockGetKYCStatus } from "./mock";
 export const getKYCStatus: GetKYCStatus = async (
   provider: string,
   id: string
 ) => {
-  //if (getEnv("MOCK")) return mockGetKYCStatus(id); // TODO implement
+  const mockedStatus = getEnv("MOCK_SWAP_KYC");
+  if (mockedStatus) return mockGetKYCStatus(id, mockedStatus);
+
   const res = await network({
     method: "GET",
     url: `${getSwapAPIBaseURL()}/provider/${provider}/user/${id}`,

package/src/exchange/swap/mock.ts

@@ -4,7 +4,9 @@ import type {
   ExchangeRate,
   GetMultipleStatus,
   GetProviders,
+  KYCStatus,
   SwapRequestEvent,
+  ValidKYCStatus,
 } from "./types";
 import { getAccountUnit } from "../../account";
 import type { Transaction, TokenCurrency, CryptoCurrency } from "../../types";
@@ -176,3 +178,12 @@ export const mockGetStatus: GetMultipleStatus = async (statusList) => {
   await new Promise((r) => setTimeout(r, 800));
   return statusList.map((s) => ({ ...s, status: "finished" }));
 };
+
+export const mockGetKYCStatus = async (
+  id: string,
+  status: ValidKYCStatus
+): Promise<KYCStatus> => {
+  //Fake delay to show the pending state in the UI
+  await new Promise((r) => setTimeout(r, 2000));
+  return { id, status };
+};

package/src/families/bitcoin/account.ts

@@ -2,7 +2,7 @@ import type { Account } from "../../types";
 import type { BitcoinOutput, BitcoinInput } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { getEnv } from "../../env";
-import { perCoinLogic } from "./logic";
+import { perCoinLogic } from "./transaction";
 
 const sortUTXO = (a, b) => b.value.minus(a.value).toNumber();
 
@@ -31,7 +31,6 @@ export function formatOutput(account: Account, o: BitcoinOutput): string {
     }).padEnd(12),
     o.address,
     o.path,
-    o.isChange ? "(change)" : "",
     o.rbf ? "rbf" : "",
     o.hash,
     `@${o.outputIndex} (${

package/src/families/bitcoin/datasets/bitcoin.ts

@@ -50,8 +50,8 @@ const dataset: CurrenciesData<Transaction> = {
           expectedStatus: {
             amount: new BigNumber("999"),
             // FIXME fee are reloaded?
-            // estimatedFees: new BigNumber("250"),
-            // totalSpent: new BigNumber("1249"),
+            // estimatedFees: BigNumber("250"),
+            // totalSpent: BigNumber("1249"),
             errors: {},
             warnings: {
               // feeTooHigh: new FeeTooHigh()
@@ -76,8 +76,8 @@ const dataset: CurrenciesData<Transaction> = {
           expectedStatus: {
             amount: new BigNumber("998"),
             // FIXME fee are reloaded?
-            // estimatedFees: new BigNumber("250"),
-            // totalSpent: new BigNumber("1248"),
+            // estimatedFees: BigNumber("250"),
+            // totalSpent: BigNumber("1248"),
             errors: {},
             warnings: {
               // feeTooHigh: new FeeTooHigh()
@@ -102,8 +102,8 @@ const dataset: CurrenciesData<Transaction> = {
           expectedStatus: {
             amount: new BigNumber("997"),
             // FIXME fee are reloaded?
-            // estimatedFees: new BigNumber("250"),
-            // totalSpent: new BigNumber("1247"),
+            // estimatedFees: BigNumber("250"),
+            // totalSpent: BigNumber("1247"),
             errors: {},
             warnings: {
               // feeTooHigh: new FeeTooHigh(),

package/src/families/bitcoin/datasets/litecoin.ts

@@ -50,8 +50,8 @@ const dataset: CurrenciesData<Transaction> = {
           expectedStatus: {
             errors: {},
             warnings: {},
-            //  estimatedFees: new BigNumber("5694"),
-            amount: new BigNumber("200000"), //  totalSpent: new BigNumber("205694")
+            //  estimatedFees: BigNumber("5694"),
+            amount: new BigNumber("200000"), //  totalSpent: BigNumber("205694")
           },
         },
         {
@@ -73,8 +73,8 @@ const dataset: CurrenciesData<Transaction> = {
           expectedStatus: {
             errors: {},
             warnings: {},
-            //  estimatedFees: new BigNumber("5694"),
-            amount: new BigNumber("147200"), //  totalSpent: new BigNumber("152894")
+            //  estimatedFees: BigNumber("5694"),
+            amount: new BigNumber("147200"), //  totalSpent: BigNumber("152894")
           },
         },
         {
@@ -96,8 +96,8 @@ const dataset: CurrenciesData<Transaction> = {
           expectedStatus: {
             errors: {},
             warnings: {},
-            //  estimatedFees: new BigNumber("5694"),
-            amount: new BigNumber("205273"), //  totalSpent: new BigNumber("210967")
+            //  estimatedFees: BigNumber("5694"),
+            amount: new BigNumber("205273"), //  totalSpent: BigNumber("210967")
           },
         },
       ],