@pioneer-platform/pioneer 8.2.11 → 8.2.15

package/lib/index.d.ts

@@ -39,4 +39,4 @@ declare let register_xpub: (username: string, pubkey: any, context: string) => P
 }>;
 declare let register_address: (username: string, pubkey: any, context: string) => Promise<any>;
 declare let update_pubkeys: (username: string, pubkeys: any, context: string) => Promise<any>;
-declare const register_pubkeys: (username: string, pubkeys: any, context: string) => Promise<any>;
+declare const register_pubkeys: (username: string, pubkeys: any) => Promise<any>;

package/lib/index.js

@@ -94,7 +94,7 @@ var networks = {
     'ANY': require('@pioneer-platform/utxo-network'),
     'RUNE': require('@pioneer-platform/thor-network'),
 };
-var _b = require('@pioneer-platform/pioneer-coins'), get_address_from_xpub = _b.get_address_from_xpub, getNativeAssetForBlockchain = _b.getNativeAssetForBlockchain;
+var _b = require('@pioneer-platform/cointools'), get_address_from_xpub = _b.get_address_from_xpub, getNativeAssetForBlockchain = _b.getNativeAssetForBlockchain;
 //const bcrypt = require('bcryptjs');
 var numbro = require("numbro");
 var log = require('@pioneer-platform/loggerdog')();
@@ -165,10 +165,10 @@ module.exports = {
             });
         });
     },
-    register: function (username, pubkeys, context) {
+    register: function (username, pubkeys) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, register_pubkeys(username, pubkeys, context)];
+                return [2 /*return*/, register_pubkeys(username, pubkeys)];
             });
         });
     },
@@ -235,14 +235,14 @@ function setInCache(key, data, expiration) {
 var get_pubkey_balances = function (pubkey) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var tag, output, balances_1, nfts, positions, cacheKey, cachedData, balance, _c, cacheKeyZapper, cachedDataZapper, zapperInfo, cacheKeyAllPioneers, cachedAllPioneers, allPioneers, isPioneer, updatedUsername, pioneerImage, updatedUsername2, cacheKeyBlockbookInfo, cachedBlockbookInfo, blockbookInfo, cacheKeyNetwork, cachedDataNetwork, balanceNetwork, pubkeyInfo, saveActions, _loop_1, i, _loop_2, i, updateSuccess, e_2;
+        var tag, output, balances_1, nfts, positions, cacheKey, cachedData, balance, _c, cacheKeyZapper, cachedDataZapper, zapperInfo, cacheKeyAllPioneers, cachedAllPioneers, allPioneers, isPioneer, updatedUsername, pioneerImage, updatedUsername2, cacheKeyBlockbookInfo, cachedBlockbookInfo, blockbookInfo, cacheKeyNetwork, cachedDataNetwork, balanceNetwork, pubkeyInfo, _loop_1, i, e_2;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     tag = TAG + " | get_pubkey_balances | ";
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 41, , 42]);
+                    _d.trys.push([1, 35, , 36]);
                     output = {};
                     if (!pubkey.symbol && pubkey.asset)
                         pubkey.symbol = pubkey.asset;
@@ -497,102 +497,30 @@ var get_pubkey_balances = function (pubkey) {
                     log.debug(tag, "nfts: ", pubkeyInfo.nfts.length);
                     log.debug(tag, "balances: ", balances_1);
                     log.debug(tag, "balances: ", balances_1.length);
-                    saveActions = [];
                     _loop_1 = function (i) {
-                        var balance, balanceIndex, assetInfo;
-                        var _e;
-                        return __generator(this, function (_f) {
-                            switch (_f.label) {
-                                case 0:
-                                    balance = balances_1[i];
-                                    balanceIndex = pubkeyInfo.balances.findIndex(function (e) { return e.symbol === balance.symbol; });
-                                    return [4 /*yield*/, assetsDB.findOne({ symbol: balance.symbol })];
-                                case 1:
-                                    assetInfo = _f.sent();
-                                    log.debug(tag, "assetInfo: ", assetInfo);
-                                    if (assetInfo) {
-                                        balance.caip = assetInfo.caip;
-                                        balance.image = assetInfo.image;
-                                        balance.assetCaip = assetInfo.caip;
-                                        balance.description = assetInfo.description;
-                                        balance.website = assetInfo.website;
-                                        balance.explorer = assetInfo.explorer;
-                                        balance.context = pubkey.context;
-                                    }
-                                    if (balanceIndex !== -1 && pubkeyInfo.balances[balanceIndex].balance !== balance.balance) {
-                                        saveActions.push({
-                                            updateOne: {
-                                                filter: { pubkey: pubkey.pubkey },
-                                                update: {
-                                                    $set: (_e = {}, _e["balances.".concat(balanceIndex)] = balance, _e),
-                                                },
-                                            },
-                                        });
-                                    }
-                                    else {
-                                        log.debug(tag, pubkey.context + ": balance not changed! ", balance.symbol);
-                                    }
-                                    return [2 /*return*/];
-                            }
-                        });
-                    };
-                    i = 0;
-                    _d.label = 35;
-                case 35:
-                    if (!(i < balances_1.length)) return [3 /*break*/, 38];
-                    return [5 /*yield**/, _loop_1(i)];
-                case 36:
-                    _d.sent();
-                    _d.label = 37;
-                case 37:
-                    i++;
-                    return [3 /*break*/, 35];
-                case 38:
-                    _loop_2 = function (i) {
                         var nft = nfts[i];
                         log.debug(tag, "pubkeyInfo.nfts: ", pubkeyInfo.nfts.length);
                         var existingNft = pubkeyInfo.nfts.find(function (e) { return e.name === nft.name; });
-                        if (!existingNft) {
-                            saveActions.push({
-                                updateOne: {
-                                    filter: { pubkey: pubkey.pubkey },
-                                    update: {
-                                        $addToSet: { nfts: nft }
-                                    }
-                                }
-                            });
-                        }
                     };
                     for (i = 0; i < nfts.length; i++) {
-                        _loop_2(i);
+                        _loop_1(i);
                     }
-                    if (!(saveActions.length > 0)) return [3 /*break*/, 40];
-                    return [4 /*yield*/, pubkeysDB.bulkWrite(saveActions, { ordered: false })];
-                case 39:
-                    updateSuccess = _d.sent();
-                    log.debug(tag, "updateSuccess: ", updateSuccess);
-                    output.dbUpdate = updateSuccess;
-                    _d.label = 40;
-                case 40:
-                    //@TODO save transactions
-                    // Build output
-                    output.pubkeys = [pubkeyInfo];
                     output.balances = balances_1;
                     output.nfts = nfts;
                     output.success = true;
                     return [2 /*return*/, output];
-                case 41:
+                case 35:
                     e_2 = _d.sent();
                     console.error(tag, "e: ", e_2);
                     throw e_2;
-                case 42: return [2 /*return*/];
+                case 36: return [2 /*return*/];
             }
         });
     });
 };
 var get_and_rescan_pubkeys = function (username) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, pubkeysMongo, userInfo, blockchains, pubkeys, masters, i, pubkeyInfo, _loop_3, j, e_3;
+        var tag, pubkeysMongo, userInfo, blockchains, pubkeys, masters, i, pubkeyInfo, _loop_2, j, e_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -618,7 +546,7 @@ var get_and_rescan_pubkeys = function (username) {
                     for (i = 0; i < pubkeysMongo.length; i++) {
                         pubkeyInfo = pubkeysMongo[i];
                         delete pubkeyInfo._id;
-                        _loop_3 = function (j) {
+                        _loop_2 = function (j) {
                             var context = userInfo.wallets[i];
                             if (pubkeyInfo.type === 'zpub') {
                                 //if context found in tags
@@ -642,7 +570,7 @@ var get_and_rescan_pubkeys = function (username) {
                         };
                         //for each wallet by user
                         for (j = 0; j < userInfo.wallets.length; j++) {
-                            _loop_3(j);
+                            _loop_2(j);
                         }
                     }
                     return [2 /*return*/, { pubkeys: pubkeys, masters: masters }];
@@ -797,7 +725,7 @@ var register_zpub = function (username, pubkey, context) {
                 case 3:
                     result = _a.sent();
                     log.debug(result);
-                    return [2 /*return*/, queueId];
+                    return [2 /*return*/, result];
                 case 4:
                     e_5 = _a.sent();
                     console.error(tag, "e: ", e_5);
@@ -898,7 +826,7 @@ var register_address = function (username, pubkey, context) {
                 case 2:
                     result = _a.sent();
                     log.debug(tag, "result: ", result);
-                    return [2 /*return*/, queueId];
+                    return [2 /*return*/, result];
                 case 3:
                     e_7 = _a.sent();
                     console.error(tag, "e: ", e_7);
@@ -1083,29 +1011,40 @@ var update_pubkeys = function (username, pubkeys, context) {
         });
     });
 };
-var register_pubkeys = function (username, pubkeys, context) {
+/*
+    Rules:
+
+    only go to network if no pubkey exists
+
+    do not sync balances here (we only sync balances on context change)
+
+ */
+var register_pubkeys = function (username, pubkeys) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, saveActions, allBalances, output, i, pubkeyInfo, nativeAsset, entryMongo, xpub, result, zpub, result, result, keyExists, pushTagMongo, saveMongo, e_9;
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var tag, saveActions, allBalances, output, i, pubkeyInfo, nativeAsset, pubkeyExists, entryMongo, xpub, result, zpub, result, result, action, saveMongoBulk, allPubkeys, i, pubkeyInfo, e_9;
+        var _a, _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     tag = TAG + " | register_pubkeys | ";
-                    _d.label = 1;
+                    _f.label = 1;
                 case 1:
-                    _d.trys.push([1, 17, , 18]);
-                    log.debug(tag, "input: ", { username: username, pubkeys: pubkeys, context: context });
+                    _f.trys.push([1, 16, , 17]);
+                    log.debug(tag, "input: ", { username: username, pubkeys: pubkeys });
                     saveActions = [];
                     allBalances = [];
                     output = {};
                     output.pubkeys = [];
                     output.balances = [];
+                    output.nfts = [];
                     i = 0;
-                    _d.label = 2;
+                    _f.label = 2;
                 case 2:
-                    if (!(i < pubkeys.length)) return [3 /*break*/, 16];
+                    if (!(i < pubkeys.length)) return [3 /*break*/, 12];
                     pubkeyInfo = pubkeys[i];
                     log.debug(tag, "pubkeyInfo: ", pubkeyInfo);
+                    if (!pubkeyInfo.blockchain)
+                        throw Error("Invalid pubkey required field: blockchain");
                     nativeAsset = getNativeAssetForBlockchain(pubkeyInfo.blockchain);
                     if (!nativeAsset)
                         throw Error("104: invalid pubkey! unsupported by coins module!");
@@ -1113,19 +1052,22 @@ var register_pubkeys = function (username, pubkeys, context) {
                         throw Error("104: invalid pubkey! missing pubkey!");
                     if (!pubkeyInfo.type)
                         throw Error("104: invalid pubkey! missing type!");
-                    //TODO verify type is in enums
-                    //hack
                     if (!pubkeyInfo.symbol)
                         pubkeyInfo.symbol = nativeAsset;
-                    log.debug(tag, "pubkeyInfo: ", pubkeyInfo);
-                    if (!pubkeyInfo.blockchain)
-                        throw Error("Invalid pubkey required field: blockchain");
                     if (!pubkeyInfo.script_type)
                         throw Error("Invalid pubkey required field: script_type coin:" + pubkeyInfo.blockchain);
                     if (!pubkeyInfo.network)
                         throw Error("Invalid pubkey required field: network coin:" + pubkeyInfo.blockchain);
                     if (!pubkeyInfo.master)
                         throw Error("Invalid pubkey required field: master coin:" + pubkeyInfo.blockchain);
+                    if (!pubkeyInfo.path)
+                        throw Error("Invalid pubkey required field: path coin:" + pubkeyInfo.blockchain);
+                    if (!pubkeyInfo.context)
+                        throw Error("Invalid pubkey required field: context:" + pubkeyInfo.blockchain);
+                    return [4 /*yield*/, pubkeysDB.findOne({ pubkey: pubkeyInfo.pubkey })];
+                case 3:
+                    pubkeyExists = _f.sent();
+                    if (!!pubkeyExists) return [3 /*break*/, 11];
                     entryMongo = {
                         pubkey: pubkeyInfo.pubkey,
                         type: pubkeyInfo.type,
@@ -1137,9 +1079,9 @@ var register_pubkeys = function (username, pubkeys, context) {
                         script_type: pubkeyInfo.script_type,
                         network: pubkeyInfo.blockchain,
                         created: new Date().getTime(),
-                        tags: [username, pubkeyInfo.blockchain, pubkeyInfo.symbol, pubkeyInfo.network, context],
+                        tags: [username, pubkeyInfo.blockchain, pubkeyInfo.symbol, pubkeyInfo.network, pubkeyInfo.context],
                     };
-                    if (!(pubkeyInfo.type === "xpub")) return [3 /*break*/, 4];
+                    if (!(pubkeyInfo.type === "xpub")) return [3 /*break*/, 5];
                     log.debug(tag, "pubkeyInfo: ", pubkeyInfo);
                     xpub = pubkeyInfo.pubkey;
                     log.debug(tag, "xpub: ", xpub);
@@ -1148,78 +1090,84 @@ var register_pubkeys = function (username, pubkeys, context) {
                     entryMongo.type = 'xpub';
                     entryMongo.master = pubkeyInfo.address;
                     entryMongo.address = pubkeyInfo.address;
-                    return [4 /*yield*/, register_xpub(username, pubkeyInfo, context)];
-                case 3:
-                    result = _d.sent();
+                    return [4 /*yield*/, register_xpub(username, pubkeyInfo, pubkeyInfo.context)];
+                case 4:
+                    result = _f.sent();
+                    entryMongo.balances = result.balances;
                     allBalances.push.apply(allBalances, result.balances);
                     (_a = output.pubkeys).push.apply(_a, result.pubkeys);
-                    return [3 /*break*/, 9];
-                case 4:
-                    if (!(pubkeyInfo.type === "zpub")) return [3 /*break*/, 6];
+                    return [3 /*break*/, 10];
+                case 5:
+                    if (!(pubkeyInfo.type === "zpub")) return [3 /*break*/, 7];
                     zpub = pubkeyInfo.pubkey;
                     entryMongo.pubkey = zpub;
                     entryMongo.zpub = zpub;
                     entryMongo.type = 'zpub';
                     entryMongo.master = pubkeyInfo.address;
                     entryMongo.address = pubkeyInfo.address;
-                    return [4 /*yield*/, register_xpub(username, pubkeyInfo, context)];
-                case 5:
-                    result = _d.sent();
+                    return [4 /*yield*/, register_xpub(username, pubkeyInfo, pubkeyInfo.context)];
+                case 6:
+                    result = _f.sent();
+                    entryMongo.balances = result.balances;
                     allBalances.push.apply(allBalances, result.balances);
                     (_b = output.pubkeys).push.apply(_b, result.pubkeys);
-                    return [3 /*break*/, 9];
-                case 6:
-                    if (!(pubkeyInfo.type === "address")) return [3 /*break*/, 8];
+                    return [3 /*break*/, 10];
+                case 7:
+                    if (!(pubkeyInfo.type === "address")) return [3 /*break*/, 9];
                     entryMongo.pubkey = pubkeyInfo.pubkey;
                     entryMongo.master = pubkeyInfo.pubkey;
                     entryMongo.type = pubkeyInfo.type;
                     entryMongo.address = pubkeyInfo.address;
-                    return [4 /*yield*/, register_address(username, pubkeyInfo, context)];
-                case 7:
-                    result = _d.sent();
+                    return [4 /*yield*/, register_address(username, pubkeyInfo, pubkeyInfo.context)];
+                case 8:
+                    result = _f.sent();
+                    entryMongo.balances = result.balances;
                     allBalances.push.apply(allBalances, result.balances);
                     (_c = output.pubkeys).push.apply(_c, result.pubkeys);
-                    return [3 /*break*/, 9];
-                case 8:
-                    log.error("Unhandled type: ", pubkeyInfo.type);
-                    _d.label = 9;
+                    return [3 /*break*/, 10];
                 case 9:
+                    log.error(tag, "Unhandled type: ", pubkeyInfo.type);
+                    _f.label = 10;
+                case 10:
                     //verify write
-                    log.debug(tag, "entryMongo: ", entryMongo);
+                    log.info(tag, "entryMongo: ", entryMongo);
                     if (!entryMongo.pubkey)
                         throw Error("103: Invalid pubkey! can not save!");
-                    return [4 /*yield*/, pubkeysDB.findOne({ pubkey: entryMongo.pubkey })];
-                case 10:
-                    keyExists = _d.sent();
-                    if (!keyExists) return [3 /*break*/, 12];
-                    log.debug(tag, "Key already registered! key: ", entryMongo);
-                    return [4 /*yield*/, pubkeysDB.update({ pubkey: entryMongo.pubkey }, { $addToSet: { tags: { $each: [context, username] } } })];
+                    if (!entryMongo.balances)
+                        throw Error("103: Invalid pubkey! no balances set!");
+                    action = {
+                        insertOne: entryMongo
+                    };
+                    saveActions.push(action);
+                    _f.label = 11;
                 case 11:
-                    pushTagMongo = _d.sent();
-                    log.debug(tag, "pushTagMongo: ", pushTagMongo);
-                    return [3 /*break*/, 15];
-                case 12:
-                    if (!(!entryMongo.pubkey || entryMongo.pubkey == true)) return [3 /*break*/, 13];
-                    log.error(" **** ERROR INVALID PUBKEY ENTRY! ***** pubkeyInfo: ", pubkeyInfo);
-                    log.error(" **** ERROR INVALID PUBKEY ENTRY! ***** entryMongo: ", entryMongo);
-                    throw Error("105: unable to save invalid pubkey!");
-                case 13: return [4 /*yield*/, pubkeysDB.insert(entryMongo)];
-                case 14:
-                    saveMongo = _d.sent();
-                    log.debug(tag, "saveMongo: ", saveMongo);
-                    _d.label = 15;
-                case 15:
                     i++;
                     return [3 /*break*/, 2];
-                case 16:
-                    output.balances = allBalances;
-                    log.debug(tag, "return object: ", output);
+                case 12:
+                    if (!(saveActions.length > 0)) return [3 /*break*/, 14];
+                    return [4 /*yield*/, pubkeysDB.bulkWrite(saveActions, { ordered: false })];
+                case 13:
+                    saveMongoBulk = _f.sent();
+                    log.info(tag, "saveMongoBulk: ", saveMongoBulk);
+                    _f.label = 14;
+                case 14: return [4 /*yield*/, pubkeysDB.find({ tags: { $in: [username] } })];
+                case 15:
+                    allPubkeys = _f.sent();
+                    log.info(tag, "allPubkeys: ", allPubkeys.length);
+                    //get all balances for username
+                    for (i = 0; i < allPubkeys.length; i++) {
+                        pubkeyInfo = allPubkeys[i];
+                        if (pubkeyInfo.balances)
+                            (_d = output.balances).push.apply(_d, pubkeyInfo.balances);
+                        if (pubkeyInfo.nfts)
+                            (_e = output.nfts).push.apply(_e, pubkeyInfo.nfts);
+                    }
                     return [2 /*return*/, output];
-                case 17:
-                    e_9 = _d.sent();
+                case 16:
+                    e_9 = _f.sent();
                     console.error(tag, "e: ", e_9);
                     throw e_9;
-                case 18: return [2 /*return*/];
+                case 17: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/pioneer",
-  "version": "8.2.11",
+  "version": "8.2.15",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
@@ -22,12 +22,14 @@
   "dependencies": {
     "@pioneer-platform/blockbook": "^8.1.61",
     "@pioneer-platform/blocknative-client": "^8.1.27",
+    "@pioneer-platform/cointools": "^8.1.72",
     "@pioneer-platform/loggerdog": "^8.1.31",
     "@pioneer-platform/pioneer-caip": "^8.1.79",
     "@pioneer-platform/redis-queue": "^8.1.24",
     "@pioneer-platform/unchained": "^8.1.63",
     "@pioneer-platform/zapper-client": "^8.1.26",
-    "dotenv": "^8.2.0"
+    "dotenv": "^8.2.0",
+    "short-uuid": "^4.2.2"
   },
   "devDependencies": {
     "@types/jest": "^25.2.3",