@ledgerhq/live-common 21.4.1-btcjs.4 → 21.5.0

package/src/api/explorerConfig/index.ts

@@ -15,7 +15,7 @@ const initialExplorerConfig: FullConfig = {
     id: "abc",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     /*
     experimental: {
@@ -28,7 +28,7 @@ const initialExplorerConfig: FullConfig = {
     id: "btg",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -60,7 +60,7 @@ const initialExplorerConfig: FullConfig = {
     id: "dgb",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -71,7 +71,7 @@ const initialExplorerConfig: FullConfig = {
     id: "doge",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -89,7 +89,7 @@ const initialExplorerConfig: FullConfig = {
     id: "kmd",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     /*
     experimental: {
@@ -109,7 +109,7 @@ const initialExplorerConfig: FullConfig = {
     id: "ppc",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -120,7 +120,7 @@ const initialExplorerConfig: FullConfig = {
     id: "pivx",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -138,7 +138,7 @@ const initialExplorerConfig: FullConfig = {
     id: "qtum",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -149,14 +149,14 @@ const initialExplorerConfig: FullConfig = {
     id: "xsn",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
   },
   stratis: {
     id: "strat",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
   },
   stealthcoin: {
@@ -170,7 +170,7 @@ const initialExplorerConfig: FullConfig = {
     id: "vtc",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -181,7 +181,7 @@ const initialExplorerConfig: FullConfig = {
     id: "via",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -192,7 +192,7 @@ const initialExplorerConfig: FullConfig = {
     id: "zec",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -203,7 +203,7 @@ const initialExplorerConfig: FullConfig = {
     id: "zen",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",
@@ -214,7 +214,7 @@ const initialExplorerConfig: FullConfig = {
     id: "btc_testnet",
     stable: {
       base: "EXPLORER",
-      version: "v3",
+      version: "v2",
     },
     experimental: {
       base: "EXPLORER",

package/src/apps/polyfill.ts

@@ -43,6 +43,11 @@ export const whitelistDependencies = ["Decred", "Decred Testnet"];
   ["ZenCash", "Bitcoin"],
   ["Paraswap", "Ethereum"],
   ["Lido", "Ethereum"],
+  ["1inch", "Ethereum"],
+  ["Aave", "Ethereum"],
+  ["Compound", "Ethereum"],
+  ["Opensea", "Ethereum"],
+  ["StakeDAO", "Ethereum"],
 ].forEach(([name, dep]) => declareDep(name, dep));
 export const getDependencies = (appName: string): string[] =>
   directDep[appName] || [];

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,
@@ -32,7 +31,6 @@ import type {
   ScanAccountEvent,
   SyncConfig,
   CryptoCurrency,
-  DerivationMode,
 } from "../types";
 import type { CurrencyBridge, AccountBridge } from "../types/bridge";
 import getAddress from "../hw/getAddress";
@@ -43,11 +41,7 @@ export type GetAccountShape = (
     currency: CryptoCurrency;
     address: string;
     id: string;
-    index: number;
     initialAccount?: Account;
-    derivationPath: string;
-    derivationMode: DerivationMode;
-    transport?: Transport;
     rest?: any;
   },
   arg1: SyncConfig
@@ -123,19 +117,11 @@ export const makeSync =
         const needClear = initial.id !== accountId;
 
         try {
-          const freshAddressPath = getSeedIdentifierDerivation(
-            initial.currency,
-            initial.derivationMode
-          );
-
           const shape = await getAccountShape(
             {
               currency: initial.currency,
               id: accountId,
-              index: initial.index,
               address: initial.freshAddress,
-              derivationPath: freshAddressPath,
-              derivationMode: initial.derivationMode,
               initialAccount: needClear ? clearAccount(initial) : initial,
             },
             syncConfig
@@ -190,20 +176,15 @@ 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,
             id: accountId,
-            index,
             address,
-            derivationPath: freshAddressPath,
-            derivationMode,
             rest,
           },
           syncConfig
@@ -332,8 +313,7 @@ export const makeScanAccounts =
                 index,
                 res,
                 derivationMode,
-                seedIdentifier,
-                transport
+                seedIdentifier
               );
               log(
                 "scanAccounts",

package/src/env.ts

@@ -156,7 +156,7 @@ const envDefinitions = {
     desc: "location of the crypto.org indexer API",
   },
   CRYPTO_ORG_TESTNET_INDEXER: {
-    def: "https://crypto.org/explorer/croeseid3",
+    def: "https://crypto.org/explorer/croeseid4",
     parser: stringParser,
     desc: "location of the crypto.org indexer testnet API",
   },
@@ -166,7 +166,7 @@ const envDefinitions = {
     desc: "location of the crypto.org indexer API",
   },
   CRYPTO_ORG_TESTNET_RPC_URL: {
-    def: "https://testnet-croeseid-3.crypto.org:26657",
+    def: "https://testnet-croeseid-4.crypto.org:26657",
     parser: stringParser,
     desc: "location of the crypto.org chain testnet node",
   },

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")
           },
         },
       ],

package/src/families/bitcoin/serialization.ts

@@ -38,7 +38,6 @@ export function toBitcoinOutputRaw({
   outputIndex,
   blockHeight,
   address,
-  isChange,
   path,
   value,
   rbf,
@@ -48,7 +47,6 @@ export function toBitcoinOutputRaw({
     outputIndex,
     blockHeight,
     address,
-    isChange ? 1 : 0,
     path,
     value.toString(),
     rbf ? 1 : 0,
@@ -59,7 +57,6 @@ export function fromBitcoinOutputRaw([
   outputIndex,
   blockHeight,
   address,
-  isChange,
   path,
   value,
   rbf,
@@ -69,7 +66,6 @@ export function fromBitcoinOutputRaw([
     outputIndex,
     blockHeight: blockHeight || undefined,
     address: address || undefined,
-    isChange: !!isChange,
     path: path || undefined,
     value: new BigNumber(value),
     rbf: !!rbf,
@@ -80,7 +76,6 @@ export function toBitcoinResourcesRaw(
 ): BitcoinResourcesRaw {
   return {
     utxos: r.utxos.map(toBitcoinOutputRaw),
-    serializedData: r.serializedData,
   };
 }
 export function fromBitcoinResourcesRaw(
@@ -88,6 +83,5 @@ export function fromBitcoinResourcesRaw(
 ): BitcoinResources {
   return {
     utxos: r.utxos.map(fromBitcoinOutputRaw),
-    serializedData: r.serializedData,
   };
 }

package/src/families/bitcoin/specs.ts

@@ -10,7 +10,8 @@ import { pickSiblings } from "../../bot/specs";
 import { bitcoinPickingStrategy } from "./types";
 import type { MutationSpec, AppSpec } from "../../bot/types";
 import { LowerThanMinimumRelayFee } from "../../errors";
-import { getMinRelayFee, getUTXOStatus, isChangeOutput } from "./logic";
+import { getMinRelayFee } from "./fees";
+import { isChangeOutput, getUTXOStatus } from "./transaction";
 import { DeviceModelId } from "@ledgerhq/devices";
 type Arg = Partial<{
   minimalAmount: BigNumber;
@@ -80,11 +81,7 @@ const genericTest = ({
         ? operation.senders
         : txInputs.map((t) => t.address).filter(Boolean),
       recipients: txOutputs
-        // TODO REPLACE >>>>>>>>>>>>>>>>>>
         .filter((o) => !isChangeOutput(o))
-        /*/ WITH <<<<<<<<<<<<<<<<<<<<<<<<<
-        .filter((o) => !o.isChange)
-        //*/
         .map((t) => t.address)
         .filter(Boolean),
     })

