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

rustyrussell · rustyrussell · commit ff7ded7a5fb3 · 2025-03-18T14:35:13.000+10: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
@@ -824,7 +824,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);
@@ -840,7 +840,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
@@ -114,9 +114,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 */
@@ -1005,7 +1005,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) */
@@ -1878,8 +1878,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. */
@@ -1925,9 +1924,10 @@ 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);
+
 	/* BOLT #2:
 	 *
 	 * A non-funding node (fundee):
@@ -1967,9 +1967,9 @@ is_fundee_should_forget(struct lightningd *ld,
 }
 
 /* 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)
 {
+	u32 block_height = get_block_height(ld->topology);
 	struct peer *peer;
 	struct channel *channel;
 	struct channel **to_forget = tal_arr(NULL, struct channel *, 0);
@@ -1983,13 +1983,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);
 			} else
 				/* Let channels know about new blocks,
 				 * required for lease updates */
-				try_update_blockheight(ld, channel,
-						       block_height);
+				try_update_blockheight(ld, channel);
 		}
 	}
 
diff --git a/lightningd/channel_control.h b/lightningd/channel_control.h
@@ -23,8 +23,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
@@ -752,8 +752,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:
@@ -762,7 +761,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;
 		}
@@ -773,8 +772,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;
@@ -788,7 +786,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
@@ -255,8 +255,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;
@@ -269,7 +271,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
@@ -768,14 +768,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
@@ -439,7 +439,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
@@ -2912,9 +2912,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);
 
@@ -2929,8 +2929,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
@@ -154,8 +154,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
@@ -2791,9 +2791,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[])
@@ -127,7 +125,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_new */
 struct wallet *wallet_new(struct lightningd *ld UNNEEDED, struct timers *timers UNNEEDED)
