f also check inbound payments

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -13111,6 +13111,21 @@ where
 			}
 		}
 
+		// Similar to the above cases for forwarded payments, if we have any pending inbound HTLCs
+		// which haven't yet been claimed, we may be missing counterparty_node_id info and would
+		// panic if we attempted to claim them at this point.
+		for (payment_hash, payment) in claimable_payments.iter() {
+			for htlc in payment.htlcs.iter() {
+				if htlc.prev_hop.counterparty_node_id.is_none() {
+					log_error!(args.logger,
+						"We do not have the required information to claim a pending payment with payment hash {}.\
+						All HTLCs that were received by LDK 0.0.123 and prior must be resolved prior to upgrading to LDK 0.1",
+						payment_hash,
+					);
+				}
+			}
+		}
+
 		let mut secp_ctx = Secp256k1::new();
 		secp_ctx.seeded_randomize(&args.entropy_source.get_secure_random_bytes());
 

pending_changelog/matt-no-upgrade-skip.txt

@@ -1,6 +1,6 @@
 ## Backwards Compatibility
- * Nodes with pending forwarded HTLCs cannot be upgraded directly from 0.0.123
-   or earlier to 0.1. Instead, they must first either resolve all pending
-   forwarded HTLCs (including those pending resolution on-chain), or run
-   0.0.124 and resolve any HTLCs that were originally forwarded running
-   0.0.123 or earlier.
+ * Nodes with pending forwarded HTLCs or unclaimed payments cannot be
+   upgraded directly from 0.0.123 or earlier to 0.1. Instead, they must
+   first either resolve all pending HTLCs (including those pending
+   resolution on-chain), or run 0.0.124 and resolve any HTLCs that were
+   originally forwarded or received running 0.0.123 or earlier.