Skip to content

Fix bookkeeper blockheight read on restart #8649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2025
Merged

Fix bookkeeper blockheight read on restart #8649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d79dc0
pytest: test for blockheight entries in bookkeeper being saved across…
rustyrussell Oct 31, 2025
8db015b
bookkeeper: fix restoration of derived wallet blockheights on restart.
rustyrussell Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/bkpr/blockheights.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ struct blockheights *init_blockheights(const tal_t *ctx,
if (keytok->size != 3)
goto weird;

if (!json_to_txid(buf, keytok + 2, &txid))
if (!json_to_txid(buf, keytok + 3, &txid))
goto weird;
if (!json_hex_to_be32(buf, hextok, &be_blockheight))
goto weird;
Expand Down
7 changes: 7 additions & 0 deletions tests/test_bookkeeper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,3 +1193,10 @@ def test_listincome_timebox(node_factory, bitcoind):

incomes = l1.rpc.bkpr_listincome(end_time=first_one)['income_events']
assert [i for i in incomes if i['timestamp'] > first_one] == []

# We save blockheights in storage, so make sure we restore them on restart!
acctevents_before = l1.rpc.bkpr_listaccountevents()
l1.restart()

acctevents_after = l1.rpc.bkpr_listaccountevents()
assert acctevents_after == acctevents_before
Loading