@ledgerhq/live-common 26.1.0-next.1 → 27.0.0

package/src/account/importAccounts.ts

@@ -5,6 +5,13 @@ import { findAccountMigration, checkAccountSupported } from "./support";
 import joinSwapHistories from "../exchange/swap/joinSwapHistories";
 import isEqual from "lodash/isEqual";
 import type { Account } from "@ledgerhq/types-live";
+import { BridgeCacheSystem } from "../bridge/cache";
+import { getAccountBridge } from "../bridge";
+import { promiseAllBatched } from "../promise";
+import { getEnv } from "../env";
+import { Observable } from "rxjs";
+import { reduce } from "rxjs/operators";
+
 const itemModeDisplaySort = {
   create: 1,
   update: 2,
@@ -103,31 +110,115 @@ export const importAccountsMakeItems = ({
         itemModeDisplaySort[(a as ImportItem).mode] -
         itemModeDisplaySort[(b as ImportItem).mode]
     ) as ImportItem[];
+
+/**
+ * SyncNewAccountsOutput
+ * - synchronized: a map of account id to account. the account id are kept as originally set in the items[].account before a possible "remap" of the ids after a sync happened
+ * - failed: a map of account id to errors for all possible fails that happened.
+ */
+export type SyncNewAccountsOutput = {
+  synchronized: Record<string, Account>;
+  failed: Record<string, Error>;
+};
+
+export type SyncNewAccountsInput = {
+  items: ImportItem[];
+  selectedAccounts: string[];
+};
+
+/**
+ *
+ * @param items: result of importAccountsMakeItems
+ * @param selectedAccounts: user's selected accounts
+ * @param bridgeCache: the bridge cache created on user land to prepare currency for a sync
+ * @param blacklistedTokenIds: the list of blacklisted token ids to ignore sync with
+ * @returns SyncNewAccountsOutput
+ */
+export const syncNewAccountsToImport = async (
+  { items, selectedAccounts }: SyncNewAccountsInput,
+  bridgeCache: BridgeCacheSystem,
+  blacklistedTokenIds?: string[]
+): Promise<SyncNewAccountsOutput> => {
+  const selectedItems = items.filter((item) =>
+    selectedAccounts.includes(item.account.id)
+  );
+  const synchronized = {};
+  const failed = {};
+  await promiseAllBatched(
+    getEnv("SYNC_MAX_CONCURRENT"),
+    selectedItems,
+    async ({ account }) => {
+      try {
+        const bridge = getAccountBridge(account);
+        await bridgeCache.prepareCurrency(account.currency);
+        const syncConfig = {
+          paginationConfig: {},
+          blacklistedTokenIds,
+        };
+        const observable = bridge.sync(account, syncConfig);
+        const reduced: Observable<Account> = observable.pipe(
+          reduce((a, f: (_: Account) => Account) => f(a), account)
+        );
+        const synced = await reduced.toPromise();
+        synchronized[account.id] = synced;
+      } catch (e) {
+        failed[account.id] = e;
+      }
+    }
+  );
+  return { synchronized, failed };
+};
+
+export type ImportAccountsReduceInput = {
+  items: ImportItem[];
+  selectedAccounts: string[];
+  syncResult: SyncNewAccountsOutput;
+};
+
+/**
+ *
+ * @param existingAccounts
+ * @param items: value resulting of importAccountsMakeItems
+ * @params selectedAccounts: array of all account ids selected by user for import
+ * @param syncedNewAccounts: accounts resulting of syncNewAccountsToImport(). all accounts that would be missing from that list would be ignored to be imported (fresh sync is needed to make sure the accounts are "ready")
+ * @returns all accounts
+ */
 export const importAccountsReduce = (
   existingAccounts: Account[],
-  {
-    items,
-    selectedAccounts,
-  }: {
-    items: ImportItem[];
-    selectedAccounts: string[];
-  }
+  { items, selectedAccounts, syncResult }: ImportAccountsReduceInput
 ): Account[] => {
   const accounts = existingAccounts.slice(0);
   const selectedItems = items.filter((item) =>
     selectedAccounts.includes(item.account.id)
   );
 
-  for (const { mode, account, initialAccountId } of selectedItems) {
+  for (const {
+    mode,
+    account: { id },
+    initialAccountId,
+  } of selectedItems) {
+    const account = syncResult.synchronized[id];
+    if (!account) continue;
     switch (mode) {
-      case "create":
-        accounts.push(account);
+      case "create": {
+        const exists = accounts.find(
+          (a) => a.id === initialAccountId || a.id === id
+        );
+        if (!exists) {
+          // prevent duplicate cases to happen (in case of race condition)
+          accounts.push(account);
+        }
         break;
+      }
 
       case "update": {
-        const item = accounts.find((a) => a.id === initialAccountId);
+        const item = accounts.find(
+          (a) => a.id === initialAccountId || a.id === id
+        );
         const i = accounts.indexOf(item as Account);
-        accounts[i] = account;
+        if (i !== -1) {
+          accounts[i] = account;
+        }
         break;
       }
 

package/lib/__tests__/accounts/importAccounts.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=importAccounts.d.ts.map

package/lib/__tests__/accounts/importAccounts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"importAccounts.d.ts","sourceRoot":"","sources":["../../../src/__tests__/accounts/importAccounts.ts"],"names":[],"mappings":""}

package/lib/__tests__/accounts/importAccounts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"importAccounts.js","sourceRoot":"","sources":["../../../src/__tests__/accounts/importAccounts.ts"],"names":[],"mappings":"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"}