npm - @ledgerhq/live-common - Versions diffs - 26.1.0-next.1 → 27.0.0 - Mend

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

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/{__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":";;AACA,sBAIW;AACX,4CAAuD;AACvD,+CAAyD;AAEzD,IAAA,4BAAkB,EAAC,OAAO,CAAC,CAAC;AAE5B,IAAA,mCAAsB,EAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AACrC,QAAQ,CAAC,yBAAyB,EAAE;IAClC,IAAI,CAAC,6BAA6B,EAAE;QAClC,IAAM,MAAM,GAAG;YACb,IAAI,EAAE;gBACJ,YAAY,EAAE,SAAS;gBACvB,eAAe,EAAE,QAAQ;aAC1B;YACD,QAAQ,EAAE;gBACR;oBACE,EAAE,EAAE,qBAAqB;oBACzB,IAAI,EAAE,YAAY;oBAClB,cAAc,EAAE,MAAM;oBACtB,cAAc,EAAE,EAAE;oBAClB,YAAY,EAAE,MAAM;oBACpB,UAAU,EAAE,UAAU;oBACtB,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,mBAAmB;oBAC5B,WAAW,EAAE,EAAE;iBAChB;gBACD;oBACE,EAAE,EAAE,qBAAqB;oBACzB,IAAI,EAAE,YAAY;oBAClB,cAAc,EAAE,MAAM;oBACtB,cAAc,EAAE,EAAE;oBAClB,YAAY,EAAE,MAAM;oBACpB,UAAU,EAAE,UAAU;oBACtB,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,kBAAkB;oBAC3B,WAAW,EAAE,EAAE;iBAChB;gBACD;oBACE,EAAE,EAAE,qBAAqB;oBACzB,IAAI,EAAE,YAAY;oBAClB,cAAc,EAAE,MAAM;oBACtB,cAAc,EAAE,EAAE;oBAClB,YAAY,EAAE,MAAM;oBACpB,UAAU,EAAE,UAAU;oBACtB,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,kBAAkB;oBAC3B,WAAW,EAAE,EAAE;iBAChB;gBACD;oBACE,EAAE,EAAE,qBAAqB;oBACzB,IAAI,EAAE,kBAAkB;oBACxB,cAAc,EAAE,MAAM;oBACtB,cAAc,EAAE,EAAE;oBAClB,YAAY,EAAE,MAAM;oBACpB,UAAU,EAAE,UAAU;oBACtB,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,GAAG;oBACZ,WAAW,EAAE,EAAE;iBAChB;gBACD;oBACE,EAAE,EAAE,qBAAqB;oBACzB,IAAI,EAAE,YAAY;oBAClB,cAAc,EAAE,MAAM;oBACtB,cAAc,EAAE,EAAE;oBAClB,YAAY,EAAE,MAAM;oBACpB,UAAU,EAAE,UAAU;oBACtB,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,GAAG;oBACZ,WAAW,EAAE,EAAE;iBAChB;aACF;YACD,QAAQ,EAAE;gBACR,YAAY,EAAE,KAAK;gBACnB,kBAAkB,EAAE,EAAE;gBACtB,aAAa,EAAE,EAAE;gBACjB,oBAAoB,EAAE,KAAK;aAC5B;SACF,CAAC;QACF,IAAM,QAAQ,GAAG;YACH;gBACV,EAAE,EAAE,qBAAqB;gBACzB,cAAc,EAAE,MAAM;gBACtB,IAAI,EAAE,YAAY;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE,CAAC;gBACR,YAAY,EAAE,MAAM;gBACpB,gBAAgB,EAAE,gBAAgB;gBAClC,cAAc,EAAE,EAAE;gBAClB,WAAW,EAAE,OAAO;gBACpB,UAAU,EAAE,EAAE;gBACd,iBAAiB,EAAE,EAAE;gBACrB,UAAU,EAAE,UAAU;gBACtB,aAAa,EAAE,EAAE;gBACjB,YAAY,EAAE,0BAA0B;gBACxC,OAAO,EAAE,mBAAmB;aAC7B;YACW;gBACV,EAAE,EAAE,qBAAqB;gBACzB,cAAc,EAAE,MAAM;gBACtB,IAAI,EAAE,YAAY;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE,CAAC;gBACR,YAAY,EAAE,MAAM;gBACpB,gBAAgB,EAAE,gBAAgB;gBAClC,cAAc,EAAE,EAAE;gBAClB,WAAW,EAAE,OAAO;gBACpB,UAAU,EAAE,EAAE;gBACd,iBAAiB,EAAE,EAAE;gBACrB,UAAU,EAAE,UAAU;gBACtB,aAAa,EAAE,EAAE;gBACjB,YAAY,EAAE,0BAA0B;gBACxC,OAAO,EAAE,kBAAkB;aAC5B;YACW;gBACV,EAAE,EAAE,qBAAqB;gBACzB,cAAc,EAAE,MAAM;gBACtB,IAAI,EAAE,YAAY;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE,CAAC;gBACR,YAAY,EAAE,MAAM;gBACpB,gBAAgB,EAAE,gBAAgB;gBAClC,cAAc,EAAE,EAAE;gBAClB,WAAW,EAAE,OAAO;gBACpB,UAAU,EAAE,EAAE;gBACd,iBAAiB,EAAE,EAAE;gBACrB,UAAU,EAAE,UAAU;gBACtB,aAAa,EAAE,EAAE;gBACjB,YAAY,EAAE,0BAA0B;gBACxC,OAAO,EAAE,kBAAkB;aAC5B;SACF,CAAC,GAAG,CAAC,iBAAc,CAAC,CAAC;QACtB,IAAM,KAAK,GAAG,IAAA,0BAAuB,EAAC;YACpC,MAAM,QAAA;YACN,QAAQ,UAAA;SACT,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC;YAC1B;gBACE,gBAAgB,EAAE,qBAAqB;gBACvC,OAAO,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;gBAC1D,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,gBAAgB,EAAE,qBAAqB;gBACvC,OAAO,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;gBAC1D,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,gBAAgB,EAAE,qBAAqB;gBACvC,OAAO,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,kBAAkB,EAAE;gBAChE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,gBAAgB,EAAE,qBAAqB;gBACvC,OAAO,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;gBAC1D,IAAI,EAAE,IAAI;aACX;YACD;gBACE,gBAAgB,EAAE,qBAAqB;gBACvC,OAAO,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;gBAC1D,IAAI,EAAE,IAAI;aACX;SACF,CAAC,CAAC;QACH,IAAM,UAAU,GAAG;YACjB,MAAM,EAAE,EAAE;YACV,YAAY,EAAE,EAAE;SACjB,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAC,CAAC;YACxB,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,IAAM,OAAO,GAAG,IAAA,uBAAoB,EAAC,QAAQ,EAAE;YAC7C,KAAK,OAAA;YACL,gBAAgB,EAAE;gBAChB,qBAAqB;gBACrB,qBAAqB;gBACrB,qBAAqB;aACtB;YACD,UAAU,YAAA;SACX,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC;YAC5B,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;YACjD,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;YACjD,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,kBAAkB,EAAE;YACvD,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE;SAClD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json CHANGED Viewed

@@ -4,7 +4,7 @@
   },
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "26.1.0-next.1",
+  "version": "27.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -111,22 +111,22 @@
     "@hashgraph/sdk": "^2.10.1",
     "@keplr-wallet/cosmos": "^0.9.16",
     "@ledgerhq/compressjs": "github:LedgerHQ/compressjs#d9e8e4d994923e0ea76a32b97289bcccfe71b82e",
