aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorSuhas Daftuar <sdaftuar@gmail.com>2020-07-29 11:07:23 -0400
committerSuhas Daftuar <sdaftuar@gmail.com>2020-08-04 13:29:40 -0400
commit7989901c7eb62ca28b3d1e5d5831041a7267e495 (patch)
tree776c823c913377bcd1ddd3093f5952f35f400199 /src/consensus
parenta41ae68053387567414021228995a485e29ad611 (diff)
downloadbitcoin-7989901c7eb62ca28b3d1e5d5831041a7267e495.tar.xz
Add txids with non-standard inputs to reject filter
Our policy checks for non-standard inputs depend only on the non-witness portion of a transaction: we look up the scriptPubKey of the input being spent from our UTXO set (which is covered by the input txid), and the p2sh checks only rely on the scriptSig portion of the input. Consequently it's safe to add txids of transactions that fail these checks to the reject filter, as the witness is irrelevant to the failure. This is helpful for any situation where we might request the transaction again via txid (either from txid-relay peers, or if we might fetch the transaction via txid due to parent-fetching of orphans). Further, in preparation for future witness versions being deployed on the network, ensure that WITNESS_UNKNOWN transactions are rejected in AreInputsStandard(), so that transactions spending v1 (or greater) witness outputs will fall into this category of having their txid added to the reject filter.
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/validation.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
index 8de7a8f2d8..2a93a090d6 100644
--- a/src/consensus/validation.h
+++ b/src/consensus/validation.h
@@ -26,7 +26,8 @@ enum class TxValidationResult {
* is uninteresting.
*/
TX_RECENT_CONSENSUS_CHANGE,
- TX_NOT_STANDARD, //!< didn't meet our local policy rules
+ TX_INPUTS_NOT_STANDARD, //!< inputs (covered by txid) failed policy rules
+ TX_NOT_STANDARD, //!< otherwise didn't meet our local policy rules
TX_MISSING_INPUTS, //!< transaction was missing some of its inputs
TX_PREMATURE_SPEND, //!< transaction spends a coinbase too early, or violates locktime/sequence locks
/**