@ledgerhq/live-common 27.0.0-next.2 → 27.0.1-next.0

package/lib/account/importAccounts.js

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

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

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

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

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

@@ -0,0 +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}

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

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

package/lib/account/serialization.d.ts.map

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

package/lib/account/serialization.js

@@ -564,20 +564,19 @@ function fromAccountRaw(rawAccount) {
                     (0, serialization_2.fromCosmosResourcesRaw)(cosmosResourcesRaw);
             break;
         }
-        case "tezos":
-            {
-                var tezosResourcesRaw = rawAccount
-                    .tezosResources;
-                if (tezosResourcesRaw)
-                    res.tezosResources =
-                        (0, serialization_5.fromTezosResourcesRaw)(tezosResourcesRaw);
-            }
+        case "tezos": {
+            var tezosResourcesRaw = rawAccount.tezosResources;
+            if (tezosResourcesRaw)
+                res.tezosResources =
+                    (0, serialization_5.fromTezosResourcesRaw)(tezosResourcesRaw);
             break;
+        }
         case "bitcoin": {
             var bitcoinResourcesRaw = rawAccount
                 .bitcoinResources;
-            res.bitcoinResources =
-                (0, serialization_1.fromBitcoinResourcesRaw)(bitcoinResourcesRaw);
+            if (bitcoinResourcesRaw)
+                res.bitcoinResources =
+                    (0, serialization_1.fromBitcoinResourcesRaw)(bitcoinResourcesRaw);
             break;
         }
         case "algorand": {
@@ -588,15 +587,14 @@ function fromAccountRaw(rawAccount) {
                     (0, serialization_3.fromAlgorandResourcesRaw)(algoResourcesRaw);
             break;
         }
-        case "polkadot":
-            {
-                var polkadotResourcesRaw = rawAccount
-                    .polkadotResources;
-                if (polkadotResourcesRaw)
-                    res.polkadotResources =
-                        (0, serialization_4.fromPolkadotResourcesRaw)(polkadotResourcesRaw);
-            }
+        case "polkadot": {
+            var polkadotResourcesRaw = rawAccount
+                .polkadotResources;
+            if (polkadotResourcesRaw)
+                res.polkadotResources =
+                    (0, serialization_4.fromPolkadotResourcesRaw)(polkadotResourcesRaw);
             break;
+        }
         case "elrond": {
             var elrondResourcesRaw = rawAccount
                 .elrondResources;
@@ -675,39 +673,84 @@ function toAccountRaw(account) {
         res.subAccounts = subAccounts.map(toSubAccountRaw);
     }
     switch (account.currency.family) {
-        case "tron":
-            res.tronResources = (0, exports.toTronResourcesRaw)(account.tronResources);
+        case "tron": {
+            var tronAccount = account;
+            if (tronAccount.tronResources) {
+                res.tronResources = (0, exports.toTronResourcesRaw)(tronAccount.tronResources);
+            }
             break;
-        case "cosmos":
-            res.cosmosResources = (0, serialization_2.toCosmosResourcesRaw)(account.cosmosResources);
+        }
+        case "osmosis": {
+            var cosmosAccount = account;
+            if (cosmosAccount.cosmosResources) {
+                res.cosmosResources = (0, serialization_2.toCosmosResourcesRaw)(cosmosAccount.cosmosResources);
+            }
             break;
-        case "osmosis":
-            res.cosmosResources = (0, serialization_2.toCosmosResourcesRaw)(account.cosmosResources);
+        }
+        case "cosmos": {
+            var cosmosAccount = account;
+            if (cosmosAccount.cosmosResources) {
+                res.cosmosResources = (0, serialization_2.toCosmosResourcesRaw)(cosmosAccount.cosmosResources);
+            }
             break;
-        case "tezos":
-            res.tezosResources = (0, serialization_5.toTezosResourcesRaw)(account.tezosResources);
+        }
+        case "tezos": {
+            var tezosAccount = account;
+            if (tezosAccount.tezosResources) {
+                res.tezosResources = (0, serialization_5.toTezosResourcesRaw)(tezosAccount.tezosResources);
+            }
             break;
-        case "bitcoin":
-            res.bitcoinResources = (0, serialization_1.toBitcoinResourcesRaw)(account.bitcoinResources);
+        }
+        case "bitcoin": {
+            var bitcoinAccount = account;
+            if (bitcoinAccount.bitcoinResources) {
+                res.bitcoinResources = (0, serialization_1.toBitcoinResourcesRaw)(bitcoinAccount.bitcoinResources);
+            }
             break;
-        case "algorand":
-            res.algorandResources = (0, serialization_3.toAlgorandResourcesRaw)(account.algorandResources);
+        }
+        case "algorand": {
+            var algorandAccount = account;
+            if (algorandAccount.algorandResources) {
+                res.algorandResources = (0, serialization_3.toAlgorandResourcesRaw)(algorandAccount.algorandResources);
+            }
             break;
-        case "polkadot":
-            res.polkadotResources = (0, serialization_4.toPolkadotResourcesRaw)(account.polkadotResources);
+        }
+        case "polkadot": {
+            var polkadotAccount = account;
+            if (polkadotAccount.polkadotResources) {
+                res.polkadotResources = (0, serialization_4.toPolkadotResourcesRaw)(polkadotAccount.polkadotResources);
+            }
             break;
-        case "elrond":
-            res.elrondResources = (0, serialization_6.toElrondResourcesRaw)(account.elrondResources);
+        }
+        case "elrond": {
+            var elrondAccount = account;
+            if (elrondAccount.elrondResources) {
+                res.elrondResources = (0, serialization_6.toElrondResourcesRaw)(elrondAccount.elrondResources);
+            }
             break;
-        case "cardano":
-            res.cardanoResources = (0, serialization_9.toCardanoResourceRaw)(account.cardanoResources);
+        }
+        case "cardano": {
+            var cardanoAccount = account;
+            if (cardanoAccount.cardanoResources) {
+                res.cardanoResources = (0, serialization_9.toCardanoResourceRaw)(cardanoAccount.cardanoResources);
+            }
             break;
-        case "solana":
-            res.solanaResources = (0, serialization_8.toSolanaResourcesRaw)(account.solanaResources);
+        }
+        case "solana": {
+            var solanaAccount = account;
+            if (solanaAccount.solanaResources) {
+                res.solanaResources = (0, serialization_8.toSolanaResourcesRaw)(solanaAccount.solanaResources);
+            }
             break;
-        case "crypto_org":
-            res.cryptoOrgResources = (0, serialization_7.toCryptoOrgResourcesRaw)(account.cryptoOrgResources);
+        }
+        case "crypto_org": {
+            var crytpoOrgAccount = account;
+            if (crytpoOrgAccount.cryptoOrgResources) {
+                res.cryptoOrgResources =
+                    (0, serialization_7.toCryptoOrgResourcesRaw)(crytpoOrgAccount.cryptoOrgResources);
+            }
             break;
+        }
     }
     if (swapHistory) {
         res.swapHistory = swapHistory.map(toSwapOperationRaw);