aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 00:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

bkpr: use chain_closed count to do mark account closed

Browse Source 
More robust than inspecting the returned utxo treeset -- if the tree is
complete but missing outputs we'll get the wrong result
This commit is contained in:
niftynei
2022-07-19 17:04:36 +09:30
committed by Rusty Russell
parent 7d5a0988db
commit 8f869ade3c
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/bkpr/recorder.c
View File

@@ -390,19 +390,44 @@ bool find_txo_chain(const tal_t *ctx,
void maybe_mark_account_onchain(struct db *db, struct account *acct) void maybe_mark_account_onchain(struct db *db, struct account *acct)
{ {
const u8 *ctx = tal(NULL, u8); const u8 *ctx = tal(NULL, u8);
if (find_txo_chain(ctx, db, acct, NULL)) { struct txo_set **sets;
struct chain_event *close_ev;
struct db_stmt *stmt;
assert(acct->closed_count > 0);
close_ev = find_chain_event_by_id(ctx, db,
*acct->closed_event_db_id);
if (find_txo_chain(ctx, db, acct, &sets)) {
/* Ok now we find the max block height of the /* Ok now we find the max block height of the
* spending chain_events for this channel */ * spending chain_events for this channel */
bool ok; bool ok;
struct db_stmt *stmt = db_prepare_v2(db, /* Have we accounted for all the outputs */
SQL("SELECT" ok = false;
" blockheight" for (size_t i = 0; i < tal_count(sets); i++) {
" FROM chain_events" if (bitcoin_txid_eq(sets[i]->txid,
" WHERE account_id = ?" close_ev->spending_txid)) {
" AND spending_txid IS NOT NULL"
" ORDER BY blockheight DESC" ok = tal_count(sets[i]->pairs)
" LIMIT 1")); == acct->closed_count;
break;
}
}
if (!ok) {
tal_free(ctx);
return;
}
stmt = db_prepare_v2(db, SQL("SELECT"
" blockheight"
" FROM chain_events"
" WHERE account_id = ?"
" AND spending_txid IS NOT NULL"
" ORDER BY blockheight DESC"
" LIMIT 1"));
db_bind_u64(stmt, 0, acct->db_id); db_bind_u64(stmt, 0, acct->db_id);
db_query_prepared(stmt); db_query_prepared(stmt);