Merge bitcoin/bitcoin#25210: doc: remove misleading AreInputsStandard() comment

laanwj · laanwj · commit c324b07a541a · 2022-05-26T15:13:35.000+02:00
be6d431 doc: remove misleading AreInputsStandard() comment (James O'Beirne) Pull request description: This check isn't any longer just about bad pay-to-script-hash inputs; it also excludes any kind of nonstandard input, unknown witness versions, coinbases, etc. ACKs for top commit: laanwj: ACK be6d431 dunxen: ACK be6d431 jonatack: ACK be6d431 Tree-SHA512: 1c4befadff6a7b5789901ca2a2cc39adc35c688f7e3c093ab5292123f9193ce078731016b773b3d05f7004ff01ee62f23f8362ae8d05134d41dc097ba094a42b
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -814,7 +814,6 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
         return false; // state filled in by CheckTxInputs
     }
 
-    // Check for non-standard pay-to-script-hash in inputs
     if (fRequireStandard && !AreInputsStandard(tx, m_view)) {
         return state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs");
     }

Original file line number	Diff line number	Diff line change
`@@ -814,7 +814,6 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)`
`814`	`814`	`return false; // state filled in by CheckTxInputs`
`815`	`815`	`}`
`816`	`816`
`817`		`- // Check for non-standard pay-to-script-hash in inputs`
`818`	`817`	`if (fRequireStandard && !AreInputsStandard(tx, m_view)) {`
`819`	`818`	`return state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs");`
`820`	`819`	`}`