f - take into account the first confirmation

jkczyz · jkczyz · commit ef178be3f9ee · 2025-05-30T18:03:56.000-05:00
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -11717,7 +11717,7 @@ where
 						.zip(historical_scids.iter().skip(1).chain(core::iter::once(&current_scid)))
 					{
 						let funding_height = block_from_scid(*next_scid);
-						let retain_scid = funding_height + CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY > height;
+						let retain_scid = funding_height + CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY - 1 > height;
 						if !retain_scid {
 							short_to_chan_info.remove(scid);
 						}

Original file line number	Diff line number	Diff line change
`@@ -11717,7 +11717,7 @@ where`
`11717`	`11717`	`.zip(historical_scids.iter().skip(1).chain(core::iter::once(&current_scid)))`
`11718`	`11718`	`{`
`11719`	`11719`	`let funding_height = block_from_scid(*next_scid);`
`11720`		`- let retain_scid = funding_height + CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY > height;`
	`11720`	`+ let retain_scid = funding_height + CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY - 1 > height;`
`11721`	`11721`	`if !retain_scid {`
`11722`	`11722`	`short_to_chan_info.remove(scid);`
`11723`	`11723`	`}`