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

Merge pull request #2651 from mononaut/fix-close-channel-id

Browse Source 
Fix lightning channel close classification logic
This commit is contained in:
softsimon 2022-10-21 23:58:00 +04:00 committed by GitHub
commit f3faf99c15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/api/database-migration.ts
View File

@ -4,7 +4,7 @@ import logger from '../logger';
import { Common } from './common'; import { Common } from './common';
class DatabaseMigration { class DatabaseMigration {
private static currentVersion = 40; private static currentVersion = 41;
private queryTimeout = 120000; private queryTimeout = 120000;
private statisticsAddedIndexed = false; private statisticsAddedIndexed = false;
private uniqueLogs: string[] = []; private uniqueLogs: string[] = [];
@ -348,6 +348,10 @@ class DatabaseMigration {
await this.$executeQuery('ALTER TABLE `nodes` ADD channels int(11) unsigned DEFAULT NULL'); await this.$executeQuery('ALTER TABLE `nodes` ADD channels int(11) unsigned DEFAULT NULL');
await this.$executeQuery('ALTER TABLE `nodes` ADD INDEX `capacity` (`capacity`);'); await this.$executeQuery('ALTER TABLE `nodes` ADD INDEX `capacity` (`capacity`);');
} }
if (databaseSchemaVersion < 41 && isBitcoin === true) {
await this.$executeQuery('UPDATE channels SET closing_reason = NULL WHERE closing_reason = 1');
}
} }
/** /**

71
backend/src/tasks/lightning/network-sync.service.ts
View File

@ -289,6 +289,24 @@ class NetworkSyncService {
1. Mutually closed 1. Mutually closed
2. Forced closed 2. Forced closed
3. Forced closed with penalty 3. Forced closed with penalty
┌────────────────────────────────────┐ ┌────────────────────────────┐
│ outputs contain revocation script? ├──yes──► force close w/ penalty = 3 │
└──────────────┬─────────────────────┘ └────────────────────────────┘
no
┌──────────────▼──────────────────────────┐
│ outputs contain other lightning script? ├──┐
└──────────────┬──────────────────────────┘ │
no yes
┌──────────────▼─────────────┐ │
│ sequence starts with 0x80 │ ┌────────▼────────┐
│ and ├──────► force close = 2 │
│ locktime starts with 0x20? │ └─────────────────┘
└──────────────┬─────────────┘
no
┌─────────▼────────┐
│ mutual close = 1 │
└──────────────────┘
*/ */
private async $runClosedChannelsForensics(): Promise<void> { private async $runClosedChannelsForensics(): Promise<void> {
@ -326,36 +344,31 @@ class NetworkSyncService {
lightningScriptReasons.push(lightningScript); lightningScriptReasons.push(lightningScript);
} }
} }
if (lightningScriptReasons.length === outspends.length const filteredReasons = lightningScriptReasons.filter((r) => r !== 1);
&& lightningScriptReasons.filter((r) => r === 1).length === outspends.length) { if (filteredReasons.length) {
reason = 1; if (filteredReasons.some((r) => r === 2 || r === 4)) {
} else { reason = 3;
const filteredReasons = lightningScriptReasons.filter((r) => r !== 1);
if (filteredReasons.length) {
if (filteredReasons.some((r) => r === 2 || r === 4)) {
reason = 3;
} else {
reason = 2;
}
} else { } else {
/* reason = 2;
We can detect a commitment transaction (force close) by reading Sequence and Locktime }
https://github.com/lightning/bolts/blob/master/03-transactions.md#commitment-transaction } else {
*/ /*
let closingTx: IEsploraApi.Transaction | undefined; We can detect a commitment transaction (force close) by reading Sequence and Locktime
try { https://github.com/lightning/bolts/blob/master/03-transactions.md#commitment-transaction
closingTx = await bitcoinApi.$getRawTransaction(channel.closing_transaction_id); */
} catch (e) { let closingTx: IEsploraApi.Transaction | undefined;
logger.err(`Failed to call ${config.ESPLORA.REST_API_URL + '/tx/' + channel.closing_transaction_id}. Reason ${e instanceof Error ? e.message : e}`); try {
continue; closingTx = await bitcoinApi.$getRawTransaction(channel.closing_transaction_id);
} } catch (e) {
const sequenceHex: string = closingTx.vin[0].sequence.toString(16); logger.err(`Failed to call ${config.ESPLORA.REST_API_URL + '/tx/' + channel.closing_transaction_id}. Reason ${e instanceof Error ? e.message : e}`);
const locktimeHex: string = closingTx.locktime.toString(16); continue;
if (sequenceHex.substring(0, 2) === '80' && locktimeHex.substring(0, 2) === '20') { }
reason = 2; // Here we can't be sure if it's a penalty or not const sequenceHex: string = closingTx.vin[0].sequence.toString(16);
} else { const locktimeHex: string = closingTx.locktime.toString(16);
reason = 1; if (sequenceHex.substring(0, 2) === '80' && locktimeHex.substring(0, 2) === '20') {
} reason = 2; // Here we can't be sure if it's a penalty or not
} else {
reason = 1;
} }
} }
if (reason) { if (reason) {