npm - @ledgerhq/live-common - Versions diffs - 27.0.0-next.2 → 27.0.0-next.3 - Mend

@ledgerhq/live-common 27.0.0-next.2 → 27.0.0-next.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/lib/account/importAccounts.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { Result } from "../cross";
 import type { Account } from "@ledgerhq/types-live";
+import { BridgeCacheSystem } from "../bridge/cache";
 declare const itemModeDisplaySort: {
     create: number;
     update: number;
@@ -17,9 +18,41 @@ export declare const importAccountsMakeItems: ({ result, accounts, items, }: {
     accounts: Account[];
     items?: ImportItem[] | undefined;
 }) => ImportItem[];
-export declare const importAccountsReduce: (existingAccounts: Account[], { items, selectedAccounts, }: {
+/**
+ * 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 declare type SyncNewAccountsOutput = {
+    synchronized: Record<string, Account>;
+    failed: Record<string, Error>;
+};
+export declare type SyncNewAccountsInput = {
     items: ImportItem[];
     selectedAccounts: string[];
-}) => Account[];
+};
+/**
+ *
+ * @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 declare const syncNewAccountsToImport: ({ items, selectedAccounts }: SyncNewAccountsInput, bridgeCache: BridgeCacheSystem, blacklistedTokenIds?: string[] | undefined) => Promise<SyncNewAccountsOutput>;
+export declare 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 declare const importAccountsReduce: (existingAccounts: Account[], { items, selectedAccounts, syncResult }: ImportAccountsReduceInput) => Account[];
 export {};
 //# sourceMappingURL=importAccounts.d.ts.map

package/lib/account/importAccounts.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"importAccounts.d.ts","sourceRoot":"","sources":["../../src/account/importAccounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,QAAA,MAAM,mBAAmB;;;;;CAKxB,CAAC;AACF,oBAAY,cAAc,GAAG,MAAM,OAAO,mBAAmB,CAAC;AAC9D,oBAAY,UAAU,GAAG;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC;CACtB,CAAC;AACF,eAAO,MAAM,uBAAuB;YAK1B,MAAM;cACJ,OAAO,EAAE;;MAEjB,UAAU,EA6EO,CAAC;~~AACtB~~,~~eAAO~~,MAAM,~~oBAAoB~~,~~qBACb~~,OAAO,EAAE;~~WAKlB~~,UAAU,EAAE;~~sBACD~~,MAAM,EAAE;~~MAE3B~~,OAAO,~~EAwBT~~,CAAC"}
1	+ {"version":3,"file":"importAccounts.d.ts","sourceRoot":"","sources":["../../src/account/importAccounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAOpD,QAAA,MAAM,mBAAmB;;;;;CAKxB,CAAC;AACF,oBAAY,cAAc,GAAG,MAAM,OAAO,mBAAmB,CAAC;AAC9D,oBAAY,UAAU,GAAG;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC;CACtB,CAAC;AACF,eAAO,MAAM,uBAAuB;YAK1B,MAAM;cACJ,OAAO,EAAE;;MAEjB,UAAU,EA6EO,CAAC;AAEtB;;;;GAIG;AACH,oBAAY,qBAAqB,GAAG;IAClC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAC/B,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,gCACL,oBAAoB,eACpC,iBAAiB,iDAE7B,QAAQ,qBAAqB,CA6B/B,CAAC;AAEF,oBAAY,yBAAyB,GAAG;IACtC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,qBAAqB,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,qBACb,OAAO,EAAE,2CACc,yBAAyB,KACjE,OAAO,EAyCT,CAAC"}

package/lib/account/importAccounts.integration.test.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import "../__tests__/test-helpers/setup";
2	+ //# sourceMappingURL=importAccounts.integration.test.d.ts.map

package/lib/account/importAccounts.integration.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"importAccounts.integration.test.d.ts","sourceRoot":"","sources":["../../src/account/importAccounts.integration.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

package/lib/account/importAccounts.integration.test.js ADDED Viewed

@@ -0,0 +1,219 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+require("../__tests__/test-helpers/setup");
+var cache_1 = require("../bridge/cache");
+var cross_1 = require("../cross");
+var _1 = require(".");
+jest.setTimeout(200000);
+test("importAccounts with a set of real data", function () { return __awaiter(void 0, void 0, void 0, function () {
+    var accounts, localCache, bridgeCache, result, accountsState, items, selectedAccounts, syncResult, reduced;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                accounts = [
+                    {
+                        id: "js:2:algorand:32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI:",
+                        seedIdentifier: "32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI",
+                        name: "Algorand legacy 32PI2C5H...RXBSVWQI",
+                        starred: true,
+                        used: true,
+                        derivationMode: "",
+                        index: 0,
+                        freshAddress: "32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI",
+                        freshAddressPath: "44'/283'/0'/0/0",
+                        freshAddresses: [],
+                        blockHeight: 23066613,
+                        creationDate: "2022-02-04T13:12:58.000Z",
+                        operationsCount: 184,
+                        operations: [],
+                        pendingOperations: [],
+                        currencyId: "algorand",
+                        unitMagnitude: 6,
+                        lastSyncDate: "2022-08-26T09:24:27.076Z",
+                        balance: "2100190",
+                        spendableBalance: "190",
+                        xpub: "32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI",
+                        subAccounts: [],
+                        algorandResources: { rewards: "190", nbAssets: 20 },
+                        swapHistory: []
+                    },
+                    {
+                        id: "js:2:tron:TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK:",
+                        seedIdentifier: "TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK",
+                        name: "Tron legacy TRbtdwHo...5sx3fFCK",
+                        starred: true,
+                        used: true,
+                        derivationMode: "",
+                        index: 0,
+                        freshAddress: "TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK",
+                        freshAddressPath: "44'/195'/0'/0/0",
+                        freshAddresses: [],
+                        blockHeight: 43642499,
+                        creationDate: "2022-07-19T15:32:12.000Z",
+                        operationsCount: 41,
+                        operations: [],
+                        pendingOperations: [],
+                        currencyId: "tron",
+                        unitMagnitude: 6,
+                        lastSyncDate: "2022-08-26T09:24:59.492Z",
+                        balance: "0",
+                        spendableBalance: "0",
+                        xpub: "TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK",
+                        subAccounts: [],
+                        tronResources: {
+                            frozen: {},
+                            delegatedFrozen: {},
+                            votes: [],
+                            tronPower: 0,
+                            energy: "0",
+                            bandwidth: {
+                                freeUsed: "0",
+                                freeLimit: "1500",
+                                gainedUsed: "0",
+                                gainedLimit: "0"
+                            },
+                            unwithdrawnReward: "2730",
+                            lastVotedDate: "2022-07-22T14:39:51.000Z",
+                            cacheTransactionInfoById: {}
+                        },
+                        swapHistory: []
+                    },
+                    {
+                        id: "js:2:polkadot:15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP:polkadotbip44",
+                        seedIdentifier: "15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP",
+                        name: "Polkadot polkadotbip44 15jLBbe9...5KrKM1eP",
+                        starred: true,
+                        used: true,
+                        derivationMode: "polkadotbip44",
+                        index: 0,
+                        freshAddress: "15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP",
+                        freshAddressPath: "44'/354'/0'/0'/0'",
+                        freshAddresses: [],
+                        blockHeight: 11771108,
+                        creationDate: "2022-02-24T14:39:00.007Z",
+                        operationsCount: 65,
+                        operations: [],
+                        pendingOperations: [],
+                        currencyId: "polkadot",
+                        unitMagnitude: 10,
+                        lastSyncDate: "2022-08-26T09:25:00.713Z",
+                        balance: "15512511464",
+                        spendableBalance: "15512511464",
+                        xpub: "15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP",
+                        polkadotResources: {
+                            controller: null,
+                            stash: null,
+                            nonce: 63,
+                            lockedBalance: "0",
+                            unlockedBalance: "0",
+                            unlockingBalance: "0",
+                            unlockings: [],
+                            nominations: []
+                        },
+                        swapHistory: []
+                    },
+                    {
+                        id: "js:2:bsc:0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB:",
+                        seedIdentifier: "0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB",
+                        name: "Binance Smart Chain legacy 0xa22CA8...CdD06FAB",
+                        starred: true,
+                        used: true,
+                        derivationMode: "",
+                        index: 0,
+                        freshAddress: "0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB",
+                        freshAddressPath: "44'/60'/0'/0/0",
+                        freshAddresses: [],
+                        blockHeight: 20775454,
+                        syncHash: "[]_655",
+                        creationDate: "2022-02-04T13:11:32.001Z",
+                        operationsCount: 21,
+                        operations: [],
+                        pendingOperations: [],
+                        currencyId: "bsc",
+                        unitMagnitude: 18,
+                        lastSyncDate: "2022-08-26T09:25:01.109Z",
+                        balance: "3128019430408477",
+                        spendableBalance: "3128019430408477",
+                        xpub: "0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB",
+                        subAccounts: [],
+                        swapHistory: []
+                    },
+                ].map(_1.fromAccountRaw);
+                localCache = {};
+                bridgeCache = (0, cache_1.makeBridgeCacheSystem)({
+                    saveData: function (c, d) {
+                        localCache[c.id] = d;
+                        return Promise.resolve();
+                    },
+                    getData: function (c) {
+                        return Promise.resolve(localCache[c.id]);
+                    }
+                });
+                result = {
+                    accounts: accounts.map(cross_1.accountToAccountData),
+                    settings: { currenciesSettings: {}, pairExchanges: {} },
+                    meta: { exporterName: "Test", exporterVersion: "0" }
+                };
+                accountsState = [];
+                items = (0, _1.importAccountsMakeItems)({
+                    result: result,
+                    accounts: accountsState
+                });
+                selectedAccounts = accounts.map(function (a) { return a.id; });
+                return [4 /*yield*/, (0, _1.syncNewAccountsToImport)({ items: items, selectedAccounts: selectedAccounts }, bridgeCache)];
+            case 1:
+                syncResult = _a.sent();
+                reduced = (0, _1.importAccountsReduce)(accountsState, {
+                    items: items,
+                    selectedAccounts: selectedAccounts,
+                    syncResult: syncResult
+                });
+                expect(reduced.length).toEqual(4);
+                expect(reduced[0].algorandResources).toBeDefined();
+                expect(reduced[1].tronResources).toBeDefined();
+                expect(reduced[2].polkadotResources).toBeDefined();
+                expect(reduced[0].operations.length).toBeGreaterThan(1);
+                expect(reduced[1].operations.length).toBeGreaterThan(1);
+                expect(reduced[2].operations.length).toBeGreaterThan(1);
+                expect(reduced[3].operations.length).toBeGreaterThan(1);
+                return [2 /*return*/];
+        }
+    });
+}); });
+//# sourceMappingURL=importAccounts.integration.test.js.map

