X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmonitor.rs;h=ffc9ed26fdaa60a0f81375ce88588f2f4aa8f18d;hb=6ab31a0d501db9fd96436deff190da8801ac73b7;hp=ae8f4f4a668f2ca007b2e03394a26725fe827d78;hpb=ca6b44b8cce864bac61a38a967284e8128836cbd;p=rust-lightning

diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index ae8f4f4a..ffc9ed26 100644
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -423,7 +423,9 @@ impl ChannelMonitor {
 
 	pub fn insert_combine(&mut self, mut other: ChannelMonitor) -> Result<(), HandleError> {
 		if self.funding_txo.is_some() {
-			if other.funding_txo.is_some() && other.funding_txo.as_ref().unwrap() != self.funding_txo.as_ref().unwrap() {
+			// We should be able to compare the entire funding_txo, but in fuzztarget its trivially
+			// easy to collide the funding_txo hash and have a different scriptPubKey.
+			if other.funding_txo.is_some() && other.funding_txo.as_ref().unwrap().0 != self.funding_txo.as_ref().unwrap().0 {
 				return Err(HandleError{err: "Funding transaction outputs are not identical!", action: None});
 			}
 		} else {