package/src/families/bitcoin/speculos-deviceActions.ts

@@ -2,7 +2,7 @@ import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { deviceActionFlow } from "../../bot/specs";
-import { perCoinLogic } from "./logic";
+import { perCoinLogic } from "./transaction";
 const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
   steps: [
     {

package/src/families/bitcoin/test-dataset.ts

@@ -19,7 +19,7 @@ import vertcoin from "./datasets/vertcoin";
 import viacoin from "./datasets/viacoin";
 import zcash from "./datasets/zcash";
 const dataset: DatasetTest<Transaction> = {
-  implementations: ["js", "mock"],
+  implementations: ["libcore", "mock"],
   currencies: {
     bitcoin_cash,
     bitcoin_gold,

package/src/families/bitcoin/transaction.ts

@@ -25,102 +25,6 @@ import { formatCurrencyUnit } from "../../currencies";
 import type { CryptoCurrencyIds } from "../../types";
 import { libcoreAmountToBigNumber } from "../../libcore/buildBigNumber";
 
-const fromFeeItemsRaw = (fir: FeeItemsRaw): FeeItems => ({
-  items: fir.items.map((fi) => ({
-    key: fi.key,
-    speed: fi.speed,
-    feePerByte: new BigNumber(fi.feePerByte),
-  })),
-  defaultFeePerByte: new BigNumber(fir.defaultFeePerByte),
-});
-
-const toFeeItemsRaw = (fir: FeeItems): FeeItemsRaw => ({
-  items: fir.items.map((fi) => ({
-    key: fi.key,
-    speed: fi.speed,
-    feePerByte: fi.feePerByte.toString(),
-  })),
-  defaultFeePerByte: fir.defaultFeePerByte.toString(),
-});
-
-export const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
-  const common = fromTransactionCommonRaw(tr);
-  return {
-    ...common,
-    rbf: tr.rbf,
-    utxoStrategy: tr.utxoStrategy,
-    family: tr.family,
-    feePerByte: tr.feePerByte ? new BigNumber(tr.feePerByte) : null,
-    networkInfo: tr.networkInfo && {
-      family: tr.networkInfo.family,
-      feeItems: fromFeeItemsRaw(tr.networkInfo.feeItems),
-    },
-    feesStrategy: tr.feesStrategy,
-  };
-};
-export const toTransactionRaw = (t: Transaction): TransactionRaw => {
-  const common = toTransactionCommonRaw(t);
-  return {
-    ...common,
-    rbf: t.rbf,
-    utxoStrategy: t.utxoStrategy,
-    family: t.family,
-    feePerByte: t.feePerByte ? t.feePerByte.toString() : null,
-    networkInfo: t.networkInfo && {
-      family: t.networkInfo.family,
-      feeItems: toFeeItemsRaw(t.networkInfo.feeItems),
-    },
-    feesStrategy: t.feesStrategy,
-  };
-};
-
-const formatNetworkInfo = (
-  networkInfo:
-    | {
-        feeItems: FeeItems;
-      }
-    | null
-    | undefined
-) => {
-  if (!networkInfo) return "network info not loaded";
-  return `network fees: ${networkInfo.feeItems.items
-    .map((i) => i.key + "=" + i.feePerByte.toString())
-    .join(", ")}`;
-};
-
-export const formatTransaction = (t: Transaction, account: Account): string => {
-  const n = getEnv("DEBUG_UTXO_DISPLAY");
-  const { excludeUTXOs, strategy, pickUnconfirmedRBF } = t.utxoStrategy;
-  const displayAll = excludeUTXOs.length <= n;
-  return `
-SEND ${
-    t.useAllAmount
-      ? "MAX"
-      : formatCurrencyUnit(getAccountUnit(account), t.amount, {
-          showCode: true,
-          disableRounding: true,
-        })
-  }
-TO ${t.recipient}
-with feePerByte=${
-    t.feePerByte ? t.feePerByte.toString() : "?"
-  } (${formatNetworkInfo(t.networkInfo)})
-${[
-  Object.keys(bitcoinPickingStrategy).find(
-    (k) => bitcoinPickingStrategy[k] === strategy
-  ),
-  pickUnconfirmedRBF && "pick-unconfirmed",
-  t.rbf && "RBF-enabled",
-]
-  .filter(Boolean)
-  .join(" ")}${excludeUTXOs
-    .slice(0, displayAll ? excludeUTXOs.length : n)
-    .map((utxo) => `\nexclude ${utxo.hash} @${utxo.outputIndex}`)
-    .join("")}`;
-};
-
-// TODO vvvvv DEPRECATED, TO BE REMOVED vvvvv
-
 function bchExplicit(str: string): string {
   const explicit = str.includes(":") ? str : "bitcoincash:" + str;
 
@@ -254,7 +158,6 @@ export async function parseBitcoinOutput(
     outputIndex,
     blockHeight,
     address,
-    isChange: false,
     path,
     value,
     rbf,
@@ -298,8 +201,100 @@ export function isChangeOutput(output: BitcoinOutput): boolean {
   const p = output.path.split("/");
   return p[p.length - 2] === "1";
 }
-// ==============================================================================
 
+const fromFeeItemsRaw = (fir: FeeItemsRaw): FeeItems => ({
+  items: fir.items.map((fi) => ({
+    key: fi.key,
+    speed: fi.speed,
+    feePerByte: new BigNumber(fi.feePerByte),
+  })),
+  defaultFeePerByte: new BigNumber(fir.defaultFeePerByte),
+});
+
+const toFeeItemsRaw = (fir: FeeItems): FeeItemsRaw => ({
+  items: fir.items.map((fi) => ({
+    key: fi.key,
+    speed: fi.speed,
+    feePerByte: fi.feePerByte.toString(),
+  })),
+  defaultFeePerByte: fir.defaultFeePerByte.toString(),
+});
+
+export const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
+  const common = fromTransactionCommonRaw(tr);
+  return {
+    ...common,
+    rbf: tr.rbf,
+    utxoStrategy: tr.utxoStrategy,
+    family: tr.family,
+    feePerByte: tr.feePerByte ? new BigNumber(tr.feePerByte) : null,
+    networkInfo: tr.networkInfo && {
+      family: tr.networkInfo.family,
+      feeItems: fromFeeItemsRaw(tr.networkInfo.feeItems),
+    },
+    feesStrategy: tr.feesStrategy,
+  };
+};
+export const toTransactionRaw = (t: Transaction): TransactionRaw => {
+  const common = toTransactionCommonRaw(t);
+  return {
+    ...common,
+    rbf: t.rbf,
+    utxoStrategy: t.utxoStrategy,
+    family: t.family,
+    feePerByte: t.feePerByte ? t.feePerByte.toString() : null,
+    networkInfo: t.networkInfo && {
+      family: t.networkInfo.family,
+      feeItems: toFeeItemsRaw(t.networkInfo.feeItems),
+    },
+    feesStrategy: t.feesStrategy,
+  };
+};
+
+const formatNetworkInfo = (
+  networkInfo:
+    | {
+        feeItems: FeeItems;
+      }
+    | null
+    | undefined
+) => {
+  if (!networkInfo) return "network info not loaded";
+  return `network fees: ${networkInfo.feeItems.items
+    .map((i) => i.key + "=" + i.feePerByte.toString())
+    .join(", ")}`;
+};
+
+export const formatTransaction = (t: Transaction, account: Account): string => {
+  const n = getEnv("DEBUG_UTXO_DISPLAY");
+  const { excludeUTXOs, strategy, pickUnconfirmedRBF } = t.utxoStrategy;
+  const displayAll = excludeUTXOs.length <= n;
+  return `
+SEND ${
+    t.useAllAmount
+      ? "MAX"
+      : formatCurrencyUnit(getAccountUnit(account), t.amount, {
+          showCode: true,
+          disableRounding: true,
+        })
+  }
+TO ${t.recipient}
+with feePerByte=${
+    t.feePerByte ? t.feePerByte.toString() : "?"
+  } (${formatNetworkInfo(t.networkInfo)})
+${[
+  Object.keys(bitcoinPickingStrategy).find(
+    (k) => bitcoinPickingStrategy[k] === strategy
+  ),
+  pickUnconfirmedRBF && "pick-unconfirmed",
+  t.rbf && "RBF-enabled",
+]
+  .filter(Boolean)
+  .join(" ")}${excludeUTXOs
+    .slice(0, displayAll ? excludeUTXOs.length : n)
+    .map((utxo) => `\nexclude ${utxo.hash} @${utxo.outputIndex}`)
+    .join("")}`;
+};
 export default {
   fromTransactionRaw,
   toTransactionRaw,