Merge pull request #4590 from tnull/2026-05-fix-electrum-comparison

TheBlueMatt · web-flow · commit ccdfddd3bdd3 · 2026-05-05T19:43:55.000Z
Fix signed comparison in `ElectrumClient`
diff --git a/lightning-transaction-sync/src/electrum.rs b/lightning-transaction-sync/src/electrum.rs
@@ -329,11 +329,11 @@ impl<L: Logger> ElectrumSyncClient<L> {
 					let mut filtered_history =
 						script_history.iter().filter(|h| h.tx_hash == **txid);
 					if let Some(history) = filtered_history.next() {
-						let prob_conf_height = history.height as u32;
-						if prob_conf_height <= 0 {
+						if history.height <= 0 {
 							// Skip if it's a an unconfirmed entry.
 							continue;
 						}
+						let prob_conf_height = history.height as u32;
 						let confirmed_tx = self.get_confirmed_tx(tx, prob_conf_height)?;
 						confirmed_txs.push(confirmed_tx);
 					}

Original file line number	Diff line number	Diff line change
`@@ -329,11 +329,11 @@ impl<L: Logger> ElectrumSyncClient<L> {`
`329`	`329`	`let mut filtered_history =`
`330`	`330`	`script_history.iter().filter(\|h\| h.tx_hash == **txid);`
`331`	`331`	`if let Some(history) = filtered_history.next() {`
`332`		`- let prob_conf_height = history.height as u32;`
`333`		`- if prob_conf_height <= 0 {`
	`332`	`+ if history.height <= 0 {`
`334`	`333`	`// Skip if it's a an unconfirmed entry.`
`335`	`334`	`continue;`
`336`	`335`	`}`
	`336`	`+ let prob_conf_height = history.height as u32;`
`337`	`337`	`let confirmed_tx = self.get_confirmed_tx(tx, prob_conf_height)?;`
`338`	`338`	`confirmed_txs.push(confirmed_tx);`
`339`	`339`	`}`