machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix LN stats importer with new data "cleanupTopology" structure

Browse Source
This commit is contained in:
nymkappa 2022-08-19 18:07:26 +02:00
parent 64c5f1ce02
commit 5b9b717a93
No known key found for this signature in database
GPG Key ID: E155910B16E8BD04
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/index.ts
View File

@ -189,7 +189,7 @@ class Server {
await networkSyncService.$startService(); await networkSyncService.$startService();
await lightningStatsUpdater.$startService(); await lightningStatsUpdater.$startService();
} catch(e) { } catch(e) {
logger.err(`Lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`); logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
await Common.sleep$(1000 * 60); await Common.sleep$(1000 * 60);
this.$runLightningBackend(); this.$runLightningBackend();
}; };

34
backend/src/tasks/lightning/sync-tasks/stats-importer.ts
View File

@ -146,28 +146,40 @@ class LightningStatsImporter {
} }
} else { } else {
// @ts-ignore // @ts-ignore
if (channel.fee_rate_milli_msat < 5000) { if (channel.node1_policy.fee_rate_milli_msat < 5000) {
// @ts-ignore // @ts-ignore
avgFeeRate += parseInt(channel.fee_rate_milli_msat, 10); avgFeeRate += parseInt(channel.node1_policy.fee_rate_milli_msat, 10);
// @ts-ignore // @ts-ignore
feeRates.push(parseInt(channel.fee_rate_milli_msat), 10); feeRates.push(parseInt(channel.node1_policy.fee_rate_milli_msat), 10);
} }
// @ts-ignore // @ts-ignore
if (channel.fee_base_msat < 5000) { if (channel.node1_policy.fee_base_msat < 5000) {
// @ts-ignore // @ts-ignore
avgBaseFee += parseInt(channel.fee_base_msat, 10); avgBaseFee += parseInt(channel.node1_policy.fee_base_msat, 10);
// @ts-ignore // @ts-ignore
baseFees.push(parseInt(channel.fee_base_msat), 10); baseFees.push(parseInt(channel.node1_policy.fee_base_msat), 10);
} }
} }
} }
let medCapacity = 0;
let medFeeRate = 0;
let medBaseFee = 0;
let avgCapacity = 0;
avgFeeRate /= Math.max(networkGraph.edges.length, 1); avgFeeRate /= Math.max(networkGraph.edges.length, 1);
avgBaseFee /= Math.max(networkGraph.edges.length, 1); avgBaseFee /= Math.max(networkGraph.edges.length, 1);
const medCapacity = capacities.sort((a, b) => b - a)[Math.round(capacities.length / 2 - 1)];
const medFeeRate = feeRates.sort((a, b) => b - a)[Math.round(feeRates.length / 2 - 1)]; if (capacities.length > 0) {
const medBaseFee = baseFees.sort((a, b) => b - a)[Math.round(baseFees.length / 2 - 1)]; medCapacity = capacities.sort((a, b) => b - a)[Math.round(capacities.length / 2 - 1)];
const avgCapacity = Math.round(capacity / Math.max(capacities.length, 1)); avgCapacity = Math.round(capacity / Math.max(capacities.length, 1));
}
if (feeRates.length > 0) {
medFeeRate = feeRates.sort((a, b) => b - a)[Math.round(feeRates.length / 2 - 1)];
}
if (baseFees.length > 0) {
medBaseFee = baseFees.sort((a, b) => b - a)[Math.round(baseFees.length / 2 - 1)];
}
let query = `INSERT INTO lightning_stats( let query = `INSERT INTO lightning_stats(
added, added,
@ -350,7 +362,7 @@ class LightningStatsImporter {
logger.debug(`Generating LN network stats for ${datestr}. Processed ${totalProcessed}/${fileList.length} files`); logger.debug(`Generating LN network stats for ${datestr}. Processed ${totalProcessed}/${fileList.length} files`);
} }
await fundingTxFetcher.$fetchChannelsFundingTxs(graph.edges.map(channel => channel.channel_id.slice(0, -2))); await fundingTxFetcher.$fetchChannelsFundingTxs(graph.edges.map(channel => channel.channel_id.slice(0, -2)));
const stat = await this.computeNetworkStats(timestamp, graph); const stat = await this.computeNetworkStats(timestamp, graph, true);
existingStatsTimestamps[timestamp] = stat; existingStatsTimestamps[timestamp] = stat;
} }