fix Include vout check as well in OutPoint check for shared input

optout21 · optout21 · commit cafc821d30e9 · 2025-06-19T10:28:50.000+02:00
diff --git a/lightning/src/ln/interactivetxs.rs b/lightning/src/ln/interactivetxs.rs
@@ -641,7 +641,7 @@ impl NegotiationContext {
 					return Err(AbortReason::DuplicateFundingInput);
 				}
 				// Check if receied shared input matches the expected
-				if shared_funding_input.0.txid != *shared_txid {
+				if !(shared_funding_input.0.txid == *shared_txid && shared_funding_input.0.vout == msg.prevtx_out) {
 					return Err(AbortReason::UnexpectedFundingInput);
 				} else {
 					let previous_output = OutPoint { txid: *shared_txid, vout: msg.prevtx_out };

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ impl NegotiationContext {`
`641`	`641`	`return Err(AbortReason::DuplicateFundingInput);`
`642`	`642`	`}`
`643`	`643`	`// Check if receied shared input matches the expected`
`644`		`- if shared_funding_input.0.txid != *shared_txid {`
	`644`	`+ if !(shared_funding_input.0.txid == *shared_txid && shared_funding_input.0.vout == msg.prevtx_out) {`
`645`	`645`	`return Err(AbortReason::UnexpectedFundingInput);`
`646`	`646`	`} else {`
`647`	`647`	`let previous_output = OutPoint { txid: *shared_txid, vout: msg.prevtx_out };`