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

Merge pull request #2203 from mempool/nymkappa/bugfix/channels-update-status

Browse Source 
Don't set all channels to inactive when the updater runs
This commit is contained in:
wiz 2022-07-27 19:16:54 +00:00 committed by GitHub
commit 3e2cf5c058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
backend/src/tasks/lightning/node-sync.service.ts
View File

@ -38,11 +38,13 @@ class NodeSyncService {
await $lookupNodeLocation(); await $lookupNodeLocation();
} }
await this.$setChannelsInactive(); const graphChannelsIds: string[] = [];
for (const channel of networkGraph.channels) { for (const channel of networkGraph.channels) {
await this.$saveChannel(channel); await this.$saveChannel(channel);
graphChannelsIds.push(channel.id);
} }
await this.$setChannelsInactive(graphChannelsIds);
logger.info(`Channels updated.`); logger.info(`Channels updated.`);
await this.$findInactiveNodesAndChannels(); await this.$findInactiveNodesAndChannels();
@ -106,7 +108,22 @@ class NodeSyncService {
try { try {
// @ts-ignore // @ts-ignore
const [channels]: [ILightningApi.Channel[]] = await DB.query(`SELECT channels.id FROM channels WHERE channels.status = 1 AND ((SELECT COUNT(*) FROM nodes WHERE nodes.public_key = channels.node1_public_key) = 0 OR (SELECT COUNT(*) FROM nodes WHERE nodes.public_key = channels.node2_public_key) = 0)`); const [channels]: [ILightningApi.Channel[]] = await DB.query(`
SELECT channels.id
FROM channels
WHERE channels.status = 1
AND (
(
SELECT COUNT(*)
FROM nodes
WHERE nodes.public_key = channels.node1_public_key
) = 0
OR (
SELECT COUNT(*)
FROM nodes
WHERE nodes.public_key = channels.node2_public_key
) = 0)
`);
for (const channel of channels) { for (const channel of channels) {
await this.$updateChannelStatus(channel.id, 0); await this.$updateChannelStatus(channel.id, 0);
@ -356,9 +373,16 @@ class NodeSyncService {
} }
} }
private async $setChannelsInactive(): Promise<void> { private async $setChannelsInactive(graphChannelsIds: string[]): Promise<void> {
try { try {
await DB.query(`UPDATE channels SET status = 0 WHERE status = 1`); await DB.query(`
UPDATE channels
SET status = 0
WHERE short_id NOT IN (
${graphChannelsIds.map(id => `"${id}"`).join(',')}
)
AND status != 2
`);
} catch (e) { } catch (e) {
logger.err('$setChannelsInactive() error: ' + (e instanceof Error ? e.message : e)); logger.err('$setChannelsInactive() error: ' + (e instanceof Error ? e.message : e));
} }