lightningd: pass height back from getrawblockbyheight.

Several callers stash this, but we have it, so make it explicit:
here's the block you asked for.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

lightningd/bitcoind.c

@@ -455,7 +455,9 @@ void bitcoind_sendrawtx_(const tal_t *ctx,
 
 struct getrawblockbyheight_call {
 	struct bitcoind *bitcoind;
+	u32 height;
 	void (*cb)(struct bitcoind *bitcoind,
+		   u32 height,
 		   struct bitcoin_blkid *blkid,
 		   struct bitcoin_block *block,
 		   void *);
@@ -477,7 +479,7 @@ getrawblockbyheight_callback(const char *buf, const jsmntok_t *toks,
 	 * with NULL values. */
 	err = json_scan(tmpctx, buf, toks, "{result:{blockhash:null}}");
 	if (!err) {
-		call->cb(call->bitcoind, NULL, NULL, call->cb_arg);
+		call->cb(call->bitcoind, call->height, NULL, NULL, call->cb_arg);
 		goto clean;
 	}
 
@@ -496,7 +498,7 @@ getrawblockbyheight_callback(const char *buf, const jsmntok_t *toks,
 				     "getrawblockbyheight",
 				     "bad block");
 
-	call->cb(call->bitcoind, &blkid, blk, call->cb_arg);
+	call->cb(call->bitcoind, call->height, &blkid, blk, call->cb_arg);
 
 clean:
 	tal_free(call);
@@ -505,6 +507,7 @@ getrawblockbyheight_callback(const char *buf, const jsmntok_t *toks,
 void bitcoind_getrawblockbyheight_(struct bitcoind *bitcoind,
 				   u32 height,
 				   void (*cb)(struct bitcoind *bitcoind,
+					      u32 blockheight,
 					      struct bitcoin_blkid *blkid,
 					      struct bitcoin_block *blk,
 					      void *arg),
@@ -517,6 +520,7 @@ void bitcoind_getrawblockbyheight_(struct bitcoind *bitcoind,
 	call->bitcoind = bitcoind;
 	call->cb = cb;
 	call->cb_arg = cb_arg;
+	call->height = height;
 
 	trace_span_start("plugin/bitcoind", call);
 	trace_span_tag(call, "method", "getrawblockbyheight");
@@ -724,6 +728,7 @@ process_getfilteredblock_step2(struct bitcoind *bitcoind,
 }
 
 static void process_getfilteredblock_step1(struct bitcoind *bitcoind,
+					   u32 height,
 					   struct bitcoin_blkid *blkid,
 					   struct bitcoin_block *block,
 					   struct filteredblock_call *call)

lightningd/bitcoind.h

@@ -117,6 +117,7 @@ void bitcoind_getchaininfo_(struct bitcoind *bitcoind,
 void bitcoind_getrawblockbyheight_(struct bitcoind *bitcoind,
 				   u32 height,
 				   void (*cb)(struct bitcoind *bitcoind,
+					      u32 height,
 					      struct bitcoin_blkid *blkid,
 					      struct bitcoin_block *blk,
 					      void *arg),
@@ -126,6 +127,7 @@ void bitcoind_getrawblockbyheight_(struct bitcoind *bitcoind,
 				      typesafe_cb_preargs(void, void *,		\
 							  (cb), (arg),		\
 							  struct bitcoind *,	\
+							  u32,			\
 							  struct bitcoin_blkid *, \
 							  struct bitcoin_block *),\
 				      (arg))

lightningd/chaintopology.c

@@ -1055,6 +1055,7 @@ static void remove_tip(struct chain_topology *topo)
 }
 
 static void get_new_block(struct bitcoind *bitcoind,
+			  u32 height,
 			  struct bitcoin_blkid *blkid,
 			  struct bitcoin_block *blk,
 			  struct chain_topology *topo)
@@ -1075,7 +1076,7 @@ static void get_new_block(struct bitcoind *bitcoind,
 	if (!bitcoin_blkid_eq(&topo->tip->blkid, &blk->hdr.prev_hash))
 		remove_tip(topo);
 	else {
-		add_tip(topo, new_block(topo, blk, topo->tip->height + 1));
+		add_tip(topo, new_block(topo, blk, height));
 
 		/* tell plugins a new block was processed */
 		notify_block_added(topo->ld, topo->tip);
@@ -1097,6 +1098,7 @@ static void try_extend_tip(struct chain_topology *topo)
 }
 
 static void init_topo(struct bitcoind *bitcoind UNUSED,
+		      u32 height UNUSED,
 		      struct bitcoin_blkid *blkid UNUSED,
 		      struct bitcoin_block *blk,
 		      struct chain_topology *topo)