fixup!

These need to be rebased, but keeping separate for review.

1. uninitialized variables: thanks valgrind!
2. many header malorders.

Author: rustyrussell

plugins/bkpr/account.c

@@ -4,7 +4,6 @@
 #include <ccan/json_out/json_out.h>
 #include <ccan/str/str.h>
 #include <ccan/tal/str/str.h>
-#include <common/coin_mvt.h>
 #include <common/memleak.h>
 #include <common/node_id.h>
 #include <plugins/bkpr/account.h>

plugins/bkpr/blockheights.c

@@ -7,12 +7,11 @@
 #include <ccan/tal/str/str.h>
 #include <common/memleak.h>
 #include <common/utils.h>
+#include <inttypes.h>
 #include <plugins/bkpr/blockheights.h>
 #include <plugins/bkpr/bookkeeper.h>
 #include <plugins/libplugin.h>
 
-#include <inttypes.h>
-
 struct blockheight_entry {
 	struct bitcoin_txid txid;
 	u32 height;

plugins/bkpr/bookkeeper.c

@@ -1090,6 +1090,7 @@ parse_and_log_chain_move(struct command *cmd,
 	enum mvt_tag tag, *tags;
 
 	/* Fields we expect on *every* chain movement */
+	closed_count = 0;
 	err = json_scan(tmpctx, buf, chainmove,
 			"{account_id:%"
 			",created_index:%"

plugins/bkpr/channel_event.c

@@ -24,7 +24,7 @@ struct channel_event *new_channel_event(const tal_t *ctx,
 	ev->credit = credit;
 	ev->debit = debit;
 	ev->fees = fees;
-	ev->payment_id = tal_dup(ev, struct sha256, payment_id);
+	ev->payment_id = tal_dup_or_null(ev, struct sha256, payment_id);
 	ev->part_id = part_id;
 	ev->timestamp = timestamp;
 

plugins/bkpr/descriptions.c

@@ -4,8 +4,8 @@
 #include <ccan/htable/htable_type.h>
 #include <ccan/json_out/json_out.h>
 #include <ccan/str/hex/hex.h>
-#include <ccan/tal/tal.h>
 #include <ccan/tal/str/str.h>
+#include <ccan/tal/tal.h>
 #include <common/memleak.h>
 #include <common/utils.h>
 #include <plugins/bkpr/bookkeeper.h>

plugins/bkpr/onchain_fee.c

@@ -9,14 +9,14 @@
 #include <common/json_stream.h>
 #include <common/memleak.h>
 #include <common/pseudorand.h>
+#include <inttypes.h>
 #include <plugins/bkpr/account.h>
 #include <plugins/bkpr/account_entry.h>
 #include <plugins/bkpr/chain_event.h>
 #include <plugins/bkpr/channel_event.h>
 #include <plugins/bkpr/onchain_fee.h>
 #include <plugins/bkpr/recorder.h>
 #include <plugins/libplugin.h>
-#include <inttypes.h>
 #include <wire/wire.h>
 
 /* We keep a hash of onchain_fee arrays.  Each array is sorted. */

plugins/bkpr/rebalances.c

@@ -8,8 +8,8 @@
 #include <common/memleak.h>
 #include <common/node_id.h>
 #include <common/utils.h>
-#include <plugins/bkpr/rebalances.h>
 #include <plugins/bkpr/bookkeeper.h>
+#include <plugins/bkpr/rebalances.h>
 #include <plugins/libplugin.h>
 #include <wire/wire.h>
 

plugins/bkpr/sql.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <common/json_stream.h>
 #include <plugins/bkpr/blockheights.h>
 #include <plugins/bkpr/chain_event.h>

plugins/bkpr/sql.h

@@ -67,4 +67,4 @@ PRINTF_FMT(4, 5) chain_events_from_sql(const tal_t *ctx,
 /* Return with escaped quotes, if any */
 const char *sql_string(const tal_t *ctx, const char *str);
 
-#endif /* LIGHTNING_PLUGINS_BKPR_BOOKKEEPER_H */
+#endif /* LIGHTNING_PLUGINS_BKPR_SQL_H */

wallet/account_migration.c

@@ -9,6 +9,7 @@
 #include <db/utils.h>
 #include <lightningd/coin_mvts.h>
 #include <lightningd/lightningd.h>
+#include <unistd.h>
 #include <wallet/account_migration.h>
 #include <wallet/wallet.h>