Merge pull request #3147 from TheBlueMatt/2024-06-feerate-overflow

tnull · web-flow · commit b3223abbe150 · 2024-06-27T11:03:24.000-04:00
Handle feerates of `u32::MAX` without overflowing
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -2768,7 +2768,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 			feerate_per_kw = cmp::max(feerate_per_kw, feerate);
 		}
 		let feerate_plus_quarter = feerate_per_kw.checked_mul(1250).map(|v| v / 1000);
-		cmp::max(feerate_per_kw + 2530, feerate_plus_quarter.unwrap_or(u32::max_value()))
+		cmp::max(feerate_per_kw.saturating_add(2530), feerate_plus_quarter.unwrap_or(u32::MAX))
 	}
 
 	/// Get forwarding information for the counterparty.

Original file line number	Diff line number	Diff line change
`@@ -2768,7 +2768,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {`
`2768`	`2768`	`feerate_per_kw = cmp::max(feerate_per_kw, feerate);`
`2769`	`2769`	`}`
`2770`	`2770`	`let feerate_plus_quarter = feerate_per_kw.checked_mul(1250).map(\|v\| v / 1000);`
`2771`		`- cmp::max(feerate_per_kw + 2530, feerate_plus_quarter.unwrap_or(u32::max_value()))`
	`2771`	`+ cmp::max(feerate_per_kw.saturating_add(2530), feerate_plus_quarter.unwrap_or(u32::MAX))`
`2772`	`2772`	`}`
`2773`	`2773`
`2774`	`2774`	`/// Get forwarding information for the counterparty.`