-    "@ledgerhq/cryptoassets": "^6.32.0",
+    "@ledgerhq/cryptoassets": "^6.33.0",
     "@ledgerhq/devices": "^7.0.0",
     "@ledgerhq/errors": "^6.10.1",
-    "@ledgerhq/hw-app-algorand": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-btc": "^8.0.1-next.0",
-    "@ledgerhq/hw-app-cosmos": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-eth": "^6.29.5-next.0",
-    "@ledgerhq/hw-app-polkadot": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-solana": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-str": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-tezos": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-trx": "^6.27.3-next.0",
-    "@ledgerhq/hw-app-xrp": "^6.27.3-next.0",
-    "@ledgerhq/hw-transport": "^6.27.3-next.0",
-    "@ledgerhq/hw-transport-mocker": "^6.27.3-next.0",
-    "@ledgerhq/hw-transport-node-speculos": "^6.27.3-next.0",
+    "@ledgerhq/hw-app-algorand": "^6.27.3",
+    "@ledgerhq/hw-app-btc": "^8.0.1",
+    "@ledgerhq/hw-app-cosmos": "^6.27.3",
+    "@ledgerhq/hw-app-eth": "^6.29.5",
+    "@ledgerhq/hw-app-polkadot": "^6.27.3",
+    "@ledgerhq/hw-app-solana": "^6.27.3",
+    "@ledgerhq/hw-app-str": "^6.27.3",
+    "@ledgerhq/hw-app-tezos": "^6.27.3",
+    "@ledgerhq/hw-app-trx": "^6.27.3",
+    "@ledgerhq/hw-app-xrp": "^6.27.3",
+    "@ledgerhq/hw-transport": "^6.27.3",
+    "@ledgerhq/hw-transport-mocker": "^6.27.3",
+    "@ledgerhq/hw-transport-node-speculos": "^6.27.3",
     "@ledgerhq/json-bignumber": "^1.1.0",
     "@ledgerhq/live-app-sdk": "^0.7.0",
     "@ledgerhq/logs": "^6.10.0",
@@ -218,8 +218,8 @@
   "devDependencies": {
     "@keplr-wallet/proto-types": "^0.10.4",
     "@ledgerhq/types-cryptoassets": "^6.23.0",
-    "@ledgerhq/types-devices": "^6.22.1-next.0",
-    "@ledgerhq/types-live": "^6.24.0-next.0",
+    "@ledgerhq/types-devices": "^6.22.1",
+    "@ledgerhq/types-live": "^6.24.0",
     "@svgr/core": "^5.5.0",
     "@testing-library/react": "12",
     "@testing-library/react-hooks": "^4.0.1",

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" },
     ]);
   });
 });