Bwatch

bitcoin/block.c

@@ -228,16 +228,24 @@ void bitcoin_block_blkid(const struct bitcoin_block *b,
 	*out = b->hdr.hash;
 }
 
-static bool bitcoin_blkid_to_hex(const struct bitcoin_blkid *blockid,
-				 char *hexstr, size_t hexstr_len)
+bool bitcoin_blkid_from_hex(const char *hexstr, size_t hexstr_len,
+			   struct bitcoin_blkid *blkid)
 {
-	struct bitcoin_txid fake_txid;
-	fake_txid.shad = blockid->shad;
-	return bitcoin_txid_to_hex(&fake_txid, hexstr, hexstr_len);
+	if (!hex_decode(hexstr, hexstr_len, blkid, sizeof(*blkid)))
+		return false;
+	reverse_bytes(blkid->shad.sha.u.u8, sizeof(blkid->shad.sha.u.u8));
+	return true;
 }
 
-char *fmt_bitcoin_blkid(const tal_t *ctx,
-			const struct bitcoin_blkid *blkid)
+bool bitcoin_blkid_to_hex(const struct bitcoin_blkid *blkid,
+			 char *hexstr, size_t hexstr_len)
+{
+	struct sha256_double rev = blkid->shad;
+	reverse_bytes(rev.sha.u.u8, sizeof(rev.sha.u.u8));
+	return hex_encode(&rev, sizeof(rev), hexstr, hexstr_len);
+}
+
+char *fmt_bitcoin_blkid(const tal_t *ctx, const struct bitcoin_blkid *blkid)
 {
 	char *hexstr = tal_arr(ctx, char, hex_str_size(sizeof(*blkid)));
 

bitcoin/block.h

@@ -52,6 +52,11 @@ void fromwire_chainparams(const u8 **cursor, size_t *max,
 			  const struct chainparams **chainparams);
 void towire_chainparams(u8 **cursor, const struct chainparams *chainparams);
 
+bool bitcoin_blkid_from_hex(const char *hexstr, size_t hexstr_len,
+			    struct bitcoin_blkid *blkid);
+bool bitcoin_blkid_to_hex(const struct bitcoin_blkid *blkid,
+			  char *hexstr, size_t hexstr_len);
+
 char *fmt_bitcoin_blkid(const tal_t *ctx,
 			const struct bitcoin_blkid *blkid);
 

bitcoin/test/run-bitcoin_block_from_hex.c

@@ -62,15 +62,6 @@ static const char block[] =
 
 STRUCTEQ_DEF(sha256_double, 0, sha);
 
-static bool bitcoin_blkid_from_hex(const char *hexstr, size_t hexstr_len,
-				   struct bitcoin_blkid *blockid)
-{
-	struct bitcoin_txid fake_txid;
-	if (!bitcoin_txid_from_hex(hexstr, hexstr_len, &fake_txid))
-		return false;
-	blockid->shad = fake_txid.shad;
-	return true;
-}
 int main(int argc, const char *argv[])
 {
 	struct bitcoin_blkid prev;

common/json_param.c

@@ -478,6 +478,22 @@ struct command_result *param_string_or_array(struct command *cmd, const char *na
 	return param_string(cmd, name, buffer, tok, &(*result)->str);
 }
 
+struct command_result *param_string_array(struct command *cmd, const char *name,
+					  const char *buffer, const jsmntok_t *tok,
+					  const char ***arr)
+{
+	size_t i;
+	const jsmntok_t *s;
+
+	if (tok->type != JSMN_ARRAY)
+		return command_fail_badparam(cmd, name, buffer, tok,
+					     "should be an array");
+	*arr = tal_arr(cmd, const char *, tok->size);
+	json_for_each_arr(i, s, tok)
+		(*arr)[i] = json_strdup(*arr, buffer, s);
+	return NULL;
+}
+
 struct command_result *param_invstring(struct command *cmd, const char *name,
 				       const char * buffer, const jsmntok_t *tok,
 				       const char **str)

common/json_param.h

@@ -206,6 +206,11 @@ struct command_result *param_string_or_array(struct command *cmd, const char *na
 					     const char * buffer, const jsmntok_t *tok,
 					     struct str_or_arr **result);
 
+/* Array of strings */
+struct command_result *param_string_array(struct command *cmd, const char *name,
+					  const char *buffer, const jsmntok_t *tok,
+					  const char ***arr);
+
 /* Extract an invoice string from a generic string, strip the `lightning:`
  * prefix from it if needed. */
 struct command_result *param_invstring(struct command *cmd, const char *name,

common/json_parse.c

@@ -601,6 +601,13 @@ bool json_to_txid(const char *buffer, const jsmntok_t *tok,
 				     tok->end - tok->start, txid);
 }
 
+bool json_to_bitcoin_blkid(const char *buffer, const jsmntok_t *tok,
+			   struct bitcoin_blkid *blkid)
+{
+	return bitcoin_blkid_from_hex(buffer + tok->start,
+				      tok->end - tok->start, blkid);
+}
+
 bool json_to_outpoint(const char *buffer, const jsmntok_t *tok,
 		      struct bitcoin_outpoint *op)
 {

common/json_parse.h

@@ -108,6 +108,10 @@ bool json_to_msat(const char *buffer, const jsmntok_t *tok,
 bool json_to_txid(const char *buffer, const jsmntok_t *tok,
 		  struct bitcoin_txid *txid);
 
+/* Extract a bitcoin blkid from this */
+bool json_to_bitcoin_blkid(const char *buffer, const jsmntok_t *tok,
+			   struct bitcoin_blkid *blkid);
+
 /* Extract a bitcoin outpoint from this */
 bool json_to_outpoint(const char *buffer, const jsmntok_t *tok,
 		      struct bitcoin_outpoint *op);

common/json_parse_simple.c

@@ -2,6 +2,7 @@
 #include "config.h"
 #include <assert.h>
 #include <ccan/mem/mem.h>
+#include <ccan/str/hex/hex.h>
 #include <ccan/tal/str/str.h>
 #include <common/json_parse_simple.h>
 #include <common/utils.h>
@@ -151,6 +152,18 @@ bool json_to_bool(const char *buffer, const jsmntok_t *tok, bool *b)
 	return false;
 }
 
+bool json_hex_to_be32(const char *buffer, const jsmntok_t *tok, be32 *val)
+{
+	return hex_decode(buffer + tok->start, tok->end - tok->start,
+			  val, sizeof(*val));
+}
+
+bool json_hex_to_be64(const char *buffer, const jsmntok_t *tok, be64 *val)
+{
+	return hex_decode(buffer + tok->start, tok->end - tok->start,
+			  val, sizeof(*val));
+}
+
 
 bool json_tok_is_num(const char *buffer, const jsmntok_t *tok)
 {

common/json_parse_simple.h

@@ -2,6 +2,7 @@
 #ifndef LIGHTNING_COMMON_JSON_PARSE_SIMPLE_H
 #define LIGHTNING_COMMON_JSON_PARSE_SIMPLE_H
 #include "config.h"
+#include <ccan/endian/endian.h>
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
 
@@ -51,6 +52,12 @@ bool json_to_double(const char *buffer, const jsmntok_t *tok, double *num);
 /* Extract boolean from this */
 bool json_to_bool(const char *buffer, const jsmntok_t *tok, bool *b);
 
+/* Extract big-endian 32-bit from hex string (for datastore) */
+bool json_hex_to_be32(const char *buffer, const jsmntok_t *tok, be32 *val);
+
+/* Extract big-endian 64-bit from hex string (for datastore) */
+bool json_hex_to_be64(const char *buffer, const jsmntok_t *tok, be64 *val);
+
 /* Is this a number? [0..9]+ */
 bool json_tok_is_num(const char *buffer, const jsmntok_t *tok);
 

common/json_stream.c

@@ -193,13 +193,22 @@ void json_add_primitive(struct json_stream *js,
 	tal_free_if_taken(val);
 }
 
+void json_add_stringn(struct json_stream *js,
+		      const char *fieldname,
+		      const char *str TAKES,
+		      size_t len)
+{
+	if (json_filter_ok(js->filter, fieldname))
+		json_out_addstrn(js->jout, fieldname, str, len);
+	if (taken(str))
+		tal_free(str);
+}
+
 void json_add_string(struct json_stream *js,
 		     const char *fieldname,
 		     const char *str TAKES)
 {
-	if (json_filter_ok(js->filter, fieldname))
-		json_out_addstr(js->jout, fieldname, str);
-	tal_free_if_taken(str);
+	json_add_stringn(js, fieldname, str, strlen(str));
 }
 
 static char *json_member_direct(struct json_stream *js,
@@ -298,13 +307,6 @@ void json_add_s32(struct json_stream *result, const char *fieldname,
 	json_add_primitive_fmt(result, fieldname, "%d", value);
 }
 
-void json_add_stringn(struct json_stream *result, const char *fieldname,
-		      const char *value TAKES, size_t value_len)
-{
-	json_add_str_fmt(result, fieldname, "%.*s", (int)value_len, value);
-	tal_free_if_taken(value);
-}
-
 void json_add_bool(struct json_stream *result, const char *fieldname, bool value)
 {
 	json_add_primitive(result, fieldname, value ? "true" : "false");
@@ -455,6 +457,15 @@ void json_add_txid(struct json_stream *result, const char *fieldname,
 	json_add_string(result, fieldname, hex);
 }
 
+void json_add_bitcoin_blkid(struct json_stream *result, const char *fieldname,
+			    const struct bitcoin_blkid *blkid)
+{
+	char hex[hex_str_size(sizeof(*blkid))];
+
+	bitcoin_blkid_to_hex(blkid, hex, sizeof(hex));
+	json_add_string(result, fieldname, hex);
+}
+
 void json_add_outpoint(struct json_stream *result, const char *fieldname,
 		       const struct bitcoin_outpoint *out)
 {

common/json_stream.h

@@ -31,6 +31,7 @@ struct short_channel_id;
 struct sha256;
 struct preimage;
 struct bitcoin_tx;
+struct bitcoin_blkid;
 struct wally_psbt;
 struct lease_rates;
 struct wireaddr;
@@ -310,6 +311,10 @@ void json_add_channel_id(struct json_stream *response,
 void json_add_txid(struct json_stream *result, const char *fieldname,
 		   const struct bitcoin_txid *txid);
 
+/* '"fieldname" : <hexrev>' or "<hexrev>" if fieldname is NULL */
+void json_add_bitcoin_blkid(struct json_stream *result, const char *fieldname,
+			    const struct bitcoin_blkid *blkid);
+
 /* '"fieldname" : "txid:n" */
 void json_add_outpoint(struct json_stream *result, const char *fieldname,
 		       const struct bitcoin_outpoint *out);

contrib/pyln-testing/pyln/testing/utils.py

@@ -771,6 +771,7 @@ def __init__(
 
         self.opts['dev-fast-gossip'] = None
         self.opts['dev-bitcoind-poll'] = 1
+        self.opts['bwatch-poll-interval'] = 500  # 0.5s for fast test feedback
         self.prefix = 'lightningd-%d' % (node_id)
         # Log to stdout so we see it in failure cases, and log file for TailableProc.
         self.opts['log-file'] = ['-', os.path.join(lightning_dir, "log")]

db/exec.c

@@ -89,6 +89,39 @@ s64 db_get_intvar(struct db *db, const char *varname, s64 defval)
 	return res;
 }
 
+void db_set_blobvar(struct db *db, const char *varname, const u8 *val, size_t len)
+{
+	size_t changes;
+	struct db_stmt *stmt = db_prepare_v2(db, SQL("UPDATE vars SET blobval=? WHERE name=?;"));
+	db_bind_blob(stmt, val, len);
+	db_bind_text(stmt, varname);
+	db_exec_prepared_v2(stmt);
+	changes = db_count_changes(stmt);
+	tal_free(stmt);
+
+	if (changes == 0) {
+		stmt = db_prepare_v2(db, SQL("INSERT INTO vars (name, blobval) VALUES (?, ?);"));
+		db_bind_text(stmt, varname);
+		db_bind_blob(stmt, val, len);
+		db_exec_prepared_v2(stmt);
+		tal_free(stmt);
+	}
+}
+
+const u8 *db_get_blobvar(const tal_t *ctx, struct db *db, const char *varname)
+{
+	struct db_stmt *stmt = db_prepare_v2(
+	    db, SQL("SELECT blobval FROM vars WHERE name=? LIMIT 1"));
+	db_bind_text(stmt, varname);
+
+	const u8 *res = NULL;
+	if (db_query_prepared_canfail(stmt) && db_step(stmt))
+		res = db_col_arr(ctx, stmt, "blobval", u8);
+
+	tal_free(stmt);
+	return res;
+}
+
 /* Leak tracking. */
 
 /* By making the update conditional on the current value we expect we

db/exec.h

@@ -4,6 +4,7 @@
 
 #include <ccan/short_types/short_types.h>
 #include <ccan/take/take.h>
+#include <ccan/tal/tal.h>
 
 struct db;
 
@@ -23,6 +24,10 @@ void db_set_intvar(struct db *db, const char *varname, s64 val);
  */
 s64 db_get_intvar(struct db *db, const char *varname, s64 defval);
 
+void db_set_blobvar(struct db *db, const char *varname, const u8 *val, size_t len);
+/* Returns a tal-allocated blob, or NULL if not found. */
+const u8 *db_get_blobvar(const tal_t *ctx, struct db *db, const char *varname);
+
 /* Get the current data version (entries). */
 u32 db_data_version_get(struct db *db);
 

lightningd/Makefile

@@ -3,7 +3,9 @@
 LIGHTNINGD_SRC :=				\
 	lightningd/anchorspend.c		\
 	lightningd/bitcoind.c			\
+	lightningd/broadcast.c			\
 	lightningd/chaintopology.c		\
+	lightningd/watchman.c			\
 	lightningd/channel.c			\
 	lightningd/channel_control.c		\
 	lightningd/channel_gossip.c		\
@@ -43,8 +45,7 @@ LIGHTNINGD_SRC :=				\
 	lightningd/routehint.c			\
 	lightningd/runes.c			\
 	lightningd/subd.c			\
-	lightningd/wait.c			\
-	lightningd/watch.c
+	lightningd/wait.c
 
 LIGHTNINGD_SRC_NOHDR :=				\
 	lightningd/configs.c			\

lightningd/anchorspend.c

@@ -240,7 +240,7 @@ static struct wally_psbt *anchor_psbt(const tal_t *ctx,
 
 	/* PSBT knows how to spend utxos. */
 	psbt = psbt_using_utxos(ctx, ld->wallet, utxos,
-				default_locktime(ld->topology),
+				default_locktime(ld),
 				BITCOIN_TX_RBF_SEQUENCE, NULL);
 
 	/* BOLT #3:
@@ -379,7 +379,7 @@ static struct bitcoin_tx *spend_anchor(const tal_t *ctx,
 		if (!amount_msat_accumulate(&total_value, val->msat))
 			abort();
 
-		feerate_target = feerate_for_target(ld->topology, val->block);
+		feerate_target = feerate_for_target(ld, val->block);
 
 		/* If the feerate for the commitment tx is already
 		 * sufficient, don't try for anchor. */
@@ -451,7 +451,7 @@ static struct bitcoin_tx *spend_anchor(const tal_t *ctx,
 		block_target = unimportant_deadline->block;
 		if (block_target < get_block_height(ld->topology) + 12)
 			block_target = get_block_height(ld->topology) + 12;
-		feerate_target = feerate_for_target(ld->topology, block_target);
+		feerate_target = feerate_for_target(ld, block_target);
 
 		/* If the feerate for the commitment tx is already
 		 * sufficient, don't try for anchor. */
@@ -602,7 +602,7 @@ static void create_and_broadcast_anchor(struct channel *channel,
 		 fmt_amount_sat(tmpctx, anch->anchor_spend_fee));
 
 	/* Send it! */
-	broadcast_tx(anch->adet, ld->topology, channel, take(newtx), NULL, true, 0, NULL,
+	broadcast_tx(anch->adet, ld, channel, take(newtx), NULL, true, 0, NULL,
 		     refresh_anchor_spend, anch);
 }
 

lightningd/bitcoind.h

@@ -7,7 +7,6 @@
 
 struct bitcoin_blkid;
 struct bitcoin_tx_output;
-struct block;
 struct feerate_est;
 struct lightningd;
 struct ripemd160;