f read+ignore deprecated pending inbounds

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -1238,6 +1238,7 @@ pub(super) const FEERATE_TRACKING_BLOCKS: usize = 144;
 ///
 /// Note that this struct will be removed entirely soon, in favor of storing no inbound payment data
 /// and instead encoding it in the payment secret.
+#[derive(Debug)]
 struct PendingInboundPayment {
 	/// The payment secret that the sender must use for us to accept this payment
 	payment_secret: PaymentSecret,
@@ -12416,9 +12417,14 @@ where
 		let _last_node_announcement_serial: u32 = Readable::read(reader)?; // Only used < 0.0.111
 		let highest_seen_timestamp: u32 = Readable::read(reader)?;
 
-		// The last version where a pending inbound payment may have been written was 0.0.116.
+		// The last version where a pending inbound payment may have been added was 0.0.116.
 		let pending_inbound_payment_count: u64 = Readable::read(reader)?;
-		if pending_inbound_payment_count != 0 { return Err(DecodeError::InvalidValue) }
+		for _ in 0..pending_inbound_payment_count {
+			let payment_hash: PaymentHash = Readable::read(reader)?;
+			let logger = WithContext::from(&args.logger, None, None, Some(payment_hash));
+			let inbound: PendingInboundPayment = Readable::read(reader)?;
+			log_warn!(logger, "Ignoring deprecated pending inbound payment with payment hash {}: {:?}", payment_hash, inbound);
+		}
 
 		let pending_outbound_payments_count_compat: u64 = Readable::read(reader)?;
 		let mut pending_outbound_payments_compat: HashMap<PaymentId, PendingOutboundPayment> =

pending_changelog/3383-deprecate-old-inbounds.txt

@@ -0,0 +1,6 @@
+# Backwards Compatibility
+* Pending inbound payments added in versions 0.0.116 or earlier using the
+	`create_inbound_payment{,_for_hash}_legacy` API will be ignored on `ChannelManager`
+	deserialization and fail to be received
+
+