diff --git a/lightningd/test/run-invoice-select-inchan.c b/lightningd/test/run-invoice-select-inchan.c
@@ -907,10 +907,6 @@ bool peer_start_channeld(struct channel *channel UNNEEDED,
 			 bool reconnected UNNEEDED,
 			 bool reestablish_only UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
-/* Generated stub for peer_start_closingd */
-void peer_start_closingd(struct channel *channel UNNEEDED,
-			 struct peer_fd *peer_fd UNNEEDED)
-{ fprintf(stderr, "peer_start_closingd called!\n"); abort(); }
 /* Generated stub for peer_start_dualopend */
 bool peer_start_dualopend(struct peer *peer UNNEEDED, struct peer_fd *peer_fd UNNEEDED,
 			  struct channel *channel UNNEEDED)
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
@@ -929,10 +929,6 @@ bool peer_start_channeld(struct channel *channel UNNEEDED,
 			 bool reconnected UNNEEDED,
 			 bool reestablish_only UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
-/* Generated stub for peer_start_closingd */
-void peer_start_closingd(struct channel *channel UNNEEDED,
-			 struct peer_fd *peer_fd UNNEEDED)
-{ fprintf(stderr, "peer_start_closingd called!\n"); abort(); }
 /* Generated stub for peer_start_dualopend */
 bool peer_start_dualopend(struct peer *peer UNNEEDED, struct peer_fd *peer_fd UNNEEDED,
 			  struct channel *channel UNNEEDED)

Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,7 @@ static void updates_complete(struct chain_topology *topo)`
`824`	`824`	`{`
`825`	`825`	`if (!bitcoin_blkid_eq(&topo->tip->blkid, &topo->prev_tip)) {`
`826`	`826`	`/* Tell lightningd about new block. */`
`827`		`- notify_new_block(topo->bitcoind->ld, topo->tip->height);`
	`827`	`+ notify_new_block(topo->bitcoind->ld);`
`828`	`828`
`829`	`829`	`/* Tell watch code to re-evaluate all txs. */`
`830`	`830`	`watch_topology_changed(topo);`
`@@ -840,7 +840,7 @@ static void updates_complete(struct chain_topology *topo)`
`840`	`840`
`841`	`841`	`/* Send out an account balance snapshot */`
`842`	`842`	`if (!first_update_complete) {`
`843`		`- send_account_balance_snapshot(topo->ld, topo->tip->height);`
	`843`	`+ send_account_balance_snapshot(topo->ld);`
`844`	`844`	`first_update_complete = true;`
`845`	`845`	`}`
`846`	`846`	`}`
Original file line number	Diff line number	Diff line change
`@@ -752,8 +752,7 @@ void channel_gossip_scid_changed(struct channel *channel)`
`752`	`752`
`753`	`753`	`/* Block height changed */`
`754`	`754`	`static void new_blockheight(struct lightningd *ld,`
`755`		`- struct channel *channel,`
`756`		`- u32 block_height)`
	`755`	`+ struct channel *channel)`
`757`	`756`	`{`
`758`	`757`	`switch (channel->channel_gossip->state) {`
`759`	`758`	`case CGOSSIP_PRIVATE:`
`@@ -762,7 +761,7 @@ static void new_blockheight(struct lightningd *ld,`
`762`	`761`	`case CGOSSIP_NOT_USABLE:`
`763`	`762`	`return;`
`764`	`763`	`case CGOSSIP_NOT_DEEP_ENOUGH:`
`765`		`- if (!channel_announceable(channel, block_height)) {`
	`764`	`+ if (!channel_announceable(channel, get_block_height(ld->topology))) {`
`766`	`765`	`check_channel_gossip(channel);`
`767`	`766`	`return;`
`768`	`767`	`}`
`@@ -773,8 +772,7 @@ static void new_blockheight(struct lightningd *ld,`
`773`	`772`	`fatal("Bad channel_gossip_state %u", channel->channel_gossip->state);`
`774`	`773`	`}`
`775`	`774`
`776`		`-void channel_gossip_notify_new_block(struct lightningd *ld,`
`777`		`- u32 block_height)`
	`775`	`+void channel_gossip_notify_new_block(struct lightningd *ld)`
`778`	`776`	`{`
`779`	`777`	`struct peer *peer;`
`780`	`778`	`struct channel *channel;`
`@@ -788,7 +786,7 @@ void channel_gossip_notify_new_block(struct lightningd *ld,`
`788`	`786`	`if (!channel->channel_gossip)`
`789`	`787`	`continue;`
`790`	`788`
`791`		`- new_blockheight(ld, channel, block_height);`
	`789`	`+ new_blockheight(ld, channel);`
`792`	`790`	`check_channel_gossip(channel);`
`793`	`791`	`}`
`794`	`792`	`}`
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
`@@ -255,8 +255,10 @@ static void gossipd_new_blockheight_reply(struct subd *gossipd,`
`255`	`255`	`gossipd->ld->gossip_blockheight);`
`256`	`256`	`}`
`257`	`257`
`258`		`-void gossip_notify_new_block(struct lightningd *ld, u32 blockheight)`
	`258`	`+void gossip_notify_new_block(struct lightningd *ld)`
`259`	`259`	`{`
	`260`	`+ u32 blockheight = get_block_height(ld->topology);`
	`261`	`+`
`260`	`262`	`/* Only notify gossipd once we're synced. */`
`261`	`263`	`if (!topology_synced(ld->topology))`
`262`	`264`	`return;`
`@@ -269,7 +271,7 @@ void gossip_notify_new_block(struct lightningd *ld, u32 blockheight)`
`269`	`271`	`static void gossip_topology_synced(struct chain_topology topo, void unused)`
`270`	`272`	`{`
`271`	`273`	`/* Now we start telling gossipd about blocks. */`
`272`		`- gossip_notify_new_block(topo->ld, get_block_height(topo));`
	`274`	`+ gossip_notify_new_block(topo->ld);`
`273`	`275`	`}`
`274`	`276`
`275`	`277`	`/* We make sure gossipd is started before plugins (which may want gossip_map) */`