package/lib/account/importAccounts.integration.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"importAccounts.integration.test.js","sourceRoot":"","sources":["../../src/account/importAccounts.integration.test.ts"],"names":[],"mappings":"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"}

package/lib/account/importAccounts.js CHANGED Viewed

@@ -10,6 +10,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -25,12 +61,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.importAccountsReduce = exports.importAccountsMakeItems = void 0;
+exports.importAccountsReduce = exports.syncNewAccountsToImport = exports.importAccountsMakeItems = void 0;
 var logs_1 = require("@ledgerhq/logs");
 var cross_1 = require("../cross");
 var support_1 = require("./support");
 var joinSwapHistories_1 = __importDefault(require("../exchange/swap/joinSwapHistories"));
 var isEqual_1 = __importDefault(require("lodash/isEqual"));
+var bridge_1 = require("../bridge");
+var promise_1 = require("../promise");
+var env_1 = require("../env");
+var operators_1 = require("rxjs/operators");
 var itemModeDisplaySort = {
     create: 1,
     update: 2,
@@ -100,22 +140,100 @@ var importAccountsMakeItems = function (_a) {
     });
 };
 exports.importAccountsMakeItems = importAccountsMakeItems;
-var importAccountsReduce = function (existingAccounts, _a) {
-    var e_1, _b;
+/**
+ *
+ * @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
+ */
+var syncNewAccountsToImport = function (_a, bridgeCache, blacklistedTokenIds) {
     var items = _a.items, selectedAccounts = _a.selectedAccounts;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var selectedItems, synchronized, failed;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    selectedItems = items.filter(function (item) {
+                        return selectedAccounts.includes(item.account.id);
+                    });
+                    synchronized = {};
+                    failed = {};
+                    return [4 /*yield*/, (0, promise_1.promiseAllBatched)((0, env_1.getEnv)("SYNC_MAX_CONCURRENT"), selectedItems, function (_a) {
+                            var account = _a.account;
+                            return __awaiter(void 0, void 0, void 0, function () {
+                                var bridge, syncConfig, observable, reduced, synced, e_1;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            _b.trys.push([0, 3, , 4]);
+                                            bridge = (0, bridge_1.getAccountBridge)(account);
+                                            return [4 /*yield*/, bridgeCache.prepareCurrency(account.currency)];
+                                        case 1:
+                                            _b.sent();
+                                            syncConfig = {
+                                                paginationConfig: {},
+                                                blacklistedTokenIds: blacklistedTokenIds
+                                            };
+                                            observable = bridge.sync(account, syncConfig);
+                                            reduced = observable.pipe((0, operators_1.reduce)(function (a, f) { return f(a); }, account));
+                                            return [4 /*yield*/, reduced.toPromise()];
+                                        case 2:
+                                            synced = _b.sent();
+                                            synchronized[account.id] = synced;
+                                            return [3 /*break*/, 4];
+                                        case 3:
+                                            e_1 = _b.sent();
+                                            failed[account.id] = e_1;
+                                            return [3 /*break*/, 4];
+                                        case 4: return [2 /*return*/];
+                                    }
+                                });
+                            });
+                        })];
+                case 1:
+                    _b.sent();
+                    return [2 /*return*/, { synchronized: synchronized, failed: failed }];
+            }
+        });
+    });
+};
+exports.syncNewAccountsToImport = syncNewAccountsToImport;
+/**
+ *
+ * @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
+ */
+var importAccountsReduce = function (existingAccounts, _a) {
+    var e_2, _b;
+    var items = _a.items, selectedAccounts = _a.selectedAccounts, syncResult = _a.syncResult;
     var accounts = existingAccounts.slice(0);
     var selectedItems = items.filter(function (item) {
         return selectedAccounts.includes(item.account.id);
     });
-    var _loop_1 = function (mode, account, initialAccountId) {
+    var _loop_1 = function (mode, id, initialAccountId) {
+        var account = syncResult.synchronized[id];
+        if (!account)
+            return "continue";
         switch (mode) {
-            case "create":
-                accounts.push(account);
+            case "create": {
+                var exists = accounts.find(function (a) { return a.id === initialAccountId || a.id === id; });
+                if (!exists) {
+                    // prevent duplicate cases to happen (in case of race condition)
+                    accounts.push(account);
+                }
                 break;
+            }
             case "update": {
-                var item = accounts.find(function (a) { return a.id === initialAccountId; });
+                var item = accounts.find(function (a) { return a.id === initialAccountId || a.id === id; });
                 var i = accounts.indexOf(item);
-                accounts[i] = account;
+                if (i !== -1) {
+                    accounts[i] = account;
+                }
                 break;
             }
             default:
@@ -123,16 +241,16 @@ var importAccountsReduce = function (existingAccounts, _a) {
     };
     try {
         for (var selectedItems_1 = __values(selectedItems), selectedItems_1_1 = selectedItems_1.next(); !selectedItems_1_1.done; selectedItems_1_1 = selectedItems_1.next()) {
-            var _c = selectedItems_1_1.value, mode = _c.mode, account = _c.account, initialAccountId = _c.initialAccountId;
-            _loop_1(mode, account, initialAccountId);
+            var _c = selectedItems_1_1.value, mode = _c.mode, id = _c.account.id, initialAccountId = _c.initialAccountId;
+            _loop_1(mode, id, initialAccountId);
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
             if (selectedItems_1_1 && !selectedItems_1_1.done && (_b = selectedItems_1["return"])) _b.call(selectedItems_1);
         }
-        finally { if (e_1) throw e_1.error; }
+        finally { if (e_2) throw e_2.error; }
     }
     return accounts;
 };

package/lib/account/importAccounts.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"importAccounts.js","sourceRoot":"","sources":["../../src/account/importAccounts.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~AAAA,uCAAqC;AAErC,kCAAgD;AAChD,qCAAwE;AACxE,yFAAmE;AACnE,2DAAqC;~~AAErC~~,IAAM,mBAAmB,GAAG;IAC1B,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,EAAE,EAAE,CAAC;IACL,WAAW,EAAE,CAAC;CACf,CAAC;AAOK,IAAM,uBAAuB,GAAG,UAAC,EAQvC;QAPC,MAAM,YAAA,EACN,QAAQ,cAAA,EACR,KAAK,WAAA;IAML,OAAA,MAAM,CAAC,QAAQ;SACZ,GAAG,CAAC,UAAC,QAAQ;QACZ,IAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CACjC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,EAA/B,CAA+B,CAC1C,CAAC;QACF,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,IAAI;YACF,IAAM,SAAO,GAAG,IAAA,4BAAoB,EAAC,QAAQ,CAAC,CAAC;YAC/C,IAAM,KAAK,GAAG,IAAA,+BAAqB,EAAC,SAAO,CAAC,CAAC;YAE7C,IAAI,KAAK,EAAE;gBACT,OAAO;oBACL,gBAAgB,EAAE,SAAO,CAAC,EAAE;oBAC5B,OAAO,WAAA;oBACP,IAAI,EAAE,aAAa;iBACpB,CAAC;aACH;YAED,IAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC;gBACxC,OAAA,IAAA,8BAAoB,EAAC,CAAC,EAAE,CAAC,SAAO,CAAC,CAAC;YAAlC,CAAkC,CACnC,CAAC;YAEF,IAAI,iBAAiB,EAAE;gBACrB,6DAA6D;gBAC7D,OAAO;oBACL,gBAAgB,EAAE,iBAAiB,CAAC,EAAE;oBACtC,OAAO,WAAA;oBACP,IAAI,EAAE,QAAQ;iBACf,CAAC;aACH;YAED,IAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,EAApB,CAAoB,CAAC,CAAC;YAEnE,IAAI,eAAe,EAAE;gBACnB,8DAA8D;gBAC9D,IACE,eAAe,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;oBACtC,IAAA,oBAAO,EAAC,eAAe,CAAC,WAAW,EAAE,SAAO,CAAC,WAAW,CAAC,EACzD;oBACA,OAAO;wBACL,gBAAgB,EAAE,eAAe,CAAC,EAAE;wBACpC,OAAO,EAAE,eAAe;wBACxB,IAAI,EAAE,IAAI;qBACX,CAAC;iBACH;gBAED,OAAO;oBACL,gBAAgB,EAAE,eAAe,CAAC,EAAE;oBACpC,OAAO,wBACF,eAAe,KAClB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,WAAW,EAAE,IAAA,8BAAiB,EAC5B,eAAe,CAAC,WAAW,EAC3B,SAAO,CAAC,WAAW,CACpB,GACF;oBACD,IAAI,EAAE,QAAQ;iBACf,CAAC;aACH;YAED,OAAO;gBACL,gBAAgB,EAAE,SAAO,CAAC,EAAE;gBAC5B,OAAO,WAAA;gBACP,IAAI,EAAE,QAAQ;aACf,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,UAAG,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CACH,UAAC,CAAC,EAAE,CAAC;QACH,OAAA,mBAAmB,CAAE,CAAgB,CAAC,IAAI,CAAC;YAC3C,mBAAmB,CAAE,CAAgB,CAAC,IAAI,CAAC;IAD3C,CAC2C,CAC9B;AA5EnB,CA4EmB,CAAC;AArFT,QAAA,uBAAuB,2BAqFd;~~AACf~~,IAAM,oBAAoB,GAAG,UAClC,gBAA2B,EAC3B,~~EAMC~~;;~~QALC~~,KAAK,WAAA,~~EACL~~,gBAAgB,sBAAA;~~IAMlB~~,IAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,UAAC,IAAI;QACtC,OAAA,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAA1C,CAA0C,CAC3C,CAAC;~~4BAEW~~,IAAI,EAAE,OAAO,EAAE,~~gBAAgB~~;~~QAC1C~~,QAAQ,IAAI,EAAE;YACZ,KAAK,QAAQ;~~gBACX~~,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;~~gBACvB~~,MAAM;~~YAER~~,KAAK,QAAQ,CAAC,CAAC;gBACb,IAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,~~CAAC~~,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,gBAAgB,~~EAAzB~~,~~CAAyB~~,CAAC,CAAC;~~gBAC7D~~,IAAM,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAe,CAAC,CAAC;gBAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;~~gBACtB~~,MAAM;aACP;YAED,QAAQ;SACT;;;~~QAdH~~,~~KAAkD~~,IAAA,kBAAA,SAAA,aAAa,CAAA,4CAAA;~~YAApD~~,IAAA,~~4BAAmC~~,~~EAAjC~~,IAAI,UAAA,EAAE,~~OAAO~~,~~aAAA~~,~~EAAE,~~gBAAgB,sBAAA;~~oBAA/B~~,IAAI,EAAE,~~OAAO~~,~~EAAE,~~gBAAgB;~~SAe3C~~;;;;;;;;;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;~~AAjCW~~,QAAA,oBAAoB,~~wBAiC~~/B"}
1	+ {"version":3,"file":"importAccounts.js","sourceRoot":"","sources":["../../src/account/importAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAqC;AAErC,kCAAgD;AAChD,qCAAwE;AACxE,yFAAmE;AACnE,2DAAqC;AAGrC,oCAA6C;AAC7C,sCAA+C;AAC/C,8BAAgC;AAEhC,4CAAwC;AAExC,IAAM,mBAAmB,GAAG;IAC1B,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,EAAE,EAAE,CAAC;IACL,WAAW,EAAE,CAAC;CACf,CAAC;AAOK,IAAM,uBAAuB,GAAG,UAAC,EAQvC;QAPC,MAAM,YAAA,EACN,QAAQ,cAAA,EACR,KAAK,WAAA;IAML,OAAA,MAAM,CAAC,QAAQ;SACZ,GAAG,CAAC,UAAC,QAAQ;QACZ,IAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CACjC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,EAA/B,CAA+B,CAC1C,CAAC;QACF,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,IAAI;YACF,IAAM,SAAO,GAAG,IAAA,4BAAoB,EAAC,QAAQ,CAAC,CAAC;YAC/C,IAAM,KAAK,GAAG,IAAA,+BAAqB,EAAC,SAAO,CAAC,CAAC;YAE7C,IAAI,KAAK,EAAE;gBACT,OAAO;oBACL,gBAAgB,EAAE,SAAO,CAAC,EAAE;oBAC5B,OAAO,WAAA;oBACP,IAAI,EAAE,aAAa;iBACpB,CAAC;aACH;YAED,IAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC;gBACxC,OAAA,IAAA,8BAAoB,EAAC,CAAC,EAAE,CAAC,SAAO,CAAC,CAAC;YAAlC,CAAkC,CACnC,CAAC;YAEF,IAAI,iBAAiB,EAAE;gBACrB,6DAA6D;gBAC7D,OAAO;oBACL,gBAAgB,EAAE,iBAAiB,CAAC,EAAE;oBACtC,OAAO,WAAA;oBACP,IAAI,EAAE,QAAQ;iBACf,CAAC;aACH;YAED,IAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,EAApB,CAAoB,CAAC,CAAC;YAEnE,IAAI,eAAe,EAAE;gBACnB,8DAA8D;gBAC9D,IACE,eAAe,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;oBACtC,IAAA,oBAAO,EAAC,eAAe,CAAC,WAAW,EAAE,SAAO,CAAC,WAAW,CAAC,EACzD;oBACA,OAAO;wBACL,gBAAgB,EAAE,eAAe,CAAC,EAAE;wBACpC,OAAO,EAAE,eAAe;wBACxB,IAAI,EAAE,IAAI;qBACX,CAAC;iBACH;gBAED,OAAO;oBACL,gBAAgB,EAAE,eAAe,CAAC,EAAE;oBACpC,OAAO,wBACF,eAAe,KAClB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,WAAW,EAAE,IAAA,8BAAiB,EAC5B,eAAe,CAAC,WAAW,EAC3B,SAAO,CAAC,WAAW,CACpB,GACF;oBACD,IAAI,EAAE,QAAQ;iBACf,CAAC;aACH;YAED,OAAO;gBACL,gBAAgB,EAAE,SAAO,CAAC,EAAE;gBAC5B,OAAO,WAAA;gBACP,IAAI,EAAE,QAAQ;aACf,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,UAAG,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CACH,UAAC,CAAC,EAAE,CAAC;QACH,OAAA,mBAAmB,CAAE,CAAgB,CAAC,IAAI,CAAC;YAC3C,mBAAmB,CAAE,CAAgB,CAAC,IAAI,CAAC;IAD3C,CAC2C,CAC9B;AA5EnB,CA4EmB,CAAC;AArFT,QAAA,uBAAuB,2BAqFd;AAiBtB;;;;;;;GAOG;AACI,IAAM,uBAAuB,GAAG,UACrC,EAAiD,EACjD,WAA8B,EAC9B,mBAA8B;QAF5B,KAAK,WAAA,EAAE,gBAAgB,sBAAA;;;;;;oBAInB,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,UAAC,IAAI;wBACtC,OAAA,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBAA1C,CAA0C,CAC3C,CAAC;oBACI,YAAY,GAAG,EAAE,CAAC;oBAClB,MAAM,GAAG,EAAE,CAAC;oBAClB,qBAAM,IAAA,2BAAiB,EACrB,IAAA,YAAM,EAAC,qBAAqB,CAAC,EAC7B,aAAa,EACb,UAAO,EAAW;gCAAT,OAAO,aAAA;;;;;;;4CAEN,MAAM,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC;4CACzC,qBAAM,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAA;;4CAAnD,SAAmD,CAAC;4CAC9C,UAAU,GAAG;gDACjB,gBAAgB,EAAE,EAAE;gDACpB,mBAAmB,qBAAA;6CACpB,CAAC;4CACI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;4CAC9C,OAAO,GAAwB,UAAU,CAAC,IAAI,CAClD,IAAA,kBAAM,EAAC,UAAC,CAAC,EAAE,CAA0B,IAAK,OAAA,CAAC,CAAC,CAAC,CAAC,EAAJ,CAAI,EAAE,OAAO,CAAC,CACzD,CAAC;4CACa,qBAAM,OAAO,CAAC,SAAS,EAAE,EAAA;;4CAAlC,MAAM,GAAG,SAAyB;4CACxC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;;;;4CAElC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,GAAC,CAAC;;;;;;yBAE1B,CACF,EAAA;;oBArBD,SAqBC,CAAC;oBACF,sBAAO,EAAE,YAAY,cAAA,EAAE,MAAM,QAAA,EAAE,EAAC;;;;CACjC,CAAC;AAjCW,QAAA,uBAAuB,2BAiClC;AAQF;;;;;;;GAOG;AACI,IAAM,oBAAoB,GAAG,UAClC,gBAA2B,EAC3B,EAAkE;;QAAhE,KAAK,WAAA,EAAE,gBAAgB,sBAAA,EAAE,UAAU,gBAAA;IAErC,IAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,UAAC,IAAI;QACtC,OAAA,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAA1C,CAA0C,CAC3C,CAAC;4BAGA,IAAI,EACO,EAAE,EACb,gBAAgB;QAEhB,IAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO;8BAAW;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,QAAQ,CAAC,CAAC;gBACb,IAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAC1B,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,gBAAgB,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAxC,CAAwC,CAChD,CAAC;gBACF,IAAI,CAAC,MAAM,EAAE;oBACX,gEAAgE;oBAChE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACxB;gBACD,MAAM;aACP;YAED,KAAK,QAAQ,CAAC,CAAC;gBACb,IAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CACxB,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,gBAAgB,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAxC,CAAwC,CAChD,CAAC;gBACF,IAAM,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAe,CAAC,CAAC;gBAC5C,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;oBACZ,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;iBACvB;gBACD,MAAM;aACP;YAED,QAAQ;SACT;;;QA/BH,KAIK,IAAA,kBAAA,SAAA,aAAa,CAAA,4CAAA;YAJP,IAAA,4BAIV,EAHC,IAAI,UAAA,EACO,EAAE,gBAAA,EACb,gBAAgB,sBAAA;oBAFhB,IAAI,EACO,EAAE,EACb,gBAAgB;SA6BjB;;;;;;;;;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA5CW,QAAA,oBAAoB,wBA4C/B"}

package/lib/account/importAccounts.test.d.ts ADDED Viewed

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

package/lib/account/importAccounts.test.d.ts.map ADDED Viewed

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

package/lib/{__tests__/accounts/importAccounts.js → account/importAccounts.test.js} RENAMED Viewed

@@ -1,13 +1,12 @@
 "use strict";
 exports.__esModule = true;
-var account_1 = require("../../account");
-var currencies_1 = require("../../currencies");
-var version_1 = require("../../platform/version");
+var _1 = require(".");
+var currencies_1 = require("../currencies");
+var version_1 = require("../platform/version");
 (0, version_1.setPlatformVersion)("1.1.0");
 (0, currencies_1.setSupportedCurrencies)(["ethereum"]);
 describe("importAccountsMakeItems", function () {
-    // TODO we need to change the dataset as we no longer are migrating away from JS to Libcore but kinda the reverse
-    test.skip("should migrate ethereum accounts", function () {
+    test("importing ethereum accounts", function () {
         var result = {
             meta: {
                 exporterName: "desktop",
@@ -15,7 +14,7 @@ describe("importAccountsMakeItems", function () {
             },
             accounts: [
                 {
-                    id: "libcore:1:ethereum:xpub1:",
+                    id: "js:1:ethereum:0x01:",
                     name: "Ethereum 1",
                     seedIdentifier: "seed",
                     derivationMode: "",
@@ -26,7 +25,7 @@ describe("importAccountsMakeItems", function () {
                     swapHistory: []
                 },
                 {
-                    id: "libcore:1:ethereum:xpub2:",
+                    id: "js:1:ethereum:0x02:",
                     name: "Ethereum 2",
                     seedIdentifier: "seed",
                     derivationMode: "",
@@ -37,7 +36,7 @@ describe("importAccountsMakeItems", function () {
                     swapHistory: []
                 },
                 {
-                    id: "libcore:1:ethereum:xpub4:",
+                    id: "js:1:ethereum:0x04:",
                     name: "Ethereum 4",
                     seedIdentifier: "seed",
                     derivationMode: "",
@@ -48,7 +47,7 @@ describe("importAccountsMakeItems", function () {
                     swapHistory: []
                 },
                 {
-                    id: "libcore:1:ethereum:xpub3:",
+                    id: "js:1:ethereum:0x03:",
                     name: "ETH3 name edited",
                     seedIdentifier: "seed",
                     derivationMode: "",
@@ -59,7 +58,7 @@ describe("importAccountsMakeItems", function () {
                     swapHistory: []
                 },
                 {
-                    id: "libcore:1:ethereum:xpub5:",
+                    id: "js:1:ethereum:0x05:",
                     name: "Ethereum 5",
                     seedIdentifier: "seed",
                     derivationMode: "",
@@ -79,7 +78,7 @@ describe("importAccountsMakeItems", function () {
         };
         var accounts = [
             {
-                id: "ethereumjs:2:ethereum:0x01:",
+                id: "js:1:ethereum:0x01:",
                 seedIdentifier: "0x01",
                 name: "Ethereum 1",
                 derivationMode: "",
@@ -96,7 +95,7 @@ describe("importAccountsMakeItems", function () {
                 balance: "51281813126095910"
             },
             {
-                id: "ethereumjs:2:ethereum:0x02:",
+                id: "js:1:ethereum:0x02:",
                 seedIdentifier: "0x02",
                 name: "Ethereum 2",
                 derivationMode: "",
@@ -113,7 +112,7 @@ describe("importAccountsMakeItems", function () {
                 balance: "1081392000000000"
             },
             {
-                id: "libcore:1:ethereum:xpub3:",
+                id: "js:1:ethereum:0x03:",
                 seedIdentifier: "seed",
                 name: "Ethereum 3",
                 derivationMode: "",
@@ -129,79 +128,60 @@ describe("importAccountsMakeItems", function () {
                 lastSyncDate: "2019-07-17T15:13:29.306Z",
                 balance: "1081392000000000"
             },
-        ].map(account_1.fromAccountRaw);
-        var items = (0, account_1.importAccountsMakeItems)({
+        ].map(_1.fromAccountRaw);
+        var items = (0, _1.importAccountsMakeItems)({
             result: result,
             accounts: accounts
         });
         expect(items).toMatchObject([
             {
-                initialAccountId: "libcore:1:ethereum:xpub4:",
-                account: {
-                    id: "libcore:1:ethereum:xpub4:",
-                    name: "Ethereum 4"
-                },
+                initialAccountId: "js:1:ethereum:0x04:",
+                account: { id: "js:1:ethereum:0x04:", name: "Ethereum 4" },
                 mode: "create"
             },
             {
-                initialAccountId: "libcore:1:ethereum:xpub5:",
-                account: {
-                    id: "libcore:1:ethereum:xpub5:",
-                    name: "Ethereum 5"
-                },
+                initialAccountId: "js:1:ethereum:0x05:",
+                account: { id: "js:1:ethereum:0x05:", name: "Ethereum 5" },
                 mode: "create"
             },
             {
-                initialAccountId: "ethereumjs:2:ethereum:0x01:",
-                account: {
-                    id: "libcore:1:ethereum:xpub1:",
-                    name: "Ethereum 1"
-                },
+                initialAccountId: "js:1:ethereum:0x03:",
+                account: { id: "js:1:ethereum:0x03:", name: "ETH3 name edited" },
                 mode: "update"
             },
             {
-                initialAccountId: "ethereumjs:2:ethereum:0x02:",
-                account: {
-                    id: "libcore:1:ethereum:xpub2:",
-                    name: "Ethereum 2"
-                },
-                mode: "update"
+                initialAccountId: "js:1:ethereum:0x01:",
+                account: { id: "js:1:ethereum:0x01:", name: "Ethereum 1" },
+                mode: "id"
             },
             {
-                initialAccountId: "libcore:1:ethereum:xpub3:",
-                account: {
-                    id: "libcore:1:ethereum:xpub3:",
-                    name: "ETH3 name edited"
-                },
-                mode: "update"
+                initialAccountId: "js:1:ethereum:0x02:",
+                account: { id: "js:1:ethereum:0x02:", name: "Ethereum 2" },
+                mode: "id"
             },
         ]);
-        var reduced = (0, account_1.importAccountsReduce)(accounts, {
+        var syncResult = {
+            failed: {},
+            synchronized: {}
+        };
+        result.accounts.forEach(function (a) {
+            syncResult.synchronized[a.id] = a;
+        });
+        var reduced = (0, _1.importAccountsReduce)(accounts, {
             items: items,
             selectedAccounts: [
-                "libcore:1:ethereum:xpub3:",
-                "libcore:1:ethereum:xpub2:",
-                "libcore:1:ethereum:xpub5:",
-            ]
+                "js:1:ethereum:0x03:",
+                "js:1:ethereum:0x02:",
+                "js:1:ethereum:0x05:",
+            ],
+            syncResult: syncResult
         });
         expect(reduced).toMatchObject([
-            {
-                id: "ethereumjs:2:ethereum:0x01:",
-                name: "Ethereum 1"
-            },
-            {
-                id: "libcore:1:ethereum:xpub2:",
-                name: "Ethereum 2"
-            },
-            {
-                id: "libcore:1:ethereum:xpub3:",
-                name: "ETH3 name edited"
-            },
-            {
-                id: "libcore:1:ethereum:xpub5:",
-                name: "Ethereum 5"
-            },
+            { id: "js:1:ethereum:0x01:", name: "Ethereum 1" },
+            { id: "js:1:ethereum:0x02:", name: "Ethereum 2" },
+            { id: "js:1:ethereum:0x03:", name: "ETH3 name edited" },
+            { id: "js:1:ethereum:0x05:", name: "Ethereum 5" },
         ]);
     });
 });
-//# sourceMappingURL=importAccounts.js.map
+//# sourceMappingURL=importAccounts.test.js.map

package/lib/account/importAccounts.test.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/package.json CHANGED Viewed

@@ -4,7 +4,7 @@
   },
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "27.0.0-next.2",
+  "version": "27.0.0-next.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"

package/src/account/importAccounts.integration.test.ts ADDED Viewed

@@ -0,0 +1,193 @@
+import "../__tests__/test-helpers/setup";
+import { makeBridgeCacheSystem } from "../bridge/cache";
+import { accountToAccountData } from "../cross";
+import {
+  importAccountsMakeItems,
+  importAccountsReduce,
+  fromAccountRaw,
+  syncNewAccountsToImport,
+} from ".";
+import { Account } from "@ledgerhq/types-live";
+jest.setTimeout(200000);
+test("importAccounts with a set of real data", async () => {
+  const accounts = [
+    {
+      id: "js:2:algorand:32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI:",
+      seedIdentifier:
+        "32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI",
+      name: "Algorand legacy 32PI2C5H...RXBSVWQI",
+      starred: true,
+      used: true,
+      derivationMode: "",
+      index: 0,
+      freshAddress:
+        "32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI",
+      freshAddressPath: "44'/283'/0'/0/0",
+      freshAddresses: [],
+      blockHeight: 23066613,
+      creationDate: "2022-02-04T13:12:58.000Z",
+      operationsCount: 184,
+      operations: [],
+      pendingOperations: [],
+      currencyId: "algorand",
+      unitMagnitude: 6,
+      lastSyncDate: "2022-08-26T09:24:27.076Z",
+      balance: "2100190",
+      spendableBalance: "190",
+      xpub: "32PI2C5HLHMVUF5KMNURLGCTYVIOVJJ2NLHLZ2PIMK567MKMS4RXBSVWQI",
+      subAccounts: [],
+      algorandResources: { rewards: "190", nbAssets: 20 },
+      swapHistory: [],
+    },
+    {
+      id: "js:2:tron:TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK:",
+      seedIdentifier: "TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK",
+      name: "Tron legacy TRbtdwHo...5sx3fFCK",
+      starred: true,
+      used: true,
+      derivationMode: "",
+      index: 0,
+      freshAddress: "TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK",
+      freshAddressPath: "44'/195'/0'/0/0",
+      freshAddresses: [],
+      blockHeight: 43642499,
+      creationDate: "2022-07-19T15:32:12.000Z",
+      operationsCount: 41,
+      operations: [],
+      pendingOperations: [],
+      currencyId: "tron",
+      unitMagnitude: 6,
+      lastSyncDate: "2022-08-26T09:24:59.492Z",
+      balance: "0",
+      spendableBalance: "0",
+      xpub: "TRbtdwHowocq8ThZbRnTHgK4JG5sx3fFCK",
+      subAccounts: [],
+      tronResources: {
+        frozen: {},
+        delegatedFrozen: {},
+        votes: [],
+        tronPower: 0,
+        energy: "0",
+        bandwidth: {
+          freeUsed: "0",
+          freeLimit: "1500",
+          gainedUsed: "0",
+          gainedLimit: "0",
+        },
+        unwithdrawnReward: "2730",
+        lastVotedDate: "2022-07-22T14:39:51.000Z",
+        cacheTransactionInfoById: {},
+      },
+      swapHistory: [],
+    },
+    {
+      id: "js:2:polkadot:15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP:polkadotbip44",
+      seedIdentifier: "15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP",
+      name: "Polkadot polkadotbip44 15jLBbe9...5KrKM1eP",
+      starred: true,
+      used: true,
+      derivationMode: "polkadotbip44",
+      index: 0,
+      freshAddress: "15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP",
+      freshAddressPath: "44'/354'/0'/0'/0'",
+      freshAddresses: [],
+      blockHeight: 11771108,
+      creationDate: "2022-02-24T14:39:00.007Z",
+      operationsCount: 65,
+      operations: [],
+      pendingOperations: [],
+      currencyId: "polkadot",
+      unitMagnitude: 10,
+      lastSyncDate: "2022-08-26T09:25:00.713Z",
+      balance: "15512511464",
+      spendableBalance: "15512511464",
+      xpub: "15jLBbe9LD6VSUYFkV5Fmo5LhZU5cns9E6g8qcDv5KrKM1eP",
+      polkadotResources: {
+        controller: null,
+        stash: null,
+        nonce: 63,
+        lockedBalance: "0",
+        unlockedBalance: "0",
+        unlockingBalance: "0",
+        unlockings: [],
+        nominations: [],
+      },
+      swapHistory: [],
+    },
+    {
+      id: "js:2:bsc:0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB:",
+      seedIdentifier: "0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB",
+      name: "Binance Smart Chain legacy 0xa22CA8...CdD06FAB",
+      starred: true,
+      used: true,
+      derivationMode: "",
+      index: 0,
+      freshAddress: "0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB",
+      freshAddressPath: "44'/60'/0'/0/0",
+      freshAddresses: [],
+      blockHeight: 20775454,
+      syncHash: "[]_655",
+      creationDate: "2022-02-04T13:11:32.001Z",
+      operationsCount: 21,
+      operations: [],
+      pendingOperations: [],
+      currencyId: "bsc",
+      unitMagnitude: 18,
+      lastSyncDate: "2022-08-26T09:25:01.109Z",
+      balance: "3128019430408477",
+      spendableBalance: "3128019430408477",
+      xpub: "0xa22CA840265d3C5CB1846e419B14c6a6CdD06FAB",
+      subAccounts: [],
+      swapHistory: [],
+    },
+  ].map(fromAccountRaw);
+  const localCache = {};
+  const bridgeCache = makeBridgeCacheSystem({
+    saveData(c, d) {
+      localCache[c.id] = d;
+      return Promise.resolve();
+    },
+    getData(c) {
+      return Promise.resolve(localCache[c.id]);
+    },
+  });
+  const result = {
+    accounts: accounts.map(accountToAccountData),
+    settings: { currenciesSettings: {}, pairExchanges: {} },
+    meta: { exporterName: "Test", exporterVersion: "0" },
+  };
+  const accountsState = [];
+  const items = importAccountsMakeItems({
+    result,
+    accounts: accountsState,
+  });
+  const selectedAccounts = accounts.map((a) => a.id);
+  const syncResult = await syncNewAccountsToImport(
+    { items, selectedAccounts },
+    bridgeCache
+  );
+  const reduced = importAccountsReduce(accountsState, {
+    items,
+    selectedAccounts,
+    syncResult,
+  });
+  expect(reduced.length).toEqual(4);
+  expect((reduced[0] as AlgorandAccount).algorandResources).toBeDefined();
+  expect((reduced[1] as TronAccount).tronResources).toBeDefined();
+  expect((reduced[2] as PolkadotAccount).polkadotResources).toBeDefined();
+  expect(reduced[0].operations.length).toBeGreaterThan(1);
+  expect(reduced[1].operations.length).toBeGreaterThan(1);
+  expect(reduced[2].operations.length).toBeGreaterThan(1);
+  expect(reduced[3].operations.length).toBeGreaterThan(1);
+});
+type AlgorandAccount = Account & { algorandResources: any };
+type TronAccount = Account & { tronResources: any };
+type PolkadotAccount = Account & { polkadotResources: any };

package/src/{__tests__/accounts/importAccounts.ts → account/importAccounts.test.ts} RENAMED Viewed

@@ -3,16 +3,15 @@ import {
   importAccountsMakeItems,
   importAccountsReduce,
   fromAccountRaw,
-} from "../../account";
-import { setSupportedCurrencies } from "../../currencies";
-import { setPlatformVersion } from "../../platform/version";
+} from ".";
+import { setSupportedCurrencies } from "../currencies";
+import { setPlatformVersion } from "../platform/version";
 setPlatformVersion("1.1.0");
 setSupportedCurrencies(["ethereum"]);
 describe("importAccountsMakeItems", () => {
-  // TODO we need to change the dataset as we no longer are migrating away from JS to Libcore but kinda the reverse
-  test.skip("should migrate ethereum accounts", () => {
+  test("importing ethereum accounts", () => {
     const result = {
       meta: {
         exporterName: "desktop",
@@ -20,7 +19,7 @@ describe("importAccountsMakeItems", () => {
       },
       accounts: [
         {
-          id: "libcore:1:ethereum:xpub1:",
+          id: "js:1:ethereum:0x01:",
           name: "Ethereum 1",
           seedIdentifier: "seed",
           derivationMode: "",
@@ -31,7 +30,7 @@ describe("importAccountsMakeItems", () => {
           swapHistory: [],
         },
         {
-          id: "libcore:1:ethereum:xpub2:",
+          id: "js:1:ethereum:0x02:",
           name: "Ethereum 2",
           seedIdentifier: "seed",
           derivationMode: "",
@@ -42,7 +41,7 @@ describe("importAccountsMakeItems", () => {
           swapHistory: [],
         },
         {
-          id: "libcore:1:ethereum:xpub4:",
+          id: "js:1:ethereum:0x04:",
           name: "Ethereum 4",
           seedIdentifier: "seed",
           derivationMode: "",
@@ -53,7 +52,7 @@ describe("importAccountsMakeItems", () => {
           swapHistory: [],
         },
         {
-          id: "libcore:1:ethereum:xpub3:",
+          id: "js:1:ethereum:0x03:",
           name: "ETH3 name edited",
           seedIdentifier: "seed",
           derivationMode: "",
@@ -64,7 +63,7 @@ describe("importAccountsMakeItems", () => {
           swapHistory: [],
         },
         {
-          id: "libcore:1:ethereum:xpub5:",
+          id: "js:1:ethereum:0x05:",
           name: "Ethereum 5",
           seedIdentifier: "seed",
           derivationMode: "",
@@ -84,7 +83,7 @@ describe("importAccountsMakeItems", () => {
     };
     const accounts = [
       <AccountRaw>{
-        id: "ethereumjs:2:ethereum:0x01:",
+        id: "js:1:ethereum:0x01:",
         seedIdentifier: "0x01",
         name: "Ethereum 1",
         derivationMode: "",
@@ -101,7 +100,7 @@ describe("importAccountsMakeItems", () => {
         balance: "51281813126095910",
       },
       <AccountRaw>{
-        id: "ethereumjs:2:ethereum:0x02:",
+        id: "js:1:ethereum:0x02:",
         seedIdentifier: "0x02",
         name: "Ethereum 2",
         derivationMode: "",
@@ -118,7 +117,7 @@ describe("importAccountsMakeItems", () => {
         balance: "1081392000000000",
       },
       <AccountRaw>{
-        id: "libcore:1:ethereum:xpub3:",
+        id: "js:1:ethereum:0x03:",
         seedIdentifier: "seed",
         name: "Ethereum 3",
         derivationMode: "",
@@ -141,71 +140,52 @@ describe("importAccountsMakeItems", () => {
     });
     expect(items).toMatchObject([
       {
-        initialAccountId: "libcore:1:ethereum:xpub4:",
-        account: {
-          id: "libcore:1:ethereum:xpub4:",
-          name: "Ethereum 4",
-        },
+        initialAccountId: "js:1:ethereum:0x04:",
+        account: { id: "js:1:ethereum:0x04:", name: "Ethereum 4" },
         mode: "create",
       },
       {
-        initialAccountId: "libcore:1:ethereum:xpub5:",
-        account: {
-          id: "libcore:1:ethereum:xpub5:",
-          name: "Ethereum 5",
-        },
+        initialAccountId: "js:1:ethereum:0x05:",
+        account: { id: "js:1:ethereum:0x05:", name: "Ethereum 5" },
         mode: "create",
       },
       {
-        initialAccountId: "ethereumjs:2:ethereum:0x01:",
-        account: {
-          id: "libcore:1:ethereum:xpub1:",
-          name: "Ethereum 1",
-        },
+        initialAccountId: "js:1:ethereum:0x03:",
+        account: { id: "js:1:ethereum:0x03:", name: "ETH3 name edited" },
         mode: "update",
       },
       {
-        initialAccountId: "ethereumjs:2:ethereum:0x02:",
-        account: {
-          id: "libcore:1:ethereum:xpub2:",
-          name: "Ethereum 2",
-        },
-        mode: "update",
+        initialAccountId: "js:1:ethereum:0x01:",
+        account: { id: "js:1:ethereum:0x01:", name: "Ethereum 1" },
+        mode: "id",
       },
       {
-        initialAccountId: "libcore:1:ethereum:xpub3:",
-        account: {
-          id: "libcore:1:ethereum:xpub3:",
-          name: "ETH3 name edited",
-        },
-        mode: "update",
+        initialAccountId: "js:1:ethereum:0x02:",
+        account: { id: "js:1:ethereum:0x02:", name: "Ethereum 2" },
+        mode: "id",
       },
     ]);
+    const syncResult = {
+      failed: {},
+      synchronized: {},
+    };
+    result.accounts.forEach((a) => {
+      syncResult.synchronized[a.id] = a;
+    });
     const reduced = importAccountsReduce(accounts, {
       items,
       selectedAccounts: [
-        "libcore:1:ethereum:xpub3:",
-        "libcore:1:ethereum:xpub2:",
-        "libcore:1:ethereum:xpub5:",
+        "js:1:ethereum:0x03:",
+        "js:1:ethereum:0x02:",
+        "js:1:ethereum:0x05:",
       ],
+      syncResult,
     });
     expect(reduced).toMatchObject([
-      {
-        id: "ethereumjs:2:ethereum:0x01:",
-        name: "Ethereum 1",
-      },
-      {
-        id: "libcore:1:ethereum:xpub2:",
-        name: "Ethereum 2",
-      },
-      {
-        id: "libcore:1:ethereum:xpub3:",
-        name: "ETH3 name edited",
-      },
-      {
-        id: "libcore:1:ethereum:xpub5:",
-        name: "Ethereum 5",
-      },
+      { id: "js:1:ethereum:0x01:", name: "Ethereum 1" },
+      { id: "js:1:ethereum:0x02:", name: "Ethereum 2" },
+      { id: "js:1:ethereum:0x03:", name: "ETH3 name edited" },
+      { id: "js:1:ethereum:0x05:", name: "Ethereum 5" },
     ]);
   });
 });

package/src/account/importAccounts.ts CHANGED Viewed

@@ -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 DELETED Viewed

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

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

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

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

@@ -1 +0,0 @@

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