@ledgerhq/live-common 34.33.0-nightly.3 → 34.33.0-nightly.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.33.0-nightly.3",
+  "version": "34.33.0-nightly.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -162,41 +162,40 @@
     "xstate": "4.38.3",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.9.5-nightly.0",
-    "@ledgerhq/coin-aptos": "^1.9.5-nightly.0",
-    "@ledgerhq/coin-bitcoin": "^0.15.5-nightly.0",
-    "@ledgerhq/coin-cardano": "^0.8.5-nightly.0",
-    "@ledgerhq/coin-casper": "^1.6.5-nightly.0",
-    "@ledgerhq/coin-celo": "^1.1.3-nightly.0",
-    "@ledgerhq/coin-cosmos": "^0.14.1-nightly.0",
-    "@ledgerhq/coin-evm": "^2.21.0-nightly.0",
-    "@ledgerhq/coin-filecoin": "^1.9.5-nightly.0",
-    "@ledgerhq/coin-framework": "^5.0.1-nightly.0",
-    "@ledgerhq/coin-hedera": "^1.6.5-nightly.0",
-    "@ledgerhq/coin-icon": "^0.10.5-nightly.0",
-    "@ledgerhq/coin-internet_computer": "^1.7.5-nightly.0",
-    "@ledgerhq/coin-mina": "^1.1.4-nightly.0",
-    "@ledgerhq/coin-multiversx": "^0.4.5-nightly.0",
-    "@ledgerhq/coin-near": "^0.11.5-nightly.0",
-    "@ledgerhq/coin-polkadot": "^6.0.1-nightly.1",
-    "@ledgerhq/coin-solana": "^0.22.0-nightly.2",
-    "@ledgerhq/coin-stacks": "^0.8.5-nightly.0",
-    "@ledgerhq/coin-stellar": "^5.0.1-nightly.0",
-    "@ledgerhq/coin-sui": "^0.3.2-nightly.0",
-    "@ledgerhq/coin-tezos": "^5.0.1-nightly.0",
-    "@ledgerhq/coin-ton": "^0.9.2-nightly.0",
-    "@ledgerhq/coin-tron": "^3.1.0-nightly.1",
-    "@ledgerhq/coin-vechain": "^2.7.5-nightly.0",
-    "@ledgerhq/coin-xrp": "^6.0.1-nightly.0",
+    "@ledgerhq/coin-algorand": "^0.9.5-nightly.1",
+    "@ledgerhq/coin-aptos": "^1.9.5-nightly.1",
+    "@ledgerhq/coin-bitcoin": "^0.15.5-nightly.1",
+    "@ledgerhq/coin-cardano": "^0.8.5-nightly.1",
+    "@ledgerhq/coin-casper": "^1.6.5-nightly.1",
+    "@ledgerhq/coin-celo": "^1.1.3-nightly.1",
+    "@ledgerhq/coin-cosmos": "^0.14.1-nightly.1",
+    "@ledgerhq/coin-evm": "^2.21.0-nightly.1",
+    "@ledgerhq/coin-filecoin": "^1.9.5-nightly.1",
+    "@ledgerhq/coin-framework": "^5.0.1-nightly.1",
+    "@ledgerhq/coin-hedera": "^1.6.5-nightly.1",
+    "@ledgerhq/coin-icon": "^0.10.5-nightly.1",
+    "@ledgerhq/coin-internet_computer": "^1.7.5-nightly.1",
+    "@ledgerhq/coin-mina": "^1.1.4-nightly.1",
+    "@ledgerhq/coin-multiversx": "^0.4.5-nightly.1",
+    "@ledgerhq/coin-polkadot": "^6.0.1-nightly.2",
+    "@ledgerhq/coin-solana": "^0.22.0-nightly.3",
+    "@ledgerhq/coin-stacks": "^0.8.5-nightly.1",
+    "@ledgerhq/coin-stellar": "^5.0.1-nightly.1",
+    "@ledgerhq/coin-sui": "^0.3.2-nightly.1",
+    "@ledgerhq/coin-tezos": "^5.1.0-nightly.2",
+    "@ledgerhq/coin-ton": "^0.9.2-nightly.1",
+    "@ledgerhq/coin-tron": "^3.1.0-nightly.2",
+    "@ledgerhq/coin-near": "^0.11.5-nightly.1",
+    "@ledgerhq/coin-vechain": "^2.7.5-nightly.1",
+    "@ledgerhq/coin-xrp": "^6.0.1-nightly.1",
     "@ledgerhq/crypto-icons-ui": "^1.14.0-nightly.0",
-    "@ledgerhq/cryptoassets": "^13.16.0",
+    "@ledgerhq/cryptoassets": "^13.17.0-nightly.0",
     "@ledgerhq/device-core": "^0.4.24-nightly.0",
     "@ledgerhq/devices": "8.4.5-nightly.0",
     "@ledgerhq/errors": "^6.20.0-nightly.0",
     "@ledgerhq/hw-app-algorand": "^6.31.0",
     "@ledgerhq/hw-app-aptos": "^6.34.0",
     "@ledgerhq/hw-app-btc": "^10.9.0",
-    "@ledgerhq/hw-app-celo": "^6.33.2-nightly.0",
     "@ledgerhq/hw-app-cosmos": "^6.32.0",
     "@ledgerhq/hw-app-eth": "^6.45.4-nightly.0",
     "@ledgerhq/hw-app-exchange": "^0.10.0",
@@ -205,28 +204,29 @@
     "@ledgerhq/hw-app-multiversx": "^6.24.0",
     "@ledgerhq/hw-app-near": "^6.31.0",
     "@ledgerhq/hw-app-polkadot": "^6.34.0",
+    "@ledgerhq/hw-app-celo": "^6.33.2-nightly.0",
     "@ledgerhq/hw-app-solana": "^7.4.0",
     "@ledgerhq/hw-app-str": "^7.2.0",
     "@ledgerhq/hw-app-sui": "^1.1.0",
     "@ledgerhq/hw-app-tezos": "^6.31.0",
     "@ledgerhq/hw-app-trx": "^6.31.0",
-    "@ledgerhq/hw-app-vet": "^0.5.2",
-    "@ledgerhq/hw-app-xrp": "^6.31.0",
+    "@ledgerhq/hw-app-vet": "^0.5.3-nightly.0",
     "@ledgerhq/hw-bolos": "6.32.1-nightly.0",
     "@ledgerhq/hw-transport": "^6.31.5-nightly.0",
+    "@ledgerhq/hw-app-xrp": "^6.31.0",
     "@ledgerhq/hw-transport-mocker": "^6.29.5-nightly.0",
     "@ledgerhq/ledger-cal-service": "^0.4.2",
     "@ledgerhq/ledger-trust-service": "0.3.2",
     "@ledgerhq/live-config": "^3.1.0",
-    "@ledgerhq/live-countervalues": "^0.5.5-nightly.0",
-    "@ledgerhq/live-countervalues-react": "^0.2.34-nightly.0",
+    "@ledgerhq/live-countervalues": "^0.5.5-nightly.1",
+    "@ledgerhq/live-countervalues-react": "^0.2.34-nightly.1",
     "@ledgerhq/live-env": "^2.8.0",
     "@ledgerhq/live-hooks": "0.1.0",
     "@ledgerhq/live-network": "^2.0.7",
-    "@ledgerhq/live-nft": "^0.8.5-nightly.0",
+    "@ledgerhq/live-nft": "^0.8.5-nightly.1",
     "@ledgerhq/live-promise": "^0.1.0",
-    "@ledgerhq/live-signer-evm": "^0.4.0-nightly.0",
-    "@ledgerhq/live-wallet": "^0.10.8-nightly.0",
+    "@ledgerhq/live-signer-evm": "^0.4.0-nightly.1",
+    "@ledgerhq/live-wallet": "^0.10.8-nightly.1",
     "@ledgerhq/logs": "^6.12.0",
     "@ledgerhq/speculos-transport": "^0.2.0",
     "@ledgerhq/wallet-api-acre-module": "^0.5.0-nightly.1",

package/src/DataModel.test.ts

@@ -6,6 +6,10 @@ import {
   APTOS_HARDENED_DERIVATION_PATH,
   APTOS_NON_HARDENED_DERIVATION_PATH,
 } from "./families/aptos/consts";
+import { getCurrencyConfiguration } from "./config";
+jest.mock("./config", () => ({
+  getCurrencyConfiguration: jest.fn(),
+}));
 
 const opRetentionStategy =
   (maxDaysOld: number, keepFirst: number) =>
@@ -40,6 +44,22 @@ const aptosAccount = {
   version: 1,
 };
 
+const evmAccount = {
+  data: {
+    currencyId: "ethereum",
+    operations: [
+      {
+        id: "op_evm_001",
+      },
+      {
+        id: "op_evm_002",
+        nftOperations: [{ id: "op_evm_nft_001" }],
+      },
+    ],
+  } as AccountRaw,
+  version: 1,
+};
+
 describe("DataModel", () => {
   test("createDataModel for crypto.org account", () => {
     const migratedCryptoOrgAccount = createDataModel(schema).decode(cryptoOrgAccount);
@@ -58,4 +78,35 @@ describe("DataModel", () => {
     const migratedAptosAccountRaw = migratedAptosAccount.at(0) as Account;
     expect(migratedAptosAccountRaw.freshAddressPath).toEqual(APTOS_HARDENED_DERIVATION_PATH);
   });
+
+  describe("test for shownNfts true", () => {
+    beforeAll(() => {
+      (getCurrencyConfiguration as jest.Mock).mockReturnValue({
+        showNfts: true,
+      });
+    });
+
+    test("evm account", () => {
+      const data = createDataModel(schema).decode(evmAccount);
+      const account = data.at(0) as Account;
+      expect(account.operations).toEqual([
+        expect.objectContaining({ id: "op_evm_001" }),
+        expect.objectContaining({ id: "op_evm_002" }),
+      ]);
+    });
+  });
+
+  describe("test for shownNfts false", () => {
+    beforeAll(() => {
+      (getCurrencyConfiguration as jest.Mock).mockReturnValue({
+        showNfts: false,
+      });
+    });
+
+    test("evm account", () => {
+      const data = createDataModel(schema).decode(evmAccount);
+      const account = data.at(0) as Account;
+      expect(account.operations).toEqual([expect.objectContaining({ id: "op_evm_001" })]);
+    });
+  });
 });

package/src/DataModel.ts

@@ -1,5 +1,7 @@
 import BigNumber from "bignumber.js";
 import { APTOS_NON_HARDENED_DERIVATION_PATH_REGEX } from "./families/aptos/consts";
+import { getCurrencyConfiguration } from "./config";
+import { findCryptoCurrencyById } from "./currencies";
 
 /**
  * Interface for the end user.
@@ -37,11 +39,10 @@ export type DataSchema<R, M> = {
 export function createDataModel<R, M>(schema: DataSchema<R, M>): DataModel<R, M> {
   const { migrations, encode, decode } = schema;
   const version = migrations.length;
-
   function decodeModel(raw) {
     let { data } = raw;
     const { currencyId, freshAddressPath } = data;
-
+    const currency = findCryptoCurrencyById(currencyId);
     // Set 'change' and 'address_index' levels to be hardened for Aptos derivation path
     if (
       currencyId === "aptos" &&
@@ -65,6 +66,11 @@ export function createDataModel<R, M>(schema: DataSchema<R, M>): DataModel<R, M>
         sequence: 0,
       };
     }
+    if (currency && currency.family == "evm" && !getCurrencyConfiguration(currency).showNfts) {
+      if (Array.isArray(data.operations)) {
+        data.operations = data.operations.filter(tx => !("nftOperations" in tx));
+      }
+    }
 
     for (let i = raw.version; i < version; i++) {
       data = migrations[i](data);

package/src/domain/getTokensWithFunds.test.ts

@@ -0,0 +1,94 @@
+import { genAccount } from "@ledgerhq/coin-framework/lib/mocks/account";
+import { getCryptoCurrencyById } from "@ledgerhq/live-common/currencies/index";
+import { Account } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
+import { getTokensWithFunds } from "./getTokensWithFunds";
+
+const ETH = getCryptoCurrencyById("ethereum");
+
+const mockedAccounts: Account[] = [
+  genAccount("mocked-account-2", {
+    currency: ETH,
+  }),
+];
+
+describe("getTokensWithFunds", () => {
+  it("should return empty array if no accounts", () => {
+    const result = getTokensWithFunds([]);
+    expect(result).toEqual([]);
+  });
+
+  it("should return array with accounts with funds", () => {
+    const account = mockedAccounts[0];
+    const result = getTokensWithFunds(mockedAccounts);
+
+    expect(account.balance).toBeTruthy();
+    expect(account.balance instanceof BigNumber).toBe(true);
+    expect(account.balance.gt(0)).toBe(true);
+
+    expect(account.subAccounts).toBeDefined();
+    expect(account.subAccounts?.length).toBe(2);
+
+    const [zrxAccount, repAccount] = account.subAccounts || [];
+
+    expect(zrxAccount.balance).toBeTruthy();
+    expect(zrxAccount.balance instanceof BigNumber).toBe(true);
+    expect(zrxAccount.balance.gt(0)).toBe(true);
+
+    expect(repAccount.balance).toBeTruthy();
+    expect(repAccount.balance instanceof BigNumber).toBe(true);
+    expect(repAccount.balance.gt(0)).toBe(true);
+
+    expect(result).toEqual(["ETH on Ethereum", "ZRX on Ethereum", "REP on Ethereum"]);
+  });
+
+  it("should return array with accounts with funds", () => {
+    const account = mockedAccounts[0];
+
+    expect(account.balance).toBeTruthy();
+    expect(account.balance instanceof BigNumber).toBe(true);
+    expect(account.balance.gt(0)).toBe(true);
+
+    expect(account.subAccounts).toBeDefined();
+    expect(account.subAccounts?.length).toBe(2);
+
+    const [zrxAccount, repAccount] = account.subAccounts || [];
+
+    const emptyRepAccount = { ...repAccount, balance: new BigNumber(0) };
+
+    expect(zrxAccount.balance).toBeTruthy();
+    expect(zrxAccount.balance instanceof BigNumber).toBe(true);
+    expect(zrxAccount.balance.gt(0)).toBe(true);
+
+    expect(emptyRepAccount.balance).toBeTruthy();
+    expect(emptyRepAccount.balance instanceof BigNumber).toBe(true);
+    expect(emptyRepAccount.balance.gt(0)).toBe(false);
+
+    const accounts = { ...account, subAccounts: [zrxAccount, emptyRepAccount] };
+
+    const result = getTokensWithFunds([accounts]);
+
+    expect(result).toEqual(["ETH on Ethereum", "ZRX on Ethereum"]);
+  });
+
+  it("should return array with accounts with funds without duplication", () => {
+    const account = mockedAccounts[0];
+
+    expect(account.balance).toBeTruthy();
+    expect(account.balance instanceof BigNumber).toBe(true);
+    expect(account.balance.gt(0)).toBe(true);
+
+    expect(account.subAccounts).toBeDefined();
+    expect(account.subAccounts?.length).toBe(2);
+
+    const [zrxAccount, repAccount] = account.subAccounts || [];
+
+    const accounts = { ...account, subAccounts: [zrxAccount, repAccount, repAccount] };
+
+    expect(accounts.subAccounts.length).toBe(3);
+
+    const result = getTokensWithFunds([accounts]);
+
+    expect(result).toEqual(["ETH on Ethereum", "ZRX on Ethereum", "REP on Ethereum"]);
+  });
+});

package/src/domain/getTokensWithFunds.ts

@@ -0,0 +1,36 @@
+import { getParentAccount } from "@ledgerhq/coin-framework/account/helpers";
+import { Account } from "@ledgerhq/types-live";
+
+export const getTokensWithFunds = (accounts: Account[]): string[] => {
+  if (!accounts?.length) return [];
+
+  const tokensMap = new Map<string, { ticker: string; networkName: string }>();
+
+  for (const account of accounts) {
+    const { balance, currency } = account || {};
+    if (!balance?.gt(0) || !currency) continue;
+
+    const parentAccount = getParentAccount(account, accounts);
+    const networkName = parentAccount?.currency?.name;
+    if (!networkName) continue;
+
+    const mainKey = `${currency.ticker}:${networkName}`;
+    tokensMap.set(mainKey, {
+      ticker: currency.ticker,
+      networkName,
+    });
+
+    account.subAccounts?.forEach(subAccount => {
+      const { balance, token } = subAccount || {};
+      if (!balance?.gt(0) || !token) return;
+
+      const subKey = `${token.ticker}:${networkName}`;
+      tokensMap.set(subKey, {
+        ticker: token.ticker,
+        networkName,
+      });
+    });
+  }
+
+  return Array.from(tokensMap.values(), ({ ticker, networkName }) => `${ticker} on ${networkName}`);
+};