@ledgerhq/live-common 21.16.0 → 21.16.1

package/src/account/formatters.ts

@@ -12,6 +12,15 @@ import { formatCurrencyUnit } from "../currencies";
 import { getOperationAmountNumber } from "../operation";
 import { getTagDerivationMode } from "../derivation";
 import byFamily from "../generated/account";
+import { nftsByCollections } from "../nft";
+
+const styling = {
+  bold: (str: string) => `\x1b[1m${str}\x1b[22m`,
+  underline: (str: string) => `\x1b[4m${str}\x1b[24m`,
+  cyan: (str: string) => `\x1b[36m${str}\x1b[37m`,
+  magenta: (str: string) => `\x1b[35m${str}\x1b[37m`,
+  reverse: (str: string) => `\x1b[7m${str}\x1b[27m`,
+};
 
 const isSignificantAccount = (acc) =>
   acc.balance.gt(10 ** (getAccountUnit(acc).magnitude - 6));
@@ -80,6 +89,7 @@ const cliFormat = (account, level?: string) => {
     derivationMode,
     index,
     operations,
+    nfts,
   } = account;
   const tag = getTagDerivationMode(account.currency, derivationMode);
   const balance = formatCurrencyUnit(account.unit, account.balance, {
@@ -122,6 +132,39 @@ const cliFormat = (account, level?: string) => {
         maybeDisplaySumOfOpsIssue(ta.operations, ta.balance, getAccountUnit(ta))
     )
     .join("\n");
+
+  if (nfts?.length) {
+    const NFTCollections = nftsByCollections(nfts);
+
+    str += "\n";
+    str += `NFT Collections (${NFTCollections.length}) `;
+    str += "\n";
+
+    str += NFTCollections.map(
+      // nfts are set to any because there not just NFT, we added a metadata prop on the fly
+      // in the first step of the Rxjs flow to avoid having some async code here
+      ({ contract, nfts }: { contract: string; nfts: any[] }) => {
+        const tokenName = nfts?.[0]?.metadata?.tokenName;
+        const { bold, magenta, cyan, reverse } = styling;
+
+        return (
+          `${bold(tokenName ?? "Unknown Collection Name")} (${magenta(
+            contract
+          )}): ` +
+          nfts
+            .map((t) =>
+              t?.metadata?.nftName
+                ? `\n  ${t.amount}x ${reverse(
+                    ` ${t?.metadata?.nftName} `
+                  )} ${cyan("#" + t.tokenId)}`
+                : `\n  ${t.amount}x ${cyan("#" + t.tokenId)}`
+            )
+            .join()
+        );
+      }
+    ).join("\n");
+  }
+
   if (level === "basic") return str;
   str += "\nOPERATIONS (" + operations.length + ")";
   str += operations

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

@@ -28,6 +28,10 @@ const networkInfo: NetworkInfoRaw = {
   },
 };
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [scanAccounts1],
   accounts: [
     {

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "bitcoin_cash seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "bitcoin_gold seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "dash seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "decred seed 1",

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

@@ -27,6 +27,10 @@ const networkInfo: NetworkInfoRaw = {
   },
 };
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [scanAccounts1],
   accounts: [
     {

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "dogecoin seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "komodo seed 1",

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

@@ -27,6 +27,10 @@ const networkInfo: NetworkInfoRaw = {
   },
 };
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [scanAccounts1],
   accounts: [
     {

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "peercoin seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "pivx seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "qtum seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "stakenet seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "vertcoin seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "viacoin seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "zcash seed 1",

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

@@ -1,6 +1,10 @@
 import type { CurrenciesData } from "../../../types";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
+  FIXME_ignoreAccountFields: [
+    "bitcoinResources.walletAccount", // it is not "stable"
+    "bitcoinResources.utxos", // TODO: fix ordering
+  ],
   scanAccounts: [
     {
       name: "zencash seed 1",

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

@@ -129,24 +129,50 @@ const mapTxToOperations = (
   const transactionSequenceNumber =
     (accountInputs.length > 0 && accountInputs[0].sequence) || undefined;
 
-  // Change output is the last one
+  const hasSpentNothing = value.eq(0);
+  // Change output is always the last one
   const changeOutputIndex = tx.outputs
     .map((o) => o.output_index)
     .reduce((p, c) => (p > c ? p : c));
 
   for (const output of tx.outputs) {
     if (output.address) {
-      if (accountAddresses.includes(output.address)) {
+      if (!accountAddresses.includes(output.address)) {
+        // The output doesn't belong to this account
+        if (output.output_index < changeOutputIndex) {
+          // The output isn't the change output
+          recipients.push(
+            syncReplaceAddress
+              ? syncReplaceAddress(output.address)
+              : output.address
+          );
+        }
+      } else {
+        // The output belongs to this account
         accountOutputs.push(output);
-      } else if (
-        !changeAddresses.includes(output.address) ||
-        output.output_index !== changeOutputIndex
-      ) {
-        recipients.push(
-          syncReplaceAddress
-            ? syncReplaceAddress(output.address)
-            : output.address
-        );
+
+        if (!changeAddresses.includes(output.address)) {
+          // The output isn't a change output of this account
+          recipients.push(
+            syncReplaceAddress
+              ? syncReplaceAddress(output.address)
+              : output.address
+          );
+        } else {
+          // The output is a change output of this account,
+          // we count it as a recipient only in some special cases
+          if (
+            (recipients.length === 0 &&
+              output.output_index >= changeOutputIndex) ||
+            hasSpentNothing
+          ) {
+            recipients.push(
+              syncReplaceAddress
+                ? syncReplaceAddress(output.address)
+                : output.address
+            );
+          }
+        }
       }
     }
   }

package/src/nft/NftMetadataProvider/index.tsx

@@ -28,7 +28,7 @@ const NftMetadataContext = createContext<NFTMetadataContextType>({
   clearCache: () => {},
 });
 
-const metadataCallBatcher = (() => {
+export const metadataCallBatcher = (() => {
   const batch: BatchElement[] = [];
 
   let debounce;