@ledgerhq/live-common 21.8.2 → 21.10.0-btcjs.2

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

@@ -6,13 +6,13 @@ Array [
     "ETH",
     "45576946679992284984",
     "1100615410442982129.195708479262007296",
-    0.5251034370469378,
+    0.525103437046938,
   ],
   Array [
     "ETC",
     "1.308866527562764971671e+21",
     "995381933382484927.8290468148470691773",
-    0.47489656190003576,
+    0.4748965619000359,
   ],
   Array [
     "BTC",
@@ -87,22 +87,22 @@ Array [
     1.740995e-14,
   ],
   Array [
-    "NAS",
+    "NEXO",
     "58162293",
-    "1975.45035313065469060584",
-    9.4249e-16,
+    "733.585353638926575070494",
+    3.4999e-16,
   ],
   Array [
-    "MATIC",
-    "43091467",
-    "77.5848000790256780254232",
-    3.702e-17,
+    "NAS",
+    "21465930",
+    "729.0785285713875558984",
+    3.4784e-16,
   ],
   Array [
     "ONE",
-    "21465930",
-    "6.153529424137567291116",
-    2.94e-18,
+    "43091467",
+    "12.3528125785257375005604",
+    5.89e-18,
   ],
 ]
 `;

package/src/__tests__/currencies.ts

@@ -69,6 +69,7 @@ test("sort by marketcap", () => {
     "stealthcoin",
     "ethereum/erc20/hydro_protocol",
     "ethereum/erc20/xensor",
+    "ethereum/erc20/xstable.protocol",
   ]);
 });
 test("can format a currency unit", () => {

package/src/__tests__/families/bitcoin/logic.ts

@@ -15,26 +15,19 @@ describe("Test isValidRecipient", () => {
       ).rejects.toBeInstanceOf(InvalidAddress);
     }
   }
-  test("Fail on non-existing currency", () => {
-    t("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", "ontology", false);
-  });
-  test("Fail on mainnet addr on bitcoin_testnet", () => {
-    t("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", "bitcoin_testnet", false);
-  });
-  test("Success on valid address", () => {
-    t("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", "bitcoin", true);
-  });
-  test("Success on valid qtum address", () => {
-    t("xCREYTgvdk3XzFNpdXkj35fZX4hJK2Ckpd", "qtum", true);
-  });
-  test("Fail on invalid qtum address", () => {
-    t("xCREYTgvdk3XzFNpdXkj35fZX4hJK2Ckpe", "qtum", false);
-  });
-  test("Fail on invalid bch address", () => {
-    t("qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg3", "bitcoin_cash", false);
-  });
+  test("Fail on non-existing currency", () =>
+    t("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", "ontology", false));
+  test("Fail on mainnet addr on bitcoin_testnet", () =>
+    t("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", "bitcoin_testnet", false));
+  test("Success on valid address", () =>
+    t("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", "bitcoin", true));
+  test("Success on valid qtum address", () =>
+    t("xCREYTgvdk3XzFNpdXkj35fZX4hJK2Ckpd", "qtum", true));
+  test("Fail on invalid qtum address", () =>
+    t("xCREYTgvdk3XzFNpdXkj35fZX4hJK2Ckpe", "qtum", false));
+  test("Fail on invalid bch address", () =>
+    t("qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg3", "bitcoin_cash", false));
   // TODO Enable once fixed in wallet-btc
-  test.skip("Success on valid bch address", () => {
-    t("qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg2", "bitcoin_cash", true);
-  });
+  test.skip("Success on valid bch address", () =>
+    t("qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg2", "bitcoin_cash", true));
 });

package/src/__tests__/families/bitcoin/wallet-btc/wallet.estimateMaxSpendable.test.ts

@@ -2,14 +2,13 @@ import { DerivationModes } from "../../../../families/bitcoin/wallet-btc/types";
 import BitcoinLikeWallet from "../../../../families/bitcoin/wallet-btc/wallet";
 import * as utils from "../../../../families/bitcoin/wallet-btc/utils";
 import { Account } from "../../../../families/bitcoin/wallet-btc/account";
-import MockBtc from "../../../../mock/Btc";
 
 describe("testing estimateMaxSpendable", () => {
   const wallet = new BitcoinLikeWallet();
   let account: Account;
   it("should generate an account", async () => {
     account = await wallet.generateAccount({
-      btc: new MockBtc(),
+      xpub: "xpub6CV2NfQJYxHn7MbSQjQip3JMjTZGUbeoKz5xqkBftSZZPc7ssVPdjKrgh6N8U1zoQDxtSo6jLarYAQahpd35SJoUKokfqf1DZgdJWZhSMqP",
       path: "44'/0'",
       index: 0,
       currency: "bitcoin",

package/src/__tests__/families/bitcoin/wallet-btc/wallet.integration.test.ts

@@ -10,7 +10,7 @@ describe("testing wallet", () => {
   let account: Account;
   it("should generate an account", async () => {
     account = await wallet.generateAccount({
-      btc: new MockBtc(),
+      xpub: "xpub6CV2NfQJYxHn7MbSQjQip3JMjTZGUbeoKz5xqkBftSZZPc7ssVPdjKrgh6N8U1zoQDxtSo6jLarYAQahpd35SJoUKokfqf1DZgdJWZhSMqP",
       path: "44'/0'",
       index: 0,
       currency: "bitcoin",
@@ -56,6 +56,7 @@ describe("testing wallet", () => {
       amount: new BigNumber(100000),
       feePerByte: 5,
       utxoPickingStrategy,
+      sequence: 0,
     });
     const tx = await wallet.signAccountTx({
       btc: new MockBtc(),
@@ -79,6 +80,7 @@ describe("testing wallet", () => {
       amount: new BigNumber(100000),
       feePerByte: 5,
       utxoPickingStrategy,
+      sequence: 0,
     });
     const tx = await wallet.signAccountTx({
       btc: new MockBtc(),

package/src/__tests__/families/bitcoin/wallet-btc/xpub.syncing.integration.test.ts

@@ -89,6 +89,7 @@ describe("xpub integration sync", () => {
       coin: "bch",
       explorerVersion: "v3",
     },
+    /*
     {
       xpub: "xpub6CThYZbX4PTeA7KRYZ8YXP3F6HwT2eVKPQap3Avieds3p1eos35UzSsJtTbJ3vQ8d3fjRwk4bCEz4m4H6mkFW49q29ZZ6gS8tvahs4WCZ9X", // 138sec,
       derivationMode: DerivationModes.LEGACY,
@@ -98,6 +99,7 @@ describe("xpub integration sync", () => {
       coin: "btc",
       explorerVersion: "v3",
     },
+    */
     {
       xpub: "Ltub2ZgHGhWdGi2jacCdKEy3qddYxH4bpDtmueiPWkG8267Z9K8yQEExapyNi1y4Qp7f79JN8468uE9V3nizpPU27WEDfXrtqpkp84MyhhCDTNk",
       addresses: 5,

package/src/__tests__/families/bitcoin/wallet-btc/xpub.txs.NP2WPKH.integration.test.ts

@@ -100,6 +100,7 @@ describe.skip("testing xpub segwit transactions", () => {
         feePerByte: 100,
         changeAddress,
         utxoPickingStrategy,
+        sequence: 0,
       });
 
     inputs.forEach((input, i) => {

package/src/__tests__/families/bitcoin/wallet-btc/xpub.txs.P2WPKH.integration.test.ts

@@ -102,6 +102,7 @@ describe.skip("testing xpub native segwit transactions", () => {
         feePerByte: 100,
         changeAddress,
         utxoPickingStrategy,
+        sequence: 0,
       });
 
     inputs.forEach((input, i) => {

package/src/__tests__/families/bitcoin/wallet-btc/xpub.txs.integration.test.ts

@@ -108,6 +108,7 @@ describe.skip("testing xpub legacy transactions", () => {
         feePerByte: 100,
         changeAddress,
         utxoPickingStrategy,
+        sequence: 0,
       });
 
     inputs.forEach((i: InputInfo) => {
@@ -225,6 +226,7 @@ describe.skip("testing xpub legacy transactions", () => {
         feePerByte: 100,
         changeAddress,
         utxoPickingStrategy,
+        sequence: 0,
       });
 
     inputs.forEach((i) => {

package/src/__tests__/families/bitcoin/wallet-btc/xpub.txs.litecoin.test.ts

@@ -100,6 +100,7 @@ describe.skip("testing xpub legacy litecoin transactions", () => {
         feePerByte: 100,
         changeAddress,
         utxoPickingStrategy,
+        sequence: 0,
       });
 
     inputs.forEach((input) => {

package/src/account/helpers.ts

@@ -13,6 +13,8 @@ import { getEnv } from "../env";
 import { encodeTokenAccountId } from "./accountId";
 import { emptyHistoryCache } from "./balanceHistoryCache";
 import { isAccountDelegating } from "../families/tezos/bakers";
+import { initialBitcoinResourcesValue } from "../families/bitcoin/types";
+
 // by convention, a main account is the top level account
 // in case of an Account is the account itself
 // in case of a TokenAccount it's the parentAccount
@@ -128,13 +130,9 @@ export function clearAccount<T extends AccountLike>(account: T): T {
     };
   }
 
-  const copy = {
+  const copy: Account = {
     ...account,
     balanceHistoryCache: emptyHistoryCache,
-    tronResources: (account as Account).tronResources && {
-      ...(account as Account).tronResources,
-      cacheTransactionInfoById: {},
-    },
     lastSyncDate: new Date(0),
     operations: [],
     pendingOperations: [],
@@ -142,8 +140,17 @@ export function clearAccount<T extends AccountLike>(account: T): T {
       (account as Account).subAccounts &&
       (account as Account).subAccounts?.map(clearAccount),
   };
+  if (copy.tronResources) {
+    copy.tronResources = {
+      ...copy.tronResources,
+      cacheTransactionInfoById: {},
+    };
+  }
+  if (copy.bitcoinResources) {
+    copy.bitcoinResources = initialBitcoinResourcesValue;
+  }
   delete copy.balanceHistory;
-  return copy;
+  return copy as T;
 }
 export function findSubAccountById(
   account: Account,

package/src/account/support.ts

@@ -74,7 +74,8 @@ export const shouldShowNewAccount = (
   // native segwit being not yet supported everywhere, segwit is always available for creation
   if (
     derivationMode === "segwit" ||
-    (currency.family === "bitcoin" && derivationMode === "native_segwit")
+    (currency.family === "bitcoin" &&
+      (derivationMode === "native_segwit" || derivationMode === "taproot"))
   )
     return true;
   return false;

package/src/api/explorerConfig/index.ts

@@ -27,10 +27,6 @@ const initialExplorerConfig: FullConfig = {
   bitcoin_gold: {
     id: "btg",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -60,10 +56,6 @@ const initialExplorerConfig: FullConfig = {
   digibyte: {
     id: "dgb",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -108,10 +100,6 @@ const initialExplorerConfig: FullConfig = {
   peercoin: {
     id: "ppc",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -119,10 +107,6 @@ const initialExplorerConfig: FullConfig = {
   pivx: {
     id: "pivx",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -138,10 +122,6 @@ const initialExplorerConfig: FullConfig = {
   qtum: {
     id: "qtum",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -174,10 +154,6 @@ const initialExplorerConfig: FullConfig = {
   vertcoin: {
     id: "vtc",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -185,10 +161,6 @@ const initialExplorerConfig: FullConfig = {
   viacoin: {
     id: "via",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -196,10 +168,6 @@ const initialExplorerConfig: FullConfig = {
   zcash: {
     id: "zec",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },
@@ -207,10 +175,6 @@ const initialExplorerConfig: FullConfig = {
   zencash: {
     id: "zen",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },

package/src/bridge/jsHelpers.ts

@@ -26,7 +26,7 @@ import {
   recalculateAccountBalanceHistories,
   encodeAccountId,
 } from "../account";
-import { FreshAddressIndexInvalid } from "../errors";
+import { FreshAddressIndexInvalid, UnsupportedDerivation } from "../errors";
 import type {
   Operation,
   Account,
@@ -37,6 +37,7 @@ import type {
 } from "../types";
 import type { CurrencyBridge, AccountBridge } from "../types/bridge";
 import getAddress from "../hw/getAddress";
+import type { Result, GetAddressOptions } from "../hw/getAddress/types";
 import { open, close } from "../hw";
 import { withDevice } from "../hw/deviceAccess";
 
@@ -183,7 +184,12 @@ export const makeSync =
     });
 
 export const makeScanAccounts =
-  (getAccountShape: GetAccountShape): CurrencyBridge["scanAccounts"] =>
+  (
+    getAccountShape: GetAccountShape,
+    getAddressFn?: (
+      transport: Transport
+    ) => (opts: GetAddressOptions) => Promise<Result>
+  ): CurrencyBridge["scanAccounts"] =>
   ({ currency, deviceId, syncConfig }): Observable<ScanAccountEvent> =>
     Observable.create((o) => {
       let finished = false;
@@ -282,6 +288,9 @@ export const makeScanAccounts =
 
         try {
           transport = await open(deviceId);
+          const getAddr = getAddressFn
+            ? getAddressFn(transport)
+            : (opts) => getAddress(transport, opts);
           const derivationModes = getDerivationModesForCurrency(currency);
 
           for (const derivationMode of derivationModes) {
@@ -294,12 +303,23 @@ export const makeScanAccounts =
             let result = derivationsCache[path];
 
             if (!result) {
-              result = await getAddress(transport, {
-                currency,
-                path,
-                derivationMode,
-              });
-              derivationsCache[path] = result;
+              try {
+                result = await getAddr({
+                  currency,
+                  path,
+                  derivationMode,
+                });
+                derivationsCache[path] = result;
+              } catch (e) {
+                if (e instanceof UnsupportedDerivation) {
+                  log(
+                    "scanAccounts",
+                    "ignore derivationMode=" + derivationMode
+                  );
+                  continue;
+                }
+                throw e;
+              }
             }
 
             if (!result) continue;