chore: decoupled {unit, starred, name} fields away from Account model

LedgerHQ · May 6, 2024 · b2c2f84 · b2c2f84
1 parent 70a5aab
commit b2c2f84
Show file tree

Hide file tree

Showing 531 changed files with 5,378 additions and 5,387 deletions.
diff --git a/.changeset/rude-tables-share.md b/.changeset/rude-tables-share.md
@@ -0,0 +1,22 @@
+---
+"@ledgerhq/types-live": patch
+"@ledgerhq/coin-algorand": patch
+"@ledgerhq/coin-polkadot": patch
+"@ledgerhq/coin-bitcoin": patch
+"@ledgerhq/coin-evm": patch
+"@actions/build-checks": patch
+"@ledgerhq/native-modules-tools": patch
+"ledger-live-desktop": patch
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+"@ledgerhq/ethereum-provider": patch
+"@ledgerhq/dummy-wallet-app": patch
+"@ledgerhq/wallet-api-exchange-module": patch
+"@ledgerhq/coin-framework": patch
+"@ledgerhq/live-nft-react": patch
+"@ledgerhq/live-wallet": patch
+"@ledgerhq/live-cli": patch
+"@ledgerhq/live-env": patch
+---
+
+Drop technical Account#name and Account#starred fields and replace it with a new architecture: a wallet store that contains all user's data.
diff --git a/.changeset/wet-apes-rest.md b/.changeset/wet-apes-rest.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Remove .unit usage from account.unit
diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -41,6 +41,7 @@
     "@ledgerhq/live-config": "workspace:^",
     "@ledgerhq/live-countervalues": "workspace:^",
     "@ledgerhq/live-env": "workspace:^",
+    "@ledgerhq/live-wallet": "workspace:^",
     "@ledgerhq/live-network": "workspace:^",
     "@ledgerhq/logs": "workspace:^",
     "@ledgerhq/types-devices": "workspace:^",

diff --git a/apps/cli/src/commands/blockchain/derivation.ts b/apps/cli/src/commands/blockchain/derivation.ts
@@ -6,7 +6,8 @@ import {
   getDerivationScheme,
 } from "@ledgerhq/coin-framework/derivation";
 import { setEnv, getEnv } from "@ledgerhq/live-env";
-import { getAccountPlaceholderName } from "@ledgerhq/live-common/account/index";
+import { getDefaultAccountNameForCurrencyIndex } from "@ledgerhq/live-wallet/accountName";
+
 export default {
   args: [],
   job: () =>
@@ -32,11 +33,7 @@ export default {
                 "  " +
                 (derivationMode || "default") +
                 ": " +
-                getAccountPlaceholderName({
-                  currency,
-                  index: 0,
-                  derivationMode,
-                }) +
+                getDefaultAccountNameForCurrencyIndex({ currency, index: 0 }) +
                 ": " +
                 path
               );

diff --git a/apps/cli/src/commands/blockchain/estimateMaxSpendable.ts b/apps/cli/src/commands/blockchain/estimateMaxSpendable.ts
@@ -1,14 +1,16 @@
 import { concat, from } from "rxjs";
 import { concatMap } from "rxjs/operators";
 import { getAccountBridge } from "@ledgerhq/live-common/bridge/index";
-import { getAccountUnit, getAccountName } from "@ledgerhq/live-common/account/index";
 import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
+import { getAccountCurrency } from "@ledgerhq/live-common/account/index";
 import { scan, scanCommonOpts } from "../../scan";
 import type { ScanCommonOpts } from "../../scan";
+import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
+import { AccountLike } from "@ledgerhq/types-live";
 
-const format = (account, value) => {
-  const unit = getAccountUnit(account);
-  const name = getAccountName(account);
+const format = (account: AccountLike, value) => {
+  const unit = getAccountCurrency(account).units[0];
+  const name = getDefaultAccountName(account);
   const amount = formatCurrencyUnit(unit, value, {
     showCode: true,
     disableRounding: true,

diff --git a/apps/cli/src/commands/blockchain/generateTestTransaction.ts b/apps/cli/src/commands/blockchain/generateTestTransaction.ts
@@ -10,6 +10,7 @@ import { getAccountBridge } from "@ledgerhq/live-common/bridge/index";
 import type { InferTransactionsOpts } from "../../transaction";
 import { inferTransactions, inferTransactionsOpts } from "../../transaction";
 import type { SignedOperation } from "@ledgerhq/types-live";
+import { getDefaultAccountNameForCurrencyIndex } from "@ledgerhq/live-wallet/accountName";
 
 const toJS = obj => {
   if (typeof obj === "object" && obj) {
@@ -118,7 +119,7 @@ ${apdus.map(a => "  " + a).join("\n")}
           reduce((jsCodes, code) => jsCodes.concat(code), []),
           map(
             codes => `{
-  name: "${account.name}",
+  name: "${getDefaultAccountNameForCurrencyIndex(account)}",
   raw: ${JSON.stringify(
     toAccountRaw({
       ...account,

diff --git a/apps/cli/src/commands/live/balanceHistory.ts b/apps/cli/src/commands/live/balanceHistory.ts
@@ -11,15 +11,17 @@ import {
 import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
 import { scan, scanCommonOpts } from "../../scan";
 import type { ScanCommonOpts } from "../../scan";
-import type { PortfolioRange } from "@ledgerhq/types-live";
-const histoFormatters = {
+import type { Account, BalanceHistory, PortfolioRange } from "@ledgerhq/types-live";
+import { getDefaultAccountNameForCurrencyIndex } from "@ledgerhq/live-wallet/accountName";
+
+const histoFormatters: Record<string, (histo: BalanceHistory, account: Account) => unknown> = {
   default: (histo, account) =>
     histo
       .map(
         ({ date, value }) =>
           date.toISOString() +
           " " +
-          formatCurrencyUnit(account.unit, new BigNumber(value), {
+          formatCurrencyUnit(account.currency.units[0], new BigNumber(value), {
             showCode: true,
             disableRounding: true,
           }),
@@ -29,21 +31,23 @@ const histoFormatters = {
   asciichart: (history, account) =>
     "\n" +
     "".padStart(22) +
-    account.name +
+    getDefaultAccountNameForCurrencyIndex(account) +
     ": " +
-    formatCurrencyUnit(account.unit, account.balance, {
+    formatCurrencyUnit(account.currency.units[0], account.balance, {
       showCode: true,
       disableRounding: true,
     }) +
     "\n" +
     asciichart.plot(
-      history.map(h => h.value.div(new BigNumber(10).pow(account.unit.magnitude)).toNumber()),
+      history.map(
+        h => h.value / new BigNumber(10).pow(account.currency.units[0].magnitude).toNumber(),
+      ),
       {
         height: 10,
         format: value =>
           formatCurrencyUnit(
-            account.unit,
-            new BigNumber(value).times(new BigNumber(10).pow(account.unit.magnitude)),
+            account.currency.units[0],
+            new BigNumber(value).times(new BigNumber(10).pow(account.currency.units[0].magnitude)),
             {
               showCode: true,
               disableRounding: true,

diff --git a/apps/cli/src/commands/live/exportAccounts.ts b/apps/cli/src/commands/live/exportAccounts.ts
@@ -1,11 +1,12 @@
 import { of, interval } from "rxjs";
 import { reduce, mergeMap, shareReplay, tap } from "rxjs/operators";
 import { dataToFrames } from "qrloop";
-import { encode } from "@ledgerhq/live-common/cross";
+import { encode } from "@ledgerhq/live-wallet/liveqr/cross";
 import { asQR } from "../../qr";
 import { scan, scanCommonOpts } from "../../scan";
 import type { ScanCommonOpts } from "../../scan";
 import { Account } from "@ledgerhq/types-live";
+import { initialState } from "@ledgerhq/live-wallet/store";
 export default {
   description: "Export given accounts to Live QR or console for importing",
   args: [
@@ -27,6 +28,7 @@ export default {
       reduce<Account, Account[]>((accounts, account) => accounts.concat(account), []),
       mergeMap(accounts => {
         const data = encode({
+          walletState: initialState,
           accounts,
           settings: {
             pairExchanges: {},

diff --git a/apps/cli/src/commands/live/portfolio.ts b/apps/cli/src/commands/live/portfolio.ts
@@ -5,7 +5,7 @@ import { from } from "rxjs";
 import { reduce, concatMap, map } from "rxjs/operators";
 import type { Account, PortfolioRange } from "@ledgerhq/types-live";
 import type { Currency } from "@ledgerhq/types-cryptoassets";
-import { flattenAccounts, getAccountName } from "@ledgerhq/live-common/account/index";
+import { flattenAccounts } from "@ledgerhq/live-common/account/index";
 import { getPortfolio, getRanges } from "@ledgerhq/live-countervalues/portfolio";
 import { formatCurrencyUnit, findCurrencyByTicker } from "@ledgerhq/live-common/currencies/index";
 import { scan, scanCommonOpts } from "../../scan";
@@ -15,6 +15,7 @@ import {
   loadCountervalues,
   inferTrackingPairForAccounts,
 } from "@ledgerhq/live-countervalues/logic";
+import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 
 function asPortfolioRange(period: string): PortfolioRange {
   const ranges = getRanges();
@@ -116,14 +117,15 @@ export default {
 
             let str = "";
             accounts.forEach(top => {
-              str += render("Account " + getAccountName(top), [top]);
+              str += render("Account " + getDefaultAccountName(top), [top]);
               str += "\n";
 
               if (top.subAccounts) {
                 top.subAccounts.forEach(sub => {
-                  str += render("Account " + getAccountName(top) + " > " + getAccountName(sub), [
-                    sub,
-                  ]).replace(/\n/s, "  \n");
+                  str += render(
+                    "Account " + getDefaultAccountName(top) + " > " + getDefaultAccountName(sub),
+                    [sub],
+                  ).replace(/\n/s, "  \n");
                   str += "\n";
                 });
               }

diff --git a/apps/cli/src/commands/ptx/swap.ts b/apps/cli/src/commands/ptx/swap.ts
@@ -19,7 +19,6 @@ import type {
 } from "@ledgerhq/live-common/exchange/swap/types";
 import { initSwap, getExchangeRates } from "@ledgerhq/live-common/exchange/swap/index";
 import { getAccountBridge } from "@ledgerhq/live-common/bridge/index";
-import { getAccountUnit } from "@ledgerhq/live-common/account/index";
 import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
 import invariant from "invariant";
 import { Account, SignedOperation, SubAccount } from "@ledgerhq/types-live";
@@ -89,11 +88,15 @@ const exec = async (opts: SwapJobOpts) => {
   }
 
   console.log("\t:id:\t\t", fromAccount.id);
-  const formattedAmount = formatCurrencyUnit(getAccountUnit(fromAccount), fromAccount.balance, {
-    disableRounding: true,
-    alwaysShowSign: false,
-    showCode: true,
-  });
+  const formattedAmount = formatCurrencyUnit(
+    getAccountCurrency(fromAccount).units[0],
+    fromAccount.balance,
+    {
+      disableRounding: true,
+      alwaysShowSign: false,
+      showCode: true,
+    },
+  );
 
   console.log("\t:balance:\t", fromAccount.spendableBalance.toString(), ` [ ${formattedAmount} ]`);
 

diff --git a/apps/cli/src/scan.ts b/apps/cli/src/scan.ts
@@ -19,8 +19,8 @@ import getAppAndVersion from "@ledgerhq/live-common/hw/getAppAndVersion";
 import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
 import { delay } from "@ledgerhq/live-common/promise";
 import { jsonFromFile } from "./stream";
-import { shortAddressPreview } from "@ledgerhq/live-common/account/helpers";
 import fs from "fs";
+
 export const deviceOpt = {
   name: "device",
   alias: "d",
@@ -317,21 +317,13 @@ export function scan(arg: ScanCommonOpts): Observable<Account> {
             });
             const account: Account = {
               type: "Account",
-              name:
-                currency.name +
-                " " +
-                (derivationMode || "legacy") +
-                " " +
-                shortAddressPreview(xpubOrAddress),
               xpub: xpubOrAddress,
               seedIdentifier: xpubOrAddress,
-              starred: true,
               used: true,
               swapHistory: [],
               id,
               derivationMode,
               currency,
-              unit: currency.units[0],
               index,
               freshAddress: xpubOrAddress,
               freshAddressPath,

diff --git a/apps/ledger-live-desktop/package.json b/apps/ledger-live-desktop/package.json
@@ -69,6 +69,7 @@
     "@ledgerhq/live-network": "workspace:^",
     "@ledgerhq/live-nft": "workspace:^",
     "@ledgerhq/live-nft-react": "workspace:^",
+    "@ledgerhq/live-wallet": "workspace:^",
     "@ledgerhq/logs": "workspace:^",
     "@ledgerhq/react-ui": "workspace:^",
     "@ledgerhq/types-cryptoassets": "workspace:^",

diff --git a/apps/ledger-live-desktop/src/helpers/accountModel.ts b/apps/ledger-live-desktop/src/helpers/accountModel.ts
@@ -3,7 +3,8 @@
  */
 import { createDataModel, DataModel } from "@ledgerhq/live-common/DataModel";
 import { fromAccountRaw, toAccountRaw } from "@ledgerhq/live-common/account/index";
-import { Account, AccountRaw, Operation } from "@ledgerhq/types-live";
+import { Account, AccountRaw, Operation, AccountUserData } from "@ledgerhq/types-live";
+import { accountRawToAccountUserData } from "@ledgerhq/live-wallet/store";
 
 /**
  * @memberof models/account
@@ -15,7 +16,7 @@ export const opRetentionStategy =
 
 const opRetentionFilter = opRetentionStategy(366, 500);
 
-const accountModel: DataModel<AccountRaw, Account> = createDataModel({
+const accountModel: DataModel<AccountRaw, [Account, AccountUserData]> = createDataModel({
   migrations: [
     // 2018-10-10: change of the account id format to include the derivationMode and seedIdentifier in Account
     raw => {
@@ -78,11 +79,15 @@ const accountModel: DataModel<AccountRaw, Account> = createDataModel({
     // ^- Each time a modification is brought to the model, add here a migration function here
   ],
 
-  decode: fromAccountRaw,
-  encode: (account: Account): AccountRaw =>
-    toAccountRaw({
-      ...account,
-      operations: account.operations.filter(opRetentionFilter),
-    }),
+  decode: (raw: AccountRaw) => [fromAccountRaw(raw), accountRawToAccountUserData(raw)],
+  encode: ([account, userData]: [Account, AccountUserData]): AccountRaw =>
+    toAccountRaw(
+      {
+        ...account,
+        operations: account.operations.filter(opRetentionFilter),
+      },
+      userData,
+    ),
 });
+
 export default accountModel;
diff --git a/apps/ledger-live-desktop/src/renderer/actions/accounts.ts b/apps/ledger-live-desktop/src/renderer/actions/accounts.ts
@@ -1,27 +1,24 @@
 import { Dispatch } from "redux";
-import { Account, SubAccount } from "@ledgerhq/types-live";
-import { AccountComparator } from "@ledgerhq/live-common/account/index";
+import { Account, AccountUserData } from "@ledgerhq/types-live";
+import { AccountComparator } from "@ledgerhq/live-wallet/ordering";
 import { getKey } from "~/renderer/storage";
 
-export const replaceAccounts = (payload: Account[]) => ({
-  type: "DB:REPLACE_ACCOUNTS",
-  payload,
-});
-
-export const addAccount = (payload: Account) => ({
-  type: "DB:ADD_ACCOUNT",
-  payload,
-});
-
 export const removeAccount = (payload: Account) => ({
   type: "DB:REMOVE_ACCOUNT",
   payload,
 });
 
-export const setAccounts = (payload: Account[]) => ({
-  type: "SET_ACCOUNTS",
-  payload,
-});
+export const initAccounts = (data: [Account, AccountUserData][]) => {
+  const accounts = data.map(data => data[0]);
+  const accountsUserData = data.map(data => data[1]);
+  return {
+    type: "INIT_ACCOUNTS",
+    payload: {
+      accounts,
+      accountsUserData,
+    },
+  };
+};
 
 export const reorderAccounts = (comparator: AccountComparator) => (dispatch: Dispatch) =>
   dispatch({
@@ -30,11 +27,8 @@ export const reorderAccounts = (comparator: AccountComparator) => (dispatch: Dis
   });
 
 export const fetchAccounts = () => async (dispatch: Dispatch) => {
-  const accounts = await getKey("app", "accounts", []);
-  return dispatch({
-    type: "SET_ACCOUNTS",
-    payload: accounts,
-  });
+  const data: [Account, AccountUserData][] = await getKey("app", "accounts", []);
+  return dispatch(initAccounts(data));
 };
 
 type UpdateAccountAction = {
@@ -61,24 +55,6 @@ export const updateAccount: UpdateAccount = payload => ({
   },
 });
 
-export const toggleStarAction = (id: string, parentId?: string): UpdateAccountAction => {
-  return {
-    type: "DB:UPDATE_ACCOUNT",
-    payload: {
-      updater: (account: Account) => {
-        if (parentId && account.subAccounts) {
-          const subAccounts: SubAccount[] = account.subAccounts.map(sa =>
-            sa.id === id ? { ...sa, starred: !sa.starred } : sa,
-          );
-          return { ...account, subAccounts };
-        }
-        return { ...account, starred: !account.starred };
-      },
-      accountId: parentId || id,
-    },
-  };
-};
-
 export const cleanAccountsCache = () => ({ type: "DB:CLEAN_ACCOUNTS_CACHE" });
 export const cleanFullNodeDisconnect = () => ({
   type: "DB:CLEAN_FULLNODE_DISCONNECT",