lightningd: don't hand redundant block_height to block notifications.

rustyrussell · rustyrussell · commit 167767d683f0 · 2025-05-15T16:40:33.000+09:30
They can all call get_block_height(); the extra argument confused me and
I thought they were called before the block height was actually updated.

Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
diff --git a/lightningd/chaintopology.c b/lightningd/chaintopology.c
@@ -822,7 +822,7 @@ static void updates_complete(struct chain_topology *topo)
 {
 	if (!bitcoin_blkid_eq(&topo->tip->blkid, &topo->prev_tip)) {
 		/* Tell lightningd about new block. */
-		notify_new_block(topo->bitcoind->ld, topo->tip->height);
+		notify_new_block(topo->bitcoind->ld);
 
 		/* Tell watch code to re-evaluate all txs. */
 		watch_topology_changed(topo);
@@ -838,7 +838,7 @@ static void updates_complete(struct chain_topology *topo)
 
 		/* Send out an account balance snapshot */
 		if (!first_update_complete) {
-			send_account_balance_snapshot(topo->ld, topo->tip->height);
+			send_account_balance_snapshot(topo->ld);
 			first_update_complete = true;
 		}
 	}
diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c
@@ -117,9 +117,9 @@ static void try_update_feerates(struct lightningd *ld, struct channel *channel)
 }
 
 static void try_update_blockheight(struct lightningd *ld,
-				   struct channel *channel,
-				   u32 blockheight)
+				   struct channel *channel)
 {
+	u32 blockheight = get_block_height(ld->topology);
 	u8 *msg;
 
 	/* We don't update the blockheight for non-leased chans */
@@ -1030,7 +1030,7 @@ void lockin_has_completed(struct channel *channel, bool record_push)
 	 * so update now. */
 	try_update_feerates(ld, channel);
 
-	try_update_blockheight(ld, channel, get_block_height(ld->topology));
+	try_update_blockheight(ld, channel);
 
 	/* Emit an event for the channel open (or channel proposal if blockheight
 	 * is zero) */
@@ -1899,8 +1899,7 @@ bool peer_start_channeld(struct channel *channel,
 	 * might not be what we expect: adjust now. */
 	if (channel->opener == LOCAL) {
 		try_update_feerates(ld, channel);
-		try_update_blockheight(ld, channel,
-				       get_block_height(ld->topology));
+		try_update_blockheight(ld, channel);
 	}
 
 	/* "Reestablished" if we've just opened. */
@@ -1946,9 +1945,9 @@ void channeld_tell_depth(struct channel *channel,
  * If so, we should forget the channel. */
 static bool
 is_fundee_should_forget(struct lightningd *ld,
-			struct channel *channel,
-			u32 block_height)
+			struct channel *channel)
 {
+	u32 block_height = get_block_height(ld->topology);
 	/* 2016 by default */
 	u32 max_funding_unconfirmed = ld->dev_max_funding_unconfirmed;
 
@@ -1992,8 +1991,7 @@ static int cmp_channel_start(struct channel *const *a, struct channel *const *b,
 }
 
 /* Notify all channels of new blocks. */
-void channel_notify_new_block(struct lightningd *ld,
-			      u32 block_height)
+void channel_notify_new_block(struct lightningd *ld)
 {
 	struct peer *peer;
 	struct channel *channel;
@@ -2024,12 +2022,12 @@ void channel_notify_new_block(struct lightningd *ld,
 		list_for_each(&peer->channels, channel, list) {
 			if (channel_state_uncommitted(channel->state))
 				continue;
-			if (is_fundee_should_forget(ld, channel, block_height))
+			if (is_fundee_should_forget(ld, channel))
 				tal_arr_expand(&to_forget, channel);
 
 			/* Let channels know about new blocks,
 			 * required for lease updates */
-			try_update_blockheight(ld, channel, block_height);
+			try_update_blockheight(ld, channel);
 		}
 	}
 
@@ -2055,7 +2053,7 @@ void channel_notify_new_block(struct lightningd *ld,
 			    "confirmed. "
 			    "We are fundee and can forget channel without "
 			    "loss of funds.",
-			    block_height - channel->first_blocknum,
+			    get_block_height(ld->topology) - channel->first_blocknum,
 			    fmt_bitcoin_txid(tmpctx, &channel->funding.txid));
 		/* FIXME: Send an error packet for this case! */
 		/* And forget it. COMPLETELY. */
diff --git a/lightningd/channel_control.h b/lightningd/channel_control.h
@@ -22,8 +22,7 @@ void channeld_tell_depth(struct channel *channel,
 			 u32 depth);
 
 /* Notify channels of new blocks. */
-void channel_notify_new_block(struct lightningd *ld,
-			      u32 block_height);
+void channel_notify_new_block(struct lightningd *ld);
 
 /* Cancel the channel after `fundchannel_complete` succeeds
  * but before funding broadcasts. */
diff --git a/lightningd/channel_gossip.c b/lightningd/channel_gossip.c
@@ -755,8 +755,7 @@ void channel_gossip_scid_changed(struct channel *channel)
 
 /* Block height changed */
 static void new_blockheight(struct lightningd *ld,
-			    struct channel *channel,
-			    u32 block_height)
+			    struct channel *channel)
 {
 	switch (channel->channel_gossip->state) {
 	case CGOSSIP_PRIVATE:
@@ -765,7 +764,7 @@ static void new_blockheight(struct lightningd *ld,
 	case CGOSSIP_NOT_USABLE:
 		return;
 	case CGOSSIP_NOT_DEEP_ENOUGH:
-		if (!channel_announceable(channel, block_height)) {
+		if (!channel_announceable(channel, get_block_height(ld->topology))) {
 			check_channel_gossip(channel);
 			return;
 		}
@@ -776,8 +775,7 @@ static void new_blockheight(struct lightningd *ld,
 	fatal("Bad channel_gossip_state %u", channel->channel_gossip->state);
 }
 
-void channel_gossip_notify_new_block(struct lightningd *ld,
-				     u32 block_height)
+void channel_gossip_notify_new_block(struct lightningd *ld)
 {
 	struct peer *peer;
 	struct channel *channel;
@@ -791,7 +789,7 @@ void channel_gossip_notify_new_block(struct lightningd *ld,
 			if (!channel->channel_gossip)
 				continue;
 
-			new_blockheight(ld, channel, block_height);
+			new_blockheight(ld, channel);
 			check_channel_gossip(channel);
 		}
 	}
diff --git a/lightningd/channel_gossip.h b/lightningd/channel_gossip.h
@@ -23,8 +23,7 @@ void channel_gossip_update(struct channel *channel);
 void channel_gossip_scid_changed(struct channel *channel);
 
 /* Block height changed */
-void channel_gossip_notify_new_block(struct lightningd *ld,
-				     u32 block_height);
+void channel_gossip_notify_new_block(struct lightningd *ld);
 
 /* Got announcement_signatures from peer */
 void channel_gossip_got_announcement_sigs(struct channel *channel,
diff --git a/lightningd/coin_mvts.c b/lightningd/coin_mvts.c
@@ -103,7 +103,7 @@ static bool report_chan_balance(const struct channel *chan)
 	abort();
 }
 
-void send_account_balance_snapshot(struct lightningd *ld, u32 blockheight)
+void send_account_balance_snapshot(struct lightningd *ld)
 {
 	struct balance_snapshot *snap = tal(NULL, struct balance_snapshot);
 	struct account_balance *bal;
@@ -112,7 +112,7 @@ void send_account_balance_snapshot(struct lightningd *ld, u32 blockheight)
 	struct peer *p;
 	struct peer_node_id_map_iter it;
 
-	snap->blockheight = blockheight;
+	snap->blockheight = get_block_height(ld->topology);
 	snap->timestamp = time_now().ts.tv_sec;
 	snap->node_id = &ld->our_nodeid;
 
diff --git a/lightningd/coin_mvts.h b/lightningd/coin_mvts.h
@@ -36,5 +36,5 @@ struct channel_coin_mvt *new_channel_mvt_routed_hout(const tal_t *ctx,
 						     struct htlc_out *hout,
 						     struct channel *channel);
 
-void send_account_balance_snapshot(struct lightningd *ld, u32 blockheight);
+void send_account_balance_snapshot(struct lightningd *ld);
 #endif /* LIGHTNING_LIGHTNINGD_COIN_MVTS_H */
diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c
@@ -254,8 +254,10 @@ static void gossipd_new_blockheight_reply(struct subd *gossipd,
 			     gossipd->ld->gossip_blockheight);
 }
 
-void gossip_notify_new_block(struct lightningd *ld, u32 blockheight)
+void gossip_notify_new_block(struct lightningd *ld)
 {
+	u32 blockheight = get_block_height(ld->topology);
+
 	/* Only notify gossipd once we're synced. */
 	if (!topology_synced(ld->topology))
 		return;
@@ -268,7 +270,7 @@ void gossip_notify_new_block(struct lightningd *ld, u32 blockheight)
 static void gossip_topology_synced(struct chain_topology *topo, void *unused)
 {
 	/* Now we start telling gossipd about blocks. */
-	gossip_notify_new_block(topo->ld, get_block_height(topo));
+	gossip_notify_new_block(topo->ld);
 }
 
 /* We make sure gossipd is started before plugins (which may want gossip_map) */
diff --git a/lightningd/gossip_control.h b/lightningd/gossip_control.h
@@ -14,6 +14,6 @@ void gossipd_notify_spends(struct lightningd *ld,
 			   u32 blockheight,
 			   const struct short_channel_id *scids);
 
-void gossip_notify_new_block(struct lightningd *ld, u32 blockheight);
+void gossip_notify_new_block(struct lightningd *ld);
 
 #endif /* LIGHTNING_LIGHTNINGD_GOSSIP_CONTROL_H */
diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
@@ -775,14 +775,14 @@ static int io_poll_lightningd(struct pollfd *fds, nfds_t nfds, int timeout)
  * like this, and it's always better to have compile-time calls than runtime,
  * as it makes the code more explicit.  But pasting in direct calls is also an
  * abstraction violation, so we use this middleman function. */
-void notify_new_block(struct lightningd *ld, u32 block_height)
+void notify_new_block(struct lightningd *ld)
 {
 	/* Inform our subcomponents individually. */
-	htlcs_notify_new_block(ld, block_height);
-	channel_notify_new_block(ld, block_height);
-	channel_gossip_notify_new_block(ld, block_height);
-	gossip_notify_new_block(ld, block_height);
-	waitblockheight_notify_new_block(ld, block_height);
+	htlcs_notify_new_block(ld);
+	channel_notify_new_block(ld);
+	channel_gossip_notify_new_block(ld);
+	gossip_notify_new_block(ld);
+	waitblockheight_notify_new_block(ld);
 }
 
 static void on_sigint(int _ UNUSED)
diff --git a/lightningd/lightningd.h b/lightningd/lightningd.h
@@ -443,7 +443,7 @@ const char *subdaemon_path(const tal_t *ctx, const struct lightningd *ld, const
 void test_subdaemons(const struct lightningd *ld);
 
 /* Notify lightningd about new blocks. */
-void notify_new_block(struct lightningd *ld, u32 block_height);
+void notify_new_block(struct lightningd *ld);
 
 /* Signal a clean exit from lightningd.
  * NOTE! This function **returns**.
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
@@ -2979,9 +2979,9 @@ timeout_waitblockheight_waiter(struct waitblockheight_waiter *w)
 				 "Timed out."));
 }
 /* Called by lightningd at each new block.  */
-void waitblockheight_notify_new_block(struct lightningd *ld,
-				      u32 block_height)
+void waitblockheight_notify_new_block(struct lightningd *ld)
 {
+	u32 block_height = get_block_height(ld->topology);
 	struct waitblockheight_waiter *w, *n;
 	char *to_delete = tal(NULL, char);
 
@@ -2996,8 +2996,7 @@ void waitblockheight_notify_new_block(struct lightningd *ld,
 		list_del(&w->list);
 		w->removed = true;
 		tal_steal(to_delete, w);
-		was_pending(waitblockheight_complete(w->cmd,
-						     block_height));
+		was_pending(waitblockheight_complete(w->cmd, block_height));
 	}
 	tal_free(to_delete);
 }
diff --git a/lightningd/peer_control.h b/lightningd/peer_control.h
@@ -155,8 +155,7 @@ struct leak_detect;
 void peer_dev_memleak(struct lightningd *ld, struct leak_detect *leaks);
 
 /* Triggered at each new block.  */
-void waitblockheight_notify_new_block(struct lightningd *ld,
-				      u32 block_height);
+void waitblockheight_notify_new_block(struct lightningd *ld);
 
 
 /* JSON parameter by channel_id or scid (caller must check state!) */
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
@@ -2786,9 +2786,10 @@ static void consider_failing_incoming(struct lightningd *ld,
 	local_fail_in_htlc(hout->in, take(towire_permanent_channel_failure(NULL)));
 }
 
-void htlcs_notify_new_block(struct lightningd *ld, u32 height)
+void htlcs_notify_new_block(struct lightningd *ld)
 {
 	bool removed;
+	u32 height = get_block_height(ld->topology);
 
 	/* BOLT #2:
 	 *
diff --git a/lightningd/peer_htlcs.h b/lightningd/peer_htlcs.h
@@ -46,7 +46,7 @@ void onchain_failed_our_htlc(const struct channel *channel,
 void onchain_fulfilled_htlc(struct channel *channel,
 			    const struct preimage *preimage);
 
-void htlcs_notify_new_block(struct lightningd *ld, u32 height);
+void htlcs_notify_new_block(struct lightningd *ld);
 
 /* Only defined if COMPAT_V061 */
 void fixup_htlcs_out(struct lightningd *ld);
diff --git a/lightningd/test/run-find_my_abspath.c b/lightningd/test/run-find_my_abspath.c
@@ -11,12 +11,10 @@ int unused_main(int argc, char *argv[]);
 void begin_topology(struct chain_topology *topo UNNEEDED)
 { fprintf(stderr, "begin_topology called!\n"); abort(); }
 /* Generated stub for channel_gossip_notify_new_block */
-void channel_gossip_notify_new_block(struct lightningd *ld UNNEEDED,
-				     u32 block_height UNNEEDED)
+void channel_gossip_notify_new_block(struct lightningd *ld UNNEEDED)
 { fprintf(stderr, "channel_gossip_notify_new_block called!\n"); abort(); }
 /* Generated stub for channel_notify_new_block */
-void channel_notify_new_block(struct lightningd *ld UNNEEDED,
-			      u32 block_height UNNEEDED)
+void channel_notify_new_block(struct lightningd *ld UNNEEDED)
 { fprintf(stderr, "channel_notify_new_block called!\n"); abort(); }
 /* Generated stub for connectd_activate */
 void connectd_activate(struct lightningd *ld UNNEEDED)
@@ -112,7 +110,7 @@ bool fromwire_status_version(const tal_t *ctx UNNEEDED, const void *p UNNEEDED,
 void gossip_init(struct lightningd *ld UNNEEDED, int connectd_fd UNNEEDED)
 { fprintf(stderr, "gossip_init called!\n"); abort(); }
 /* Generated stub for gossip_notify_new_block */
-void gossip_notify_new_block(struct lightningd *ld UNNEEDED, u32 blockheight UNNEEDED)
+void gossip_notify_new_block(struct lightningd *ld UNNEEDED)
 { fprintf(stderr, "gossip_notify_new_block called!\n"); abort(); }
 /* Generated stub for handle_early_opts */
 void handle_early_opts(struct lightningd *ld UNNEEDED, int argc UNNEEDED, char *argv[])
@@ -130,7 +128,7 @@ size_t hash_htlc_key(const struct htlc_key *htlc_key UNNEEDED)
 struct ext_key *hsm_init(struct lightningd *ld UNNEEDED)
 { fprintf(stderr, "hsm_init called!\n"); abort(); }
 /* Generated stub for htlcs_notify_new_block */
-void htlcs_notify_new_block(struct lightningd *ld UNNEEDED, u32 height UNNEEDED)
+void htlcs_notify_new_block(struct lightningd *ld UNNEEDED)
 { fprintf(stderr, "htlcs_notify_new_block called!\n"); abort(); }
 /* Generated stub for htlcs_resubmit */
 void htlcs_resubmit(struct lightningd *ld UNNEEDED,
@@ -283,8 +281,7 @@ struct txfilter *txfilter_new(const tal_t *ctx UNNEEDED)
 const char *version(void)
 { fprintf(stderr, "version called!\n"); abort(); }
 /* Generated stub for waitblockheight_notify_new_block */
-void waitblockheight_notify_new_block(struct lightningd *ld UNNEEDED,
-				      u32 block_height UNNEEDED)
+void waitblockheight_notify_new_block(struct lightningd *ld UNNEEDED)
 { fprintf(stderr, "waitblockheight_notify_new_block called!\n"); abort(); }
 /* Generated stub for wallet_begin_old_close_rescan */
 void wallet_begin_old_close_rescan(struct lightningd *ld UNNEEDED)

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ static void updates_complete(struct chain_topology *topo)`
`822`	`822`	`{`
`823`	`823`	`if (!bitcoin_blkid_eq(&topo->tip->blkid, &topo->prev_tip)) {`
`824`	`824`	`/* Tell lightningd about new block. */`
`825`		`- notify_new_block(topo->bitcoind->ld, topo->tip->height);`
	`825`	`+ notify_new_block(topo->bitcoind->ld);`
`826`	`826`
`827`	`827`	`/* Tell watch code to re-evaluate all txs. */`
`828`	`828`	`watch_topology_changed(topo);`
`@@ -838,7 +838,7 @@ static void updates_complete(struct chain_topology *topo)`
`838`	`838`
`839`	`839`	`/* Send out an account balance snapshot */`
`840`	`840`	`if (!first_update_complete) {`
`841`		`- send_account_balance_snapshot(topo->ld, topo->tip->height);`
	`841`	`+ send_account_balance_snapshot(topo->ld);`
`842`	`842`	`first_update_complete = true;`
`843`	`843`	`}`
`844`	`844`	`}`
Original file line number	Diff line number	Diff line change
`@@ -755,8 +755,7 @@ void channel_gossip_scid_changed(struct channel *channel)`
`755`	`755`
`756`	`756`	`/* Block height changed */`
`757`	`757`	`static void new_blockheight(struct lightningd *ld,`
`758`		`- struct channel *channel,`
`759`		`- u32 block_height)`
	`758`	`+ struct channel *channel)`
`760`	`759`	`{`
`761`	`760`	`switch (channel->channel_gossip->state) {`
`762`	`761`	`case CGOSSIP_PRIVATE:`
`@@ -765,7 +764,7 @@ static void new_blockheight(struct lightningd *ld,`
`765`	`764`	`case CGOSSIP_NOT_USABLE:`
`766`	`765`	`return;`
`767`	`766`	`case CGOSSIP_NOT_DEEP_ENOUGH:`
`768`		`- if (!channel_announceable(channel, block_height)) {`
	`767`	`+ if (!channel_announceable(channel, get_block_height(ld->topology))) {`
`769`	`768`	`check_channel_gossip(channel);`
`770`	`769`	`return;`
`771`	`770`	`}`
`@@ -776,8 +775,7 @@ static void new_blockheight(struct lightningd *ld,`
`776`	`775`	`fatal("Bad channel_gossip_state %u", channel->channel_gossip->state);`
`777`	`776`	`}`
`778`	`777`
`779`		`-void channel_gossip_notify_new_block(struct lightningd *ld,`
`780`		`- u32 block_height)`
	`778`	`+void channel_gossip_notify_new_block(struct lightningd *ld)`
`781`	`779`	`{`
`782`	`780`	`struct peer *peer;`
`783`	`781`	`struct channel *channel;`
`@@ -791,7 +789,7 @@ void channel_gossip_notify_new_block(struct lightningd *ld,`
`791`	`789`	`if (!channel->channel_gossip)`
`792`	`790`	`continue;`
`793`	`791`
`794`		`- new_blockheight(ld, channel, block_height);`
	`792`	`+ new_blockheight(ld, channel);`
`795`	`793`	`check_channel_gossip(channel);`
`796`	`794`	`}`
`797`	`795`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static bool report_chan_balance(const struct channel *chan)`
`103`	`103`	`abort();`
`104`	`104`	`}`
`105`	`105`
`106`		`-void send_account_balance_snapshot(struct lightningd *ld, u32 blockheight)`
	`106`	`+void send_account_balance_snapshot(struct lightningd *ld)`
`107`	`107`	`{`
`108`	`108`	`struct balance_snapshot *snap = tal(NULL, struct balance_snapshot);`
`109`	`109`	`struct account_balance *bal;`
`@@ -112,7 +112,7 @@ void send_account_balance_snapshot(struct lightningd *ld, u32 blockheight)`
`112`	`112`	`struct peer *p;`
`113`	`113`	`struct peer_node_id_map_iter it;`
`114`	`114`
`115`		`- snap->blockheight = blockheight;`
	`115`	`+ snap->blockheight = get_block_height(ld->topology);`
`116`	`116`	`snap->timestamp = time_now().ts.tv_sec;`
`117`	`117`	`snap->node_id = &ld->our_nodeid;`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,10 @@ static void gossipd_new_blockheight_reply(struct subd *gossipd,`
`254`	`254`	`gossipd->ld->gossip_blockheight);`
`255`	`255`	`}`
`256`	`256`
`257`		`-void gossip_notify_new_block(struct lightningd *ld, u32 blockheight)`
	`257`	`+void gossip_notify_new_block(struct lightningd *ld)`
`258`	`258`	`{`
	`259`	`+ u32 blockheight = get_block_height(ld->topology);`
	`260`	`+`
`259`	`261`	`/* Only notify gossipd once we're synced. */`
`260`	`262`	`if (!topology_synced(ld->topology))`
`261`	`263`	`return;`
`@@ -268,7 +270,7 @@ void gossip_notify_new_block(struct lightningd *ld, u32 blockheight)`
`268`	`270`	`static void gossip_topology_synced(struct chain_topology topo, void unused)`
`269`	`271`	`{`
`270`	`272`	`/* Now we start telling gossipd about blocks. */`
`271`		`- gossip_notify_new_block(topo->ld, get_block_height(topo));`
	`273`	`+ gossip_notify_new_block(topo->ld);`
`272`	`274`	`}`
`273`	`275`
`274`	`276`	`/* We make sure gossipd is started before plugins (which may want gossip_map) */`