From f6024548fc44a5063916bc877e6a846824c12149 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Thu, 5 Nov 2020 09:05:52 -0800 Subject: [PATCH] only send a few params on non-LND ping --- dist/src/utils/nodeinfo.js | 20 ++++++++------------ dist/src/utils/nodeinfo.js.map | 2 +- src/utils/nodeinfo.ts | 25 +++++++++++-------------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dist/src/utils/nodeinfo.js b/dist/src/utils/nodeinfo.js index c646a0b..c215951 100644 --- a/dist/src/utils/nodeinfo.js +++ b/dist/src/utils/nodeinfo.js @@ -15,16 +15,8 @@ const gitinfo_1 = require("../utils/gitinfo"); const models_1 = require("../models"); function nodeinfo() { return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () { - let public_ip = ""; - try { - public_ip = yield publicIp.v4(); - } - catch (e) { } const commitHash = yield gitinfo_1.checkCommitHash(); const tag = yield gitinfo_1.checkTag(); - const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); - const clean = yield isClean(); - const latest_message = yield latestMessage(); try { yield lightning_1.getInfo(); } @@ -34,16 +26,20 @@ function nodeinfo() { ip: process.env.NODE_IP, lnd_port: process.env.NODE_LND_PORT, relay_commit: commitHash, - public_ip: public_ip, - pubkey: owner.publicKey, relay_version: tag, - clean, - latest_message, wallet_locked: true, }; resolve(node); return; } + let public_ip = ""; + try { + public_ip = yield publicIp.v4(); + } + catch (e) { } + const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); + const clean = yield isClean(); + const latest_message = yield latestMessage(); const lightning = lightning_1.loadLightning(); try { lightning.channelBalance({}, (err, channelBalance) => { diff --git a/dist/src/utils/nodeinfo.js.map b/dist/src/utils/nodeinfo.js.map index 2ca0787..93eecfa 100644 --- a/dist/src/utils/nodeinfo.js.map +++ b/dist/src/utils/nodeinfo.js.map @@ -1 +1 @@ -{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../src/utils/nodeinfo.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../src/utils/nodeinfo.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/nodeinfo.ts b/src/utils/nodeinfo.ts index e73fe6a..1113db8 100644 --- a/src/utils/nodeinfo.ts +++ b/src/utils/nodeinfo.ts @@ -6,21 +6,11 @@ import {models} from '../models' function nodeinfo(){ return new Promise(async (resolve, reject)=>{ - let public_ip = "" - try { - public_ip = await publicIp.v4() - } catch(e){} const commitHash = await checkCommitHash() const tag = await checkTag() - const owner = await models.Contact.findOne({ where: { isOwner: true }}) - - const clean = await isClean() - - const latest_message = await latestMessage() - try { await getInfo() } catch(e) { // no LND @@ -29,17 +19,24 @@ function nodeinfo(){ ip: process.env.NODE_IP, lnd_port: process.env.NODE_LND_PORT, relay_commit: commitHash, - public_ip: public_ip, - pubkey: owner.publicKey, relay_version: tag, - clean, - latest_message, wallet_locked: true, } resolve(node) return } + let public_ip = "" + try { + public_ip = await publicIp.v4() + } catch(e){} + + const owner = await models.Contact.findOne({ where: { isOwner: true }}) + + const clean = await isClean() + + const latest_message = await latestMessage() + const lightning = loadLightning() try { lightning.channelBalance({}, (err, channelBalance) => {