@ledgerhq/live-common 21.18.0 → 21.19.2

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live-common"
   },
-  "version": "21.18.0",
+  "version": "21.19.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "Apache-2.0",
@@ -44,13 +44,13 @@
   "dependencies": {
     "@crypto-com/chain-jslib": "0.0.19",
     "@ledgerhq/compressjs": "1.3.2",
-    "@ledgerhq/cryptoassets": "6.17.0",
+    "@ledgerhq/cryptoassets": "6.18.0",
     "@ledgerhq/devices": "6.11.2",
     "@ledgerhq/errors": "6.10.0",
     "@ledgerhq/hw-app-algorand": "6.11.2",
-    "@ledgerhq/hw-app-btc": "6.17.0",
+    "@ledgerhq/hw-app-btc": "6.17.1",
     "@ledgerhq/hw-app-cosmos": "6.11.2",
-    "@ledgerhq/hw-app-eth": "6.17.0",
+    "@ledgerhq/hw-app-eth": "6.18.0",
     "@ledgerhq/hw-app-polkadot": "6.11.2",
     "@ledgerhq/hw-app-str": "6.11.2",
     "@ledgerhq/hw-app-tezos": "6.11.2",

package/src/__tests__/__snapshots__/all.libcore.ts.snap

@@ -11485,45 +11485,6 @@ Array [
 ]
 `;
 
-exports[`bitcoin_cash currency bridge scanAccounts bitcoin_cash seed 1 1`] = `
-Array [
-  Object {
-    "balance": "0",
-    "bitcoinResources": Object {},
-    "currencyId": "bitcoin_cash",
-    "derivationMode": "",
-    "freshAddress": "bitcoincash:qrt2zkjjchuxkmr3f70tc2yppl5pxwr36uuur9lzm9",
-    "freshAddressPath": "44'/145'/0'/0/0",
-    "freshAddresses": Array [
-      Object {
-        "address": "1LZru3UChDXkw4aYzn5dFdjvNDrKp3MtiA",
-        "derivationPath": "44'/145'/0'/0/0",
-      },
-    ],
-    "id": "js:2:bitcoin_cash:xpub6D7pqJa4V3SFSigcsRaFL2mpfG7469osrMkk4ieR2uk8y1v3nuQUD8W8v36PLWQtVRSggSQM7jLpGNKH7sqCaoPSJEp9wZCVkRnMWoiUUXa:",
-    "index": 0,
-    "name": "Bitcoin Cash 1",
-    "nfts": undefined,
-    "operationsCount": 0,
-    "pendingOperations": Array [],
-    "seedIdentifier": "04884ed3fe628a8487f782f97f38e7a9f014e624f1ea679951cf3a67445ea33fb334f4cc19e6c421b3ef9943d526cd4fbfebacebe8a62cc45db79a33d3ab04bd47",
-    "spendableBalance": "0",
-    "starred": false,
-    "swapHistory": Array [],
-    "syncHash": undefined,
-    "unitMagnitude": 8,
-    "used": false,
-    "xpub": "xpub6D7pqJa4V3SFSigcsRaFL2mpfG7469osrMkk4ieR2uk8y1v3nuQUD8W8v36PLWQtVRSggSQM7jLpGNKH7sqCaoPSJEp9wZCVkRnMWoiUUXa",
-  },
-]
-`;
-
-exports[`bitcoin_cash currency bridge scanAccounts bitcoin_cash seed 1 2`] = `
-Array [
-  Array [],
-]
-`;
-
 exports[`dash currency bridge scanAccounts dash seed 1 1`] = `
 Array [
   Object {
@@ -15216,7 +15177,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -15257,7 +15218,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -15737,7 +15698,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -16072,7 +16033,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -16169,7 +16130,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -16294,7 +16255,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -16391,7 +16352,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_6026",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_6026",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -48324,7 +48285,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_0",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_0",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -48351,7 +48312,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_0",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_0",
     "unitMagnitude": 18,
     "used": true,
   },
@@ -48378,7 +48339,7 @@ Array [
     "starred": false,
     "subAccounts": Array [],
     "swapHistory": Array [],
-    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_0",
+    "syncHash": "[\\"ethereum/erc20/ampleforth\\",\\"ethereum/erc20/steth\\"]_false_0",
     "unitMagnitude": 18,
     "used": true,
   },

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

@@ -21,6 +21,7 @@ setSupportedCurrencies([
   "bitcoin",
   "ethereum",
   "bsc",
+  "polygon",
   "elrond",
   "ripple",
   "bitcoin_cash",

package/src/account/addAccounts.ts

@@ -74,7 +74,7 @@ export function groupAddAccounts(
     );
 
     if (existingAccount) {
-      if (!acc.used) {
+      if (!acc.used && !alreadyEmptyAccount) {
         alreadyEmptyAccount = existingAccount;
       }
 
@@ -122,7 +122,8 @@ export function groupAddAccounts(
           ? creatableAccounts.filter(
               (a) =>
                 context.preferredNewAccountSchemes &&
-                context.preferredNewAccountSchemes.includes(a.derivationMode)
+                // Note: we could use a simple preferredNewAccountScheme param
+                a.derivationMode === context.preferredNewAccountSchemes[0]
             )
           : creatableAccounts,
     });

package/src/account/helpers.ts

@@ -150,6 +150,7 @@ export function clearAccount<T extends AccountLike>(account: T): T {
     copy.bitcoinResources = initialBitcoinResourcesValue;
   }
   delete copy.balanceHistory;
+  delete copy.nfts;
   return copy as T;
 }
 export function findSubAccountById(

package/src/api/Ethereum.ts

@@ -10,6 +10,7 @@ import { blockchainBaseURL } from "./Ledger";
 import { FeeEstimationFailed } from "../errors";
 import { makeLRUCache } from "../cache";
 import { getEnv } from "../env";
+import { isNFTActive } from "../nft/support";
 
 export type Block = {
   height: BigNumber;
@@ -132,10 +133,9 @@ export const apiForCurrency = (currency: CryptoCurrency): API => {
       let { data } = await network({
         method: "GET",
         url: URL.format({
-          pathname:
-            getEnv("NFT") && currency.ticker === "ETH"
-              ? `https://explorers.api-01.live.ledger-stg.com/blockchain/v3/eth/addresses/${address}/transactions`
-              : `${baseURL}/addresses/${address}/transactions`,
+          pathname: isNFTActive(currency)
+            ? `https://explorers.api-01.live.ledger-stg.com/blockchain/v3/eth/addresses/${address}/transactions`
+            : `${baseURL}/addresses/${address}/transactions`,
           query: {
             batch_size,
             noinput: true,

package/src/api/explorerConfig/index.ts

@@ -63,10 +63,6 @@ const initialExplorerConfig: FullConfig = {
   dogecoin: {
     id: "doge",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },

package/src/bridge/jsHelpers.ts

@@ -134,21 +134,22 @@ export const mergeNfts = (
   const nfts = oldNfts?.slice() ?? [];
   for (let i = 0; i < nfts.length; i++) {
     const nft = nfts[i];
+
     // The NFTs are the same, do don't anything
-    if (!newNftsPerId[nft.id] || isEqual(nft, newNftsPerId[nft.id])) {
-      // NFT already in, deleting it from the newNfts to keep only the un-added ones at the end
-      delete newNftsPerId[nft.id];
-      continue;
+    if (!newNftsPerId[nft.id]) {
+      nfts.splice(i, 1);
+      i--;
+    } else if (!isEqual(nft, newNftsPerId[nft.id])) {
+      // Use the new NFT instead (as a copy cause we're deleting the reference just after)
+      nfts[i] = Object.assign({}, newNftsPerId[nft.id]);
     }
 
-    // Use the new NFT instead (as a copy cause we're deleting the reference just after)
-    nfts[i] = Object.assign({}, newNftsPerId[nft.id]);
     // Delete it from the newNfts to keep only the un-added ones at the end
     delete newNftsPerId[nft.id];
   }
 
-  // Adding the rest of newNfts that was not already in oldNfts
-  return nfts.concat(Object.values(newNftsPerId));
+  // Prepending newNfts to respect nfts's newest to oldest order
+  return Object.values(newNftsPerId).concat(nfts);
 };
 
 export const makeSync =

package/src/env.ts

@@ -381,6 +381,11 @@ const envDefinitions = {
     parser: boolParser,
     desc: "synchronizing nfts",
   },
+  NFT_CURRENCIES: {
+    def: "ethereum",
+    parser: stringParser,
+    desc: "set the currencies where NFT is active",
+  },
   NFT_ETH_METADATA_SERVICE: {
     // FIXME LL-8001
     def: "https://nft.staging.aws.ledger.fr/v1/ethereum/1/contracts/tokens/infos",

package/src/families/bitcoin/getAccountNetworkInfo.ts

@@ -20,6 +20,7 @@ export async function getAccountNetworkInfo(
 ): Promise<NetworkInfo> {
   const walletAccount = getWalletAccount(account);
   const rawFees = await walletAccount.xpub.explorer.getFees();
+  const relayFee = await walletAccount.xpub.explorer.getRelayFee();
   // Convoluted logic to convert from:
   // { "2": 2435, "3": 1241, "6": 1009, "last_updated": 1627973170 }
   // to:
@@ -44,7 +45,12 @@ export async function getAccountNetworkInfo(
   if (feesPerByte.length !== 3) {
     throw new Error("cardinality of feesPerByte should be exactly 3");
   }
-
+  // Fix fees if suggested fee is too low
+  if (feesPerByte[2].toNumber() < Math.ceil(relayFee * 100000)) {
+    feesPerByte[2] = new BigNumber(Math.ceil(relayFee * 100000)).plus(1);
+    feesPerByte[1] = feesPerByte[2].plus(1);
+    feesPerByte[0] = feesPerByte[1].plus(1);
+  }
   const feeItems = {
     items: feesPerByte.map((feePerByte, i) => ({
       key: String(i),
@@ -53,6 +59,7 @@ export async function getAccountNetworkInfo(
     })),
     defaultFeePerByte:
       feesPerByte[Math.floor(feesPerByte.length / 2)] || new BigNumber(0),
+    relayFee,
   };
   return {
     family: "bitcoin",

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

@@ -1,6 +1,6 @@
 import type { DatasetTest } from "../../types";
 import type { Transaction } from "./types";
-import bitcoin_cash from "./datasets/bitcoin_cash";
+// import bitcoin_cash from "./datasets/bitcoin_cash";
 // import bitcoin_gold from "./datasets/bitcoin_gold";
 import bitcoin from "./datasets/bitcoin";
 import dash from "./datasets/dash";
@@ -21,7 +21,7 @@ const dataset: DatasetTest<Transaction> = {
   implementations: ["js", "libcore", "mock"],
   currencies: {
     bitcoin,
-    bitcoin_cash,
+    // bitcoin_cash,
     // bitcoin_gold,
     dash,
     // decred, // BACK-2443

package/src/families/bitcoin/types.ts

@@ -106,6 +106,7 @@ export type FeeItem = {
 export type FeeItems = {
   items: FeeItem[];
   defaultFeePerByte: BigNumber;
+  relayFee?: number;
 };
 export type FeeItemRaw = {
   key: string;

package/src/families/bitcoin/wallet-btc/explorer/index.ts

@@ -168,6 +168,13 @@ class BitcoinLikeExplorer extends EventEmitter implements IExplorer {
     return fees;
   }
 
+  async getRelayFee() {
+    const client = await this.client.acquire();
+    const fees = (await client.client.get(`/network`)).data;
+    await this.client.release(client);
+    return parseFloat(fees["relay_fee"]);
+  }
+
   async getPendings(address: Address, nbMax?: number) {
     const params: {
       no_token?: string;

package/src/families/bitcoin/wallet-btc/explorer/types.ts

@@ -9,6 +9,7 @@ export interface IExplorer {
   getTxHex(txId: string): Promise<string>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getFees(): Promise<any>;
+  getRelayFee(): Promise<number>;
   getCurrentBlock(): Promise<Block | null>;
   getBlockByHeight(height: number): Promise<Block | null>;
   getPendings(address: Address, nbMax?: number): Promise<TX[]>;

package/src/families/ethereum/bridge/js.ts

@@ -24,11 +24,16 @@ import {
   estimateGasLimit,
 } from "../transaction";
 import { getAccountShape } from "../synchronisation";
-import { preload, hydrate } from "../modules";
+import {
+  preload,
+  hydrate,
+  prepareTransaction as prepareTransactionModules,
+} from "../modules";
 import { signOperation } from "../signOperation";
 import { modes } from "../modules";
 import postSyncPatch from "../postSyncPatch";
 import { inferDynamicRange } from "../../../range";
+
 const receive = makeAccountBridgeReceive();
 
 const broadcast = async ({
@@ -173,6 +178,8 @@ const prepareTransaction = async (a, t: Transaction): Promise<Transaction> => {
     t.estimatedGasLimit = estimatedGasLimit;
   }
 
+  t = await prepareTransactionModules(a, t);
+
   return t;
 };
 

package/src/families/ethereum/modules/erc1155.ts

@@ -9,6 +9,7 @@ import {
 import { validateRecipient } from "../transaction";
 import type { ModeModule, Transaction } from "../types";
 import type { Account } from "../../../types";
+import { prepareTransaction } from "./erc721";
 
 const notOwnedNft = createCustomErrorClass("NotOwnedNft");
 const notEnoughNftOwned = createCustomErrorClass("NotEnoughNftOwned");
@@ -75,25 +76,37 @@ const erc1155Transfer: ModeModule = {
     fields.push({
       type: "text",
       label: "Type",
-      value: `ERC721.transfer`,
+      value: `NFT Transfer`,
     });
 
     fields.push({
       type: "text",
-      label: "Collection",
-      value: input.transaction.collection ?? "",
+      label: "To",
+      value: input.transaction.recipient ?? "",
     });
 
     fields.push({
       type: "text",
-      label: "Token IDs",
-      value: input.transaction.tokenIds?.join(",") ?? "",
+      label: "Collection Name",
+      value: input.transaction.collectionName || "",
     });
 
     fields.push({
       type: "text",
-      label: "Quantities",
-      value: input.transaction.quantities?.join(",") ?? "",
+      label: "Quantity",
+      value: input.transaction.quantities?.[0]?.toFixed() ?? "",
+    });
+
+    fields.push({
+      type: "address",
+      label: "NFT Address",
+      address: input.transaction.collection ?? "",
+    });
+
+    fields.push({
+      type: "text",
+      label: "NFT ID",
+      value: input.transaction.tokenIds?.[0] ?? "",
     });
   },
 
@@ -107,6 +120,8 @@ const erc1155Transfer: ModeModule = {
       approving: true, // workaround to track the status ENABLING
     };
   },
+
+  prepareTransaction,
 };
 
 function serializeTransactionData(

package/src/families/ethereum/modules/erc721.ts

@@ -9,11 +9,35 @@ import {
 import { validateRecipient } from "../transaction";
 import type { ModeModule, Transaction } from "../types";
 import type { Account } from "../../../types";
+import { apiForCurrency } from "../../../api/Ethereum";
 
 const notOwnedNft = createCustomErrorClass("NotOwnedNft");
 
 export type Modes = "erc721.transfer";
 
+export async function prepareTransaction(
+  account: Account,
+  transaction: Transaction
+): Promise<Transaction> {
+  let t = transaction;
+  const { collection, collectionName, tokenIds } = transaction;
+  if (collection && tokenIds && typeof collectionName === "undefined") {
+    const api = apiForCurrency(account.currency);
+    const [{ status, result }] = await api.getNFTMetadata([
+      {
+        contract: collection,
+        tokenId: tokenIds[0],
+      },
+    ]);
+    let collectionName = ""; // default value fallback if issue
+    if (status === 200) {
+      collectionName = result?.tokenName || "";
+    }
+    t = { ...t, collectionName };
+  }
+  return Promise.resolve(t);
+}
+
 const erc721Transfer: ModeModule = {
   /**
    * Tx data is filled during the buildEthereumTx
@@ -52,6 +76,8 @@ const erc721Transfer: ModeModule = {
     }
   },
 
+  prepareTransaction,
+
   /**
    * This will only be used by LLM & LLD, not the HW.
    */
@@ -59,18 +85,30 @@ const erc721Transfer: ModeModule = {
     fields.push({
       type: "text",
       label: "Type",
-      value: `ERC721.transfer`,
+      value: `NFT Transfer`,
     });
 
     fields.push({
       type: "text",
-      label: "Collection",
-      value: input.transaction.collection ?? "",
+      label: "To",
+      value: input.transaction.recipient ?? "",
+    });
+
+    fields.push({
+      type: "text",
+      label: "Collection Name",
+      value: input.transaction.collectionName || "",
+    });
+
+    fields.push({
+      type: "address",
+      label: "NFT Address",
+      address: input.transaction.collection ?? "",
     });
 
     fields.push({
       type: "text",
-      label: "Token ID",
+      label: "NFT ID",
       value: input.transaction.tokenIds?.[0] ?? "",
     });
   },

package/src/families/ethereum/modules/index.ts

@@ -90,6 +90,14 @@ export type ModeModule = {
     arg1: Transaction,
     arg2: Operation
   ) => void;
+
+  /**
+   * hook to resolve a transaction like the prepareTransaction of the bridge
+   */
+  prepareTransaction?: (
+    account: Account,
+    transaction: Transaction
+  ) => Promise<Transaction>;
 };
 export const modes: Record<TransactionMode, ModeModule> = {} as Record<
   TransactionMode,
@@ -137,6 +145,18 @@ export function hydrate(value: unknown, currency: CryptoCurrency): void {
     }
   }
 }
+export const prepareTransaction = (
+  account: Account,
+  transaction: Transaction
+): Promise<Transaction> =>
+  values(modules)
+    // @ts-expect-error some module implement it
+    .map((m) => m.prepareTransaction)
+    .filter(Boolean)
+    .reduce(
+      (p, fn) => p.then((t) => fn(account, t)),
+      Promise.resolve(transaction)
+    );
 export const prepareTokenAccounts = (
   currency: CryptoCurrency,
   subAccounts: TokenAccount[],