f allow cases where the chan is still open and actually fail if we'll panic

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -13116,12 +13116,24 @@ where
 		// 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() {
+				if htlc.prev_hop.counterparty_node_id.is_some() {
+					continue;
+				}
+				if short_to_chan_info.get(&htlc.prev_hop.short_channel_id).is_some() {
+					log_error!(args.logger,
+						"We do not have the required information to claim a pending payment with payment hash {} reliably.\
+						As long as the channel for the inbound edge of the forward remains open, this may work okay, but we may panic at runtime!\
+						All HTLCs that were received by LDK 0.0.123 and prior must be resolved prior to upgrading to LDK 0.1\
+						Continuing anyway, though panics may occur!",
+						payment_hash,
+					);
+				} else {
 					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,
 					);
+					return Err(DecodeError::InvalidValue);
 				}
 			}
 		}