fixup: cap aggregation of HTLCs in anchors_zero_fee_htlc_tx channels at max standard tx weight

Author: tankyleo

lightning/src/events/bump_transaction/mod.rs

@@ -875,9 +875,15 @@ where
 			// Cap the size of transactions claiming `HolderHTLCOutput` in 0FC channels.
 			// Otherwise, we could hit the max 10_000vB size limit on V3 transactions
 			// (BIP 431 rule 4).
-			chan_utils::TRUC_MAX_WEIGHT
+			chan_utils::MAX_TRUC_WEIGHT
 		} else {
-			u64::MAX
+			// We should never hit this because HTLC-timeout transactions have a signed
+			// locktime, HTLC-success transactions do not, and we never aggregate
+			// packages with a signed locktime with packages that do not have a signed
+			// locktime.
+			// Hence in the worst case, we aggregate 483 success HTLC transactions,
+			// and 483 * 705 ~= 341_000, and 341_000 < 400_000.
+			chan_utils::MAX_STANDARD_TX_WEIGHT
 		};
 		let mut broadcasted_htlcs = 0;
 		let mut batch_size = htlc_descriptors.len() - broadcasted_htlcs;

lightning/src/ln/chan_utils.rs

@@ -96,8 +96,11 @@ pub const P2A_ANCHOR_INPUT_WITNESS_WEIGHT: u64 = 1;
 /// The maximum value of a P2A anchor.
 pub const P2A_MAX_VALUE: u64 = 240;
 
-/// The maximum weight of a TRUC transaction.
-pub const TRUC_MAX_WEIGHT: u64 = 10_000 * WITNESS_SCALE_FACTOR as u64;
+/// The maximum weight of a TRUC transaction, see BIP431
+pub const MAX_TRUC_WEIGHT: u64 = 10_000 * WITNESS_SCALE_FACTOR as u64;
+
+/// The maximum weight of any standard transaction, see bitcoin/src/policy/policy.h
+pub const MAX_STANDARD_TX_WEIGHT: u64 = 400_000;
 
 /// The upper bound weight of an HTLC timeout input from a commitment transaction with keyed anchor outputs.
 pub const HTLC_TIMEOUT_INPUT_KEYED_ANCHOR_WITNESS_WEIGHT: u64 = 288;