Merge branch 'release/v21.36.0' into develop

* release/v21.36.0:
  v21.36.0
  LIVE-1157 New scan accounts mode (#1747)
  (MarketProvider): updated for better ux and seperation of data sections single vs list market data (#1820)

package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live-common"
   },
-  "version": "21.35.0",
+  "version": "21.36.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "Apache-2.0",

src/bridge/jsHelpers.ts

@@ -42,6 +42,22 @@ import type { Result, GetAddressOptions } from "../hw/getAddress/types";
 import { open, close } from "../hw";
 import { withDevice } from "../hw/deviceAccess";
 
+// Customize the way to iterate on the keychain derivation
+type IterateResult = ({
+  transport: Transport,
+  index: number,
+  derivationsCache: Object,
+  derivationScheme: string,
+  derivationMode: DerivationMode,
+  currency: CryptoCurrency,
+}) => Promise<Result | null>;
+
+export type IterateResultBuilder = ({
+  result: Result, // derivation on the "root" of the derivation
+  derivationMode: DerivationMode, // identify the current derivation scheme
+  derivationScheme: string,
+}) => Promise<IterateResult>;
+
 export type GetAccountShapeArg0 = {
   currency: CryptoCurrency;
   address: string;
@@ -151,10 +167,13 @@ export const mergeNfts = (oldNfts: NFT[], newNfts: NFT[]): NFT[] => {
 };
 
 export const makeSync =
-  (
-    getAccountShape: GetAccountShape,
-    postSync: (initial: Account, synced: Account) => Account = (_, a) => a
-  ): AccountBridge<any>["sync"] =>
+  ({
+    getAccountShape,
+    postSync = (_, a) => a,
+  }: {
+    getAccountShape: GetAccountShape;
+    postSync?: (initial: Account, synced: Account) => Account;
+  }): AccountBridge<any>["sync"] =>
   (initial, syncConfig): Observable<AccountUpdater> =>
     Observable.create((o) => {
       async function main() {
@@ -217,13 +236,45 @@ export const makeSync =
       main();
     });
 
+const iterateResultWithAddressDerivation: IterateResult = async ({
+  transport,
+  index,
+  derivationsCache,
+  derivationScheme,
+  derivationMode,
+  currency,
+}) => {
+  let res;
+  const freshAddressPath = runDerivationScheme(derivationScheme, currency, {
+    account: index,
+  });
+  res = derivationsCache[freshAddressPath];
+  if (!res) {
+    res = await getAddress(transport, {
+      currency,
+      path: freshAddressPath,
+      derivationMode,
+    });
+    derivationsCache[freshAddressPath] = res;
+  }
+  return res;
+};
+
+const defaultIterateResultBuilder = () =>
+  Promise.resolve(iterateResultWithAddressDerivation);
+
 export const makeScanAccounts =
-  (
-    getAccountShape: GetAccountShape,
+  ({
+    getAccountShape,
+    buildIterateResult = defaultIterateResultBuilder,
+    getAddressFn,
+  }: {
+    getAccountShape: GetAccountShape;
+    buildIterateResult?: IterateResultBuilder;
     getAddressFn?: (
       transport: Transport
-    ) => (opts: GetAddressOptions) => Promise<Result>
-  ): CurrencyBridge["scanAccounts"] =>
+    ) => (opts: GetAddressOptions) => Promise<Result>;
+  }): CurrencyBridge["scanAccounts"] =>
   ({ currency, deviceId, syncConfig }): Observable<ScanAccountEvent> =>
     Observable.create((o) => {
       let finished = false;
@@ -234,17 +285,17 @@ export const makeScanAccounts =
 
       const derivationsCache = {};
 
-      // in future ideally what we want is:
-      // return mergeMap(addressesObservable, address => fetchAccount(address))
       async function stepAccount(
         index,
-        { address, path: freshAddressPath, ...rest },
+        res: Result,
         derivationMode,
         seedIdentifier,
         transport
       ): Promise<Account | null | undefined> {
         if (finished) return;
 
+        const { address, path: freshAddressPath, ...rest } = res;
+
         const accountShape: Partial<Account> = await getAccountShape(
           {
             transport,
@@ -313,6 +364,51 @@ export const makeScanAccounts =
           account.used = !isAccountEmpty(account);
         }
 
+        // Bitcoin needs to compute the freshAddressPath itself,
+        // so we update it afterwards
+        if (account?.freshAddressPath) {
+          res.address = account.freshAddress;
+          derivationsCache[account.freshAddressPath] = res;
+        }
+
+        log("scanAccounts", "derivationsCache", res);
+
+        log(
+          "scanAccounts",
+          `scanning ${currency.id} at ${freshAddressPath}: ${
+            res.address
+          } resulted of ${
+            account
+              ? `Account with ${account.operations.length} txs`
+              : "no account"
+          }`
+        );
+        if (!account) return;
+        account.name = !account.used
+          ? getNewAccountPlaceholderName({
+              currency,
+              index,
+              derivationMode,
+            })
+          : getAccountPlaceholderName({
+              currency,
+              index,
+              derivationMode,
+            });
+
+        const showNewAccount = shouldShowNewAccount(currency, derivationMode);
+
+        if (account.used || showNewAccount) {
+          log(
+            "debug",
+            `Emit 'discovered' event for a new account found. AccountUsed: ${account.used} - showNewAccount: ${showNewAccount}`
+          );
+          o.next({
+            type: "discovered",
+            account,
+          });
+        }
+
         return account;
       }
 
@@ -334,7 +430,7 @@ export const makeScanAccounts =
               "scanAccounts",
               `scanning ${currency.id} on derivationMode=${derivationMode}`
             );
-            let result = derivationsCache[path];
+            let result: Result = derivationsCache[path];
 
             if (!result) {
               try {
@@ -343,6 +439,7 @@ export const makeScanAccounts =
                   path,
                   derivationMode,
                 });
+
                 derivationsCache[path] = result;
               } catch (e) {
                 if (e instanceof UnsupportedDerivation) {
@@ -365,10 +462,7 @@ export const makeScanAccounts =
               derivationMode,
               currency,
             });
-            const showNewAccount = shouldShowNewAccount(
-              currency,
-              derivationMode
-            );
+
             const stopAt = isIterableDerivationMode(derivationMode) ? 255 : 1;
             const startsAt = getDerivationModeStartsAt(derivationMode);
 
@@ -377,6 +471,12 @@ export const makeScanAccounts =
               `start scanning account process. MandatoryEmptyAccountSkip ${mandatoryEmptyAccountSkip} / StartsAt: ${startsAt} - StopAt: ${stopAt}`
             );
 
+            const iterateResult = await buildIterateResult({
+              result,
+              derivationMode,
+              derivationScheme,
+            });
+
             for (let index = startsAt; index < stopAt; index++) {
               log("debug", `start to scan a new account. Index: ${index}`);
 
@@ -386,23 +486,17 @@ export const makeScanAccounts =
               }
 
               if (!derivationModeSupportsIndex(derivationMode, index)) continue;
-              const freshAddressPath = runDerivationScheme(
+
+              const res = await iterateResult({
+                transport,
+                index,
+                derivationsCache,
+                derivationMode,
                 derivationScheme,
                 currency,
-                {
-                  account: index,
-                }
-              );
-              let res = derivationsCache[freshAddressPath];
+              });
 
-              if (!res) {
-                res = await getAddress(transport, {
-                  currency,
-                  path: freshAddressPath,
-                  derivationMode,
-                });
-                derivationsCache[freshAddressPath] = res;
-              }
+              if (!res) break;
 
               const account = await stepAccount(
                 index,
@@ -411,54 +505,14 @@ export const makeScanAccounts =
                 seedIdentifier,
                 transport
               );
-              // Bitcoin needs to compute the freshAddressPath itself,
-              // so we update it afterwards
-              if (account?.freshAddressPath) {
-                res.address = account.freshAddress;
-                derivationsCache[account.freshAddressPath] = res;
-              }
-              log("scanAccounts", "derivationsCache", res);
-
-              log(
-                "scanAccounts",
-                `scanning ${currency.id} at ${freshAddressPath}: ${
-                  res.address
-                } resulted of ${
-                  account
-                    ? `Account with ${account.operations.length} txs`
-                    : "no account"
-                }`
-              );
-              if (!account) return;
-              account.name = !account.used
-                ? getNewAccountPlaceholderName({
-                    currency,
-                    index,
-                    derivationMode,
-                  })
-                : getAccountPlaceholderName({
-                    currency,
-                    index,
-                    derivationMode,
-                  });
-
-              if (account.used || showNewAccount) {
-                log(
-                  "debug",
-                  `Emit 'discovered' event for a new account found. AccountUsed: ${account.used} - showNewAccount: ${showNewAccount}`
-                );
-                o.next({
-                  type: "discovered",
-                  account,
-                });
-              }
 
-              if (!account.used) {
+              if (account && !account.used) {
                 if (emptyCount >= mandatoryEmptyAccountSkip) break;
                 emptyCount++;
               }
             }
           }
+          // }
 
           o.complete();
         } catch (e) {

src/families/algorand/js-synchronization.ts

@@ -426,9 +426,5 @@ async function buildSubAccounts({
   return tokenAccounts;
 }
 
-const postSync = (_initial: Account, parent: Account) => {
-  return parent;
-};
-
-export const scanAccounts = makeScanAccounts(getAccountShape);
-export const sync = makeSync(getAccountShape, postSync);
+export const scanAccounts = makeScanAccounts({ getAccountShape });
+export const sync = makeSync({ getAccountShape });

src/families/bitcoin/js-synchronisation.ts

@@ -408,5 +408,8 @@ const getAddressFn = (transport) => {
   return (opts) => getAddressWithBtcInstance(transport, btc, opts);
 };
 
-export const scanAccounts = makeScanAccounts(getAccountShape, getAddressFn);
-export const sync = makeSync(getAccountShape, postSync);
+export const scanAccounts = makeScanAccounts({
+  getAccountShape,
+  getAddressFn,
+});
+export const sync = makeSync({ getAccountShape, postSync });

src/families/celo/js-synchronisation.ts

@@ -1,4 +1,3 @@
-import type { Account } from "../../types";
 import { encodeAccountId } from "../../account";
 import type { GetAccountShape } from "../../bridge/jsHelpers";
 import { makeSync, makeScanAccounts, mergeOps } from "../../bridge/jsHelpers";
@@ -32,9 +31,5 @@ const getAccountShape: GetAccountShape = async (info) => {
   return { ...shape, operations };
 };
 
-const postSync = (_initial: Account, parent: Account) => {
-  return parent;
-};
-
-export const scanAccounts = makeScanAccounts(getAccountShape);
-export const sync = makeSync(getAccountShape, postSync);
+export const scanAccounts = makeScanAccounts({ getAccountShape });
+export const sync = makeSync({ getAccountShape });

src/families/cosmos/bridge/js.ts

@@ -3,15 +3,12 @@ import estimateMaxSpendable from "../js-estimateMaxSpendable";
 import getTransactionStatus from "../js-getTransactionStatus";
 import prepareTransaction from "../js-prepareTransaction";
 import signOperation from "../js-signOperation";
-import { sync, getAccountShape } from "../js-synchronisation";
+import { sync, scanAccounts } from "../js-synchronisation";
 import updateTransaction from "../js-updateTransaction";
 import { AccountBridge, CurrencyBridge, CryptoCurrency } from "../../../types";
 import type { CosmosValidatorItem, Transaction } from "../types";
 import { getValidators, hydrateValidators } from "../validators";
-import {
-  makeAccountBridgeReceive,
-  makeScanAccounts,
-} from "../../../bridge/jsHelpers";
+import { makeAccountBridgeReceive } from "../../../bridge/jsHelpers";
 import { broadcast } from "../api/Cosmos";
 import {
   asSafeCosmosPreloadData,
@@ -47,7 +44,7 @@ const currencyBridge: CurrencyBridge = {
     hydrateValidators(validators);
     setCosmosPreloadData(asSafeCosmosPreloadData(data));
   },
-  scanAccounts: makeScanAccounts(getAccountShape),
+  scanAccounts,
 };
 
 const accountBridge: AccountBridge<Transaction> = {