@ledgerhq/live-common 23.1.0 → 24.0.0-next.0

package/src/bot/index.ts

@@ -22,11 +22,10 @@ import { runWithAppSpec } from "./engine";
 import { formatReportForConsole, formatError } from "./formatters";
 import {
   initialState,
-  calculate,
   loadCountervalues,
   inferTrackingPairForAccounts,
 } from "../countervalues/logic";
-import { getPortfolio } from "../portfolio";
+import { getPortfolio } from "../portfolio/v2";
 type Arg = Partial<{
   currency: string;
   family: string;
@@ -119,23 +118,15 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
   });
   const period = "month";
 
-  const calc = (c, v, date) =>
-    countervaluesState
-      ? new BigNumber(
-          calculate(countervaluesState, {
-            date,
-            value: v.toNumber(),
-            from: c,
-            to: usd,
-          }) || 0
-        )
-      : new BigNumber(0);
-
-  const portfolio = getPortfolio(allAccountsAfter, period, calc);
-  const totalUSD = countervaluesState
+  const portfolio = countervaluesState
+    ? getPortfolio(allAccountsAfter, period, countervaluesState, usd)
+    : null;
+  const totalUSD = portfolio
     ? formatCurrencyUnit(
         usd.units[0],
-        portfolio.balanceHistory[portfolio.balanceHistory.length - 1].value,
+        new BigNumber(
+          portfolio.balanceHistory[portfolio.balanceHistory.length - 1].value
+        ),
         {
           showCode: true,
         }
@@ -378,14 +369,25 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
     }
 
     if (countervaluesState && r.accountsAfter) {
-      const portfolio = getPortfolio(r.accountsAfter, period, calc);
-      const totalUSD = formatCurrencyUnit(
-        usd.units[0],
-        portfolio.balanceHistory[portfolio.balanceHistory.length - 1].value,
-        {
-          showCode: true,
-        }
+      const portfolio = getPortfolio(
+        r.accountsAfter,
+        period,
+        countervaluesState,
+        usd
       );
+      const totalUSD = portfolio
+        ? formatCurrencyUnit(
+            usd.units[0],
+            new BigNumber(
+              portfolio.balanceHistory[
+                portfolio.balanceHistory.length - 1
+              ].value
+            ),
+            {
+              showCode: true,
+            }
+          )
+        : "";
       balance += " (" + totalUSD + ")";
     }
 

package/src/bot/test.bot.ts

@@ -1,6 +1,6 @@
-import { setup } from "../__tests__/test-helpers/libcore-setup";
+import "../__tests__/test-helpers/setup";
 import { bot } from ".";
-setup("bot");
+
 jest.setTimeout(110 * 60 * 1000);
 const { BOT_FILTER_CURRENCY, BOT_FILTER_FAMILY } = process.env;
 test("bot", async () => {

package/src/countervalues/react.tsx

@@ -10,30 +10,8 @@ import React, {
   useCallback,
   ReactElement,
 } from "react";
-import type {
-  Account,
-  AccountLike,
-  PortfolioRange,
-  Currency,
-  CryptoCurrency,
-  TokenCurrency,
-  AccountPortfolio,
-  Portfolio,
-  CurrencyPortfolio,
-  AssetsDistribution,
-  Unit,
-} from "../types";
-import {
-  getBalanceHistoryWithCountervalue,
-  getPortfolio,
-  getCurrencyPortfolio,
-  getAssetsDistribution,
-} from "../portfolio";
-import {
-  getAccountCurrency,
-  flattenAccounts,
-  getAccountUnit,
-} from "../account/helpers";
+import type { Account, AccountLike, Currency, Unit } from "../types";
+import { getAccountCurrency, getAccountUnit } from "../account/helpers";
 import {
   initialState,
   calculate,
@@ -304,113 +282,6 @@ export function useCalculateMany(
   // TODO how to approach perf for this? hash function of the datapoints? responsability on user land?
   return calculateMany(state, dataPoints, query);
 }
-// TODO perf of the useCalculate*, does it even worth worrying?
-// TODO move to portfolio module (I couldn't make useCountervaluesState to work there)
-export function useBalanceHistoryWithCountervalue({
-  account,
-  range,
-  to,
-}: {
-  account: AccountLike;
-  range: PortfolioRange;
-  to: Currency;
-}): AccountPortfolio {
-  const from = getAccountCurrency(account);
-  const state = useCountervaluesState();
-  return useMemo(
-    () =>
-      getBalanceHistoryWithCountervalue(account, range, (_, value, date) => {
-        const countervalue = calculate(state, {
-          value: value.toNumber(),
-          from,
-          to,
-          disableRounding: true,
-          date,
-        });
-        return typeof countervalue === "number"
-          ? new BigNumber(countervalue)
-          : countervalue;
-      }),
-    [account, from, to, range, state]
-  );
-}
-export function usePortfolio({
-  accounts,
-  range,
-  to,
-}: {
-  accounts: Account[];
-  range: PortfolioRange;
-  to: Currency;
-}): Portfolio {
-  const state = useCountervaluesState();
-  return useMemo(
-    () =>
-      getPortfolio(accounts, range, (from, value, date) => {
-        const countervalue = calculate(state, {
-          value: value.toNumber(),
-          from,
-          to,
-          disableRounding: true,
-          date,
-        });
-        return typeof countervalue === "number"
-          ? new BigNumber(countervalue)
-          : countervalue;
-      }),
-    [accounts, range, state, to]
-  );
-}
-export function useCurrencyPortfolio({
-  accounts: rawAccounts,
-  range,
-  to,
-  currency,
-}: {
-  accounts: Account[];
-  range: PortfolioRange;
-  to: Currency;
-  currency: CryptoCurrency | TokenCurrency;
-}): CurrencyPortfolio {
-  const accounts = flattenAccounts(rawAccounts).filter(
-    (a) => getAccountCurrency(a) === currency
-  );
-  const state = useCountervaluesState();
-  return useMemo(
-    () =>
-      getCurrencyPortfolio(accounts, range, (from, value, date) => {
-        const countervalue = calculate(state, {
-          value: value.toNumber(),
-          from,
-          to,
-          disableRounding: true,
-          date,
-        });
-        return typeof countervalue === "number"
-          ? new BigNumber(countervalue)
-          : countervalue;
-      }),
-    [accounts, range, state, to]
-  );
-}
-export function useDistribution({
-  accounts,
-  to,
-}: {
-  accounts: Account[];
-  to: Currency;
-}): AssetsDistribution {
-  const calc = useCalculateCountervalueCallback({
-    to,
-  });
-  return useMemo(() => {
-    return getAssetsDistribution(accounts, calc, {
-      minShowFirst: 6,
-      maxShowFirst: 6,
-      showFirstThreshold: 0.95,
-    });
-  }, [accounts, calc]);
-}
 
 export function useCalculateCountervalueCallback({
   to,

package/src/currencies/__snapshots__/sortByMarketcap.test.ts.snap

@@ -118,7 +118,6 @@ Array [
   "ethereum/erc20/thorchain_eth_rune",
   "ethereum/erc20/acuteanglecoin",
   "pivx",
-  "ethereum/erc20/constellation_token",
   "ethereum/erc20/reserve_rights",
   "ethereum/erc20/wcoin",
   "ethereum/erc20/shipchain",
@@ -1747,6 +1746,7 @@ Array [
   "ethereum/erc20/bavala",
   "ethereum/erc20/bayc_history_-the_great_floor_sweep",
   "ethereum/erc20/baz_token",
+  "ethereum/erc20/bb_verse",
   "ethereum/erc20/bbn",
   "ethereum/erc20/bcap",
   "ethereum/erc20/bcat",
@@ -2751,6 +2751,7 @@ Array [
   "ethereum/erc20/eub_chain",
   "ethereum/erc20/eur_tether__erc20_",
   "ethereum/erc20/eurbase_stablecoin",
+  "ethereum/erc20/euro_coin",
   "ethereum/erc20/euro_stable_token",
   "ethereum/erc20/europechain",
   "ethereum/erc20/eurxb",
@@ -2868,6 +2869,7 @@ Array [
   "ethereum/erc20/floki_wife",
   "ethereum/erc20/flow_protocol",
   "ethereum/erc20/flux",
+  "ethereum/erc20/flux_(zel)",
   "ethereum/erc20/flux_protocol",
   "ethereum/erc20/fluz_fluz_global",
   "ethereum/erc20/flynnjamm",
@@ -3412,6 +3414,7 @@ Array [
   "ethereum/erc20/konomi",
   "ethereum/erc20/korea_medical_tba",
   "ethereum/erc20/koris",
+  "ethereum/erc20/kounotori",
   "ethereum/erc20/kper_network",
   "ethereum/erc20/kpop",
   "ethereum/erc20/kprcoin",
@@ -4678,6 +4681,7 @@ Array [
   "ethereum/erc20/strikex",
   "ethereum/erc20/strips_token",
   "ethereum/erc20/strong",
+  "ethereum/erc20/stronger",
   "ethereum/erc20/stronghold",
   "ethereum/erc20/strudel_finance",
   "ethereum/erc20/successlife",
@@ -4899,6 +4903,7 @@ Array [
   "ethereum/erc20/toka",
   "ethereum/erc20/tokamak_network_token",
   "ethereum/erc20/tokemak",
+  "ethereum/erc20/tokemaksushilppool",
   "ethereum/erc20/tokemon",
   "ethereum/erc20/token_1337",
   "ethereum/erc20/token_play",
@@ -5600,6 +5605,7 @@ Array [
   "polygon/erc20/cerby_token",
   "polygon/erc20/chainlink_token",
   "polygon/erc20/chiliz",
+  "polygon/erc20/city_of_block",
   "polygon/erc20/clintex",
   "polygon/erc20/clocks_token",
   "polygon/erc20/conch_coin",
@@ -5872,6 +5878,7 @@ Array [
   "bsc/bep20/bakerytoken",
   "bsc/bep20/bat_true_dollar",
   "bsc/bep20/bat_true_share",
+  "bsc/bep20/bb_verse",
   "bsc/bep20/bdollar",
   "bsc/bep20/bdollar_share",
   "bsc/bep20/bearn.fi",
@@ -5962,6 +5969,7 @@ Array [
   "bsc/bep20/canyacoin",
   "bsc/bep20/car",
   "bsc/bep20/cartesi_token",
+  "bsc/bep20/catcoin",
   "bsc/bep20/catecoin",
   "bsc/bep20/catecoin_old",
   "bsc/bep20/ceek",
@@ -6051,6 +6059,7 @@ Array [
   "bsc/bep20/floki_rocket",
   "bsc/bep20/flokimooni",
   "bsc/bep20/formation_finance",
+  "bsc/bep20/foxfinancev2",
   "bsc/bep20/free_coin_bsc",
   "bsc/bep20/frmx_token",
   "bsc/bep20/frog_inu",
@@ -6077,6 +6086,7 @@ Array [
   "bsc/bep20/hacken_token",
   "bsc/bep20/hakka_finance_on_xdai_on_bsc",
   "bsc/bep20/happinesstoken",
+  "bsc/bep20/happy_4th_of_july",
   "bsc/bep20/hard",
   "bsc/bep20/harmony_one",
   "bsc/bep20/hedge_token",
@@ -6100,6 +6110,7 @@ Array [
   "bsc/bep20/juggernaut_defi",
   "bsc/bep20/julswap",
   "bsc/bep20/jumptoken",
+  "bsc/bep20/jupyter",
   "bsc/bep20/jurassic_token",
   "bsc/bep20/kaby_arena",
   "bsc/bep20/kalmar_token",
@@ -6139,6 +6150,7 @@ Array [
   "bsc/bep20/mobox",
   "bsc/bep20/moeda_loyalty_points",
   "bsc/bep20/moeda_seeds",
+  "bsc/bep20/moneu_token",
   "bsc/bep20/monsta_infinite_token",
   "bsc/bep20/moomonster_token",
   "bsc/bep20/moonienft_token",
@@ -6240,6 +6252,7 @@ Array [
   "bsc/bep20/shambala",
   "bsc/bep20/shard",
   "bsc/bep20/shiba_inu",
+  "bsc/bep20/shibnobi",
   "bsc/bep20/shield_protocol",
   "bsc/bep20/shill",
   "bsc/bep20/shirtum",
@@ -6338,6 +6351,7 @@ Array [
   "bsc/bep20/waultswap",
   "bsc/bep20/wazirx_token",
   "bsc/bep20/weather",
+  "bsc/bep20/weed_inu",
   "bsc/bep20/weetwo",
   "bsc/bep20/weyu",
   "bsc/bep20/wink",

package/src/derivation.ts

@@ -157,12 +157,13 @@ const modes = Object.freeze({
   // glif legacy derivation
   gliflegacy: {
     overridesDerivation: "44'/1'/0'/0/<account>",
-    tag: "legacy",
+    tag: "glif-legacy",
   },
   // glif normal derivation
   glif: {
     overridesDerivation: "44'/461'/0'/0/<account>",
     startsAt: 1,
+    tag: "glif",
   },
   solanaMain: {
     isNonIterable: true,

package/src/exchange/swap/getExchangeRates.test.ts

@@ -1,13 +1,12 @@
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import axios from "axios";
 import BigNumber from "bignumber.js";
-import { mocked } from "ts-jest/utils";
 import { Account, Transaction } from "../../types";
 import getExchangeRates from "./getExchangeRates";
 import { Exchange, ExchangeRate } from "./types";
 
 jest.mock("axios");
-const mockedAxios = mocked(axios);
+const mockedAxios = jest.mocked(axios);
 
 const bitcoinCurrency = getCryptoCurrencyById("bitcoin");
 const ethereumCurrency = getCryptoCurrencyById("ethereum");

package/src/exchange/swap/hooks/usePollKYCStatus.test.ts

@@ -1,6 +1,4 @@
 import { renderHook } from "@testing-library/react-hooks";
-import { mocked } from "ts-jest/utils";
-
 import {
   usePollKYCStatus,
   KYC_STATUS_POLLING_INTERVAL,
@@ -12,7 +10,7 @@ import { KYCStatus } from "../types";
 
 // mock getKYCStatus
 jest.mock("..");
-const mockedGetKYCStatus = mocked(getKYCStatus, true);
+const mockedGetKYCStatus = jest.mocked(getKYCStatus, true);
 
 describe("usePollKYCStatus", () => {
   const defaultInput: UsePollKYCStatusProps = {

package/src/exchange/swap/hooks/useProviderRates.test.ts

@@ -1,7 +1,6 @@
 import { renderHook, act } from "@testing-library/react-hooks";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import BigNumber from "bignumber.js";
-import { mocked } from "ts-jest/utils";
 import { useProviderRates } from ".";
 import { getExchangeRates } from "..";
 import { genAccount } from "../../../mock/account";
@@ -15,7 +14,7 @@ const fromAccount = genAccount("from-account", {
   currency: ETH,
 });
 
-const mockedGetExchangeRates = mocked(getExchangeRates, true);
+const mockedGetExchangeRates = jest.mocked(getExchangeRates, true);
 const mockedRatesPromise = mockGetExchangeRates(
   { fromAccount } as any,
   { amount: new BigNumber(1) } as any,

package/src/exchange/swap/hooks/useSwapProviders.test.ts

@@ -1,12 +1,10 @@
 import { renderHook } from "@testing-library/react-hooks";
-import { mocked } from "ts-jest/utils";
-
 import { useSwapProviders } from "./useSwapProviders";
 import { getProviders } from "..";
 
 jest.mock("..");
 
-const mockedGetProviders = mocked(getProviders);
+const mockedGetProviders = jest.mocked(getProviders);
 
 describe("useSwapProviders", () => {
   const OLD_ENV = process.env;

package/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts

@@ -1,6 +1,5 @@
 import { renderHook, act } from "@testing-library/react-hooks";
 import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
-import { mocked } from "ts-jest/utils";
 import { useUpdateMaxAmount, ZERO } from "./useUpdateMaxAmount";
 import { genAccount, genTokenAccount } from "../../../mock/account";
 import BigNumber from "bignumber.js";
@@ -9,10 +8,10 @@ import { checkAccountSupported } from "../../../account/support";
 
 // Needs to be mocked since userSupportedCurrencies is initially empty.
 jest.mock("../../../account/support");
-const mockedCheckAccount = mocked(checkAccountSupported);
+const mockedCheckAccount = jest.mocked(checkAccountSupported);
 // Mock to use a custom estimate value and test the result.
 jest.mock("../../../families/ethereum/bridge/mock");
-const mockedEstimateMaxSpendable = mocked(
+const mockedEstimateMaxSpendable = jest.mocked(
   ethBridge.accountBridge.estimateMaxSpendable,
   true
 );

package/src/families/algorand/{test-dataset.ts → bridge.integration.test.ts}

@@ -1,4 +1,6 @@
 import { BigNumber } from "bignumber.js";
+import "../../__tests__/test-helpers/setup";
+import { testBridge } from "../../__tests__/test-helpers/bridge";
 import type { DatasetTest } from "../../types";
 import {
   InvalidAddressBecauseDestinationIsAlsoSource,
@@ -9,10 +11,10 @@ import { AlgorandASANotOptInInRecipient } from "../../errors";
 import type { AlgorandTransaction } from "./types";
 // const notCreatedAlgorandAddress =
 //   "ZBILW5BPM7AQU54YQZICSGS4J7KJ2XV6OC3DFUQ7BB4DVLYKKUEVWDDBGM";
+
 const dataset: DatasetTest<AlgorandTransaction> = {
-  implementations: ["libcore"],
-  // test disabled. FIXME ctx LL-5485
-  currencies: {} || {
+  implementations: ["js"],
+  currencies: {
     algorand: {
       FIXME_ignoreAccountFields: [
         "algorandResources.rewards", // We cant keep track of this since it's always moving
@@ -43,7 +45,7 @@ const dataset: DatasetTest<AlgorandTransaction> = {
           FIXME_tests: ["balance is sum of ops"],
           // Rewards issues
           raw: {
-            id: "libcore:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:",
+            id: "js:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:",
             seedIdentifier:
               "c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4",
             name: "Algorand 1",
@@ -165,7 +167,7 @@ const dataset: DatasetTest<AlgorandTransaction> = {
               transaction: (t) => ({
                 ...t,
                 subAccountId:
-                  "libcore:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:+312769",
+                  "js:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:+312769",
                 amount: new BigNumber("1000"),
                 recipient:
                   "ZQVVJ2S4XWS542KXBBVIINOEHIDOEZKZWK725PWFNN2I5RNCUBI53RT2EY",
@@ -182,7 +184,7 @@ const dataset: DatasetTest<AlgorandTransaction> = {
               transaction: (t) => ({
                 ...t,
                 subAccountId:
-                  "libcore:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:+312769",
+                  "js:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:+312769",
                 amount: new BigNumber("1000"),
                 recipient:
                   "MECOWMKPKH2NWVZTS5V5RQDGFFYBT25KNLOPHG2KUMMNKU6FOHGJT24WBI",
@@ -198,7 +200,7 @@ const dataset: DatasetTest<AlgorandTransaction> = {
               transaction: (t) => ({
                 ...t,
                 subAccountId:
-                  "libcore:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:+312769",
+                  "js:1:algorand:c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4:+312769",
                 amount: new BigNumber("100000000000"),
                 recipient:
                   "MECOWMKPKH2NWVZTS5V5RQDGFFYBT25KNLOPHG2KUMMNKU6FOHGJT24WBI",
@@ -214,7 +216,7 @@ const dataset: DatasetTest<AlgorandTransaction> = {
         },
         {
           raw: {
-            id: "libcore:1:algorand:6104eb314f51f4db5733976bd8c066297019ebaa6adcf39b4aa318d553c571cc:",
+            id: "js:1:algorand:6104eb314f51f4db5733976bd8c066297019ebaa6adcf39b4aa318d553c571cc:",
             seedIdentifier:
               "c8b672d16c497bb097a48f09a9cccf0c4c7d6391acb7a4e7cd3f236fadbef9c4",
             xpub: "6104eb314f51f4db5733976bd8c066297019ebaa6adcf39b4aa318d553c571cc",
@@ -276,7 +278,7 @@ const dataset: DatasetTest<AlgorandTransaction> = {
               transaction: (t) => ({
                 ...t,
                 subAccountId:
-                  "libcore:1:algorand:fef9cf3252121f000324dd819b2c1d76910413924acaf6779b30e1fa1874d7af:+312769",
+                  "js:1:algorand:fef9cf3252121f000324dd819b2c1d76910413924acaf6779b30e1fa1874d7af:+312769",
                 amount: new BigNumber("1000"),
                 recipient:
                   "YWZPDCL5XQPCPGBXKB7KAG7YF2QGCGEX37YTSM55CPEPHKNE2ZSKRAXNQ4",
@@ -294,4 +296,5 @@ const dataset: DatasetTest<AlgorandTransaction> = {
     },
   },
 };
-export default dataset;
+
+testBridge(dataset);