From ebc9a8b28ebe78122cfe68b6bc44ca3a80850a49 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 21 Aug 2025 10:39:50 +0930
Subject: [PATCH] lightningd: fix name of chainmoves journal entry.

```
lightningd: FATAL SIGNAL 6 (version v25.09rc1-1-ga00ed81)
0x5c9e848ca050 send_backtrace
	common/daemon.c:33
0x5c9e848ca249 crashdump
	common/daemon.c:78
0x7f451664532f ???
	./signal/../sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c:0
0x7f451669eb2c __pthread_kill_implementation
	./nptl/pthread_kill.c:44
0x7f451669eb2c __pthread_kill_internal
	./nptl/pthread_kill.c:78
0x7f451669eb2c __GI___pthread_kill
	./nptl/pthread_kill.c:89
0x7f451664527d __GI_raise
	../sysdeps/posix/raise.c:26
0x7f45166288fe __GI_abort
	./stdlib/abort.c:79
0x5c9e84893ac3 migrate_from_account_db
	wallet/account_migration.c:500
0x5c9e848943f7 db_migrate
	wallet/db.c:1139
...
#5  0x0000555555615ac4 in migrate_from_account_db (ld=0x555555999238, db=0x55555599b158) at wallet/account_migration.c:500
500				abort();
(gdb) p ev->tag
$1 = 0x555555a4fbb8 "journal_entry"
```

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 common/coin_mvt.c                 | 2 +-
 contrib/msggen/msggen/schema.json | 2 +-
 doc/schemas/listchannelmoves.json | 2 +-
 tests/test_bookkeeper.py          | 4 ++--
 tests/test_coinmoves.py           | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/coin_mvt.c b/common/coin_mvt.c
index 201683174..4a3063348 100644
--- a/common/coin_mvt.c
+++ b/common/coin_mvt.c
@@ -34,7 +34,7 @@ static const char *mvt_tags[] = {
 	"channel_proposed",
 	"splice",
 	"penalty_adj",
-	"journal",
+	"journal_entry",
 	"foreign",
 };
 
diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json
index 68a5a44c9..b948a0c3e 100644
--- a/contrib/msggen/msggen/schema.json
+++ b/contrib/msggen/msggen/schema.json
@@ -16855,7 +16855,7 @@
                     "lease_fee",
                     "channel_proposed",
                     "penalty_adj",
-                    "journal"
+                    "journal_entry"
                   ],
                   "description": [
                     "A set of one or more tags defining the nature of the change"
diff --git a/doc/schemas/listchannelmoves.json b/doc/schemas/listchannelmoves.json
index a803136c5..d98a72b77 100644
--- a/doc/schemas/listchannelmoves.json
+++ b/doc/schemas/listchannelmoves.json
@@ -103,7 +103,7 @@
                 "lease_fee",
                 "channel_proposed",
                 "penalty_adj",
-                "journal"
+                "journal_entry"
               ],
               "description": [
                 "A set of one or more tags defining the nature of the change"
diff --git a/tests/test_bookkeeper.py b/tests/test_bookkeeper.py
index c80c03fb4..edb57c0aa 100644
--- a/tests/test_bookkeeper.py
+++ b/tests/test_bookkeeper.py
@@ -1126,7 +1126,7 @@ def test_migration_no_bkpr(node_factory, bitcoind):
                           'currency': 'bcrt',
                           'debit_msat': 12345678,
                           'is_rebalance': False,
-                          'tag': 'journal',
+                          'tag': 'journal_entry',
                           'type': 'channel'}]
 
     assert l2_events == [{'account': chan['channel_id'],
@@ -1142,5 +1142,5 @@ def test_migration_no_bkpr(node_factory, bitcoind):
                           'currency': 'bcrt',
                           'debit_msat': 0,
                           'is_rebalance': False,
-                          'tag': 'journal',
+                          'tag': 'journal_entry',
                           'type': 'channel'}]
diff --git a/tests/test_coinmoves.py b/tests/test_coinmoves.py
index acf1c0d4d..0cdefe83f 100644
--- a/tests/test_coinmoves.py
+++ b/tests/test_coinmoves.py
@@ -2021,14 +2021,14 @@ def test_migration_no_bkpr(node_factory, bitcoind):
                           'credit_msat': 0,
                           'debit_msat': 12345678,
                           'fees_msat': 0,
-                          'primary_tag': 'journal',
+                          'primary_tag': 'journal_entry',
                           }]
     expected_channel2 = [{'account_id': chan['channel_id'],
                           'created_index': 1,
                           'credit_msat': 12345678,
                           'debit_msat': 0,
                           'fees_msat': 0,
-                          'primary_tag': 'journal',
+                          'primary_tag': 'journal_entry',
                           }]
     expected_chain1 = [{'account_id': 'wallet',
                         'blockheight': 103,