davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

wallet: handle null currency fields, skip & warn on mismatch.

Browse Source 
If they ran off master, currency can be null:

```
2025-08-21T10:03:04.566Z **BROKEN** lightningd: bookkeper migration: Accessing a null column e.currency/7 in query SELECT  e.id, e.account_id, a.name, e.tag, e.credit, e.debit, e.fees, e.currency, e.payment_id, e.part_id, e.timestamp, e.ev_desc, e.rebalance_id FROM channel_events e LEFT OUTER JOIN accounts a ON a.id = e.account_id ORDER BY e.timestamp, e.id;
```

So allow this, but *also* check if it's a different currency and skip.  This won't happen: you had to manually inject events in a different currency.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2025-08-28 10:55:55 +09:30
parent 6ef668e795
commit 293a65b41a
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wallet/account_migration.c
View File

@@ -105,7 +105,7 @@ static struct chain_event *stmt2chain_event(const tal_t *ctx, struct db_stmt *st
e->debit = db_col_amount_msat(stmt, "e.debit");
e->output_value = db_col_amount_msat(stmt, "e.output_value");
e->currency = db_col_strdup(e, stmt, "e.currency");
e->currency = db_col_strdup_optional(e, stmt, "e.currency");
e->timestamp = db_col_u64(stmt, "e.timestamp");
e->blockheight = db_col_int(stmt, "e.blockheight");
@@ -270,7 +270,7 @@ static struct channel_event *stmt2channel_event(const tal_t *ctx, struct db_stmt
e->debit = db_col_amount_msat(stmt, "e.debit");
e->fees = db_col_amount_msat(stmt, "e.fees");
e->currency = db_col_strdup(e, stmt, "e.currency");
e->currency = db_col_strdup_optional(e, stmt, "e.currency");
if (!db_col_is_null(stmt, "e.payment_id")) {
e->payment_id = tal(e, struct sha256);
db_col_sha256(stmt, "e.payment_id", e->payment_id);
@@ -404,6 +404,16 @@ void migrate_from_account_db(struct lightningd *ld, struct db *db)
struct amount_sat output_sat;
u64 id;
/* We removed currency support, because the only way you could
* use it was to inject your own events, and nobody did that
* and it would be a nightmare to support */
if (ev->currency
&& !streq(ev->currency, chainparams->lightning_hrp)) {
log_broken(ld->log, "IGNORING foreign currency chain event (%s, currency %s)",
ev->tag, ev->currency);
continue;
}
stmt = db_prepare_v2(db,
SQL("INSERT INTO chain_moves ("
" id,"
@@ -483,6 +493,16 @@ void migrate_from_account_db(struct lightningd *ld, struct db *db)
enum mvt_tag tag;
u64 id;
/* We removed currency support, because the only way you could
* use it was to inject your own events, and nobody did that
* and it would be a nightmare to support */
if (ev->currency
&& !streq(ev->currency, chainparams->lightning_hrp)) {
log_broken(ld->log, "IGNORING foreign currency channel event (%s, currency %s)",
ev->tag, ev->currency);
continue;
}
stmt = db_prepare_v2(db,
SQL("INSERT INTO channel_moves ("
" id,"