diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-11-16 07:51:21 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-16 07:50:27 +0100 |
commit | fa074d2c7b9c3d34876c428d12672a505d4ce4eb (patch) | |
tree | 26338f3d5945b898c8ea9dfbd13d32679ec81040 /src/consensus/validation.h | |
parent | a339289c2ef9caffa1195436695a13f6e48e1bbc (diff) |
Revert "Merge #19606: Backport wtxid relay to v0.20"
This reverts commit a339289c2ef9caffa1195436695a13f6e48e1bbc, reversing
changes made to b9ac31f2d29ae3e79c0f0cde5bab2d7213e6da51.
Diffstat (limited to 'src/consensus/validation.h')
-rw-r--r-- | src/consensus/validation.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/consensus/validation.h b/src/consensus/validation.h index f7d476951b..3a90cd69b3 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -31,16 +31,12 @@ enum class TxValidationResult { TX_MISSING_INPUTS, //!< transaction was missing some of its inputs TX_PREMATURE_SPEND, //!< transaction spends a coinbase too early, or violates locktime/sequence locks /** - * Transaction might have a witness prior to SegWit + * Transaction might be missing a witness, have a witness prior to SegWit * activation, or witness may have been malleated (which includes * non-standard witnesses). */ TX_WITNESS_MUTATED, /** - * Transaction is missing a witness. - */ - TX_WITNESS_STRIPPED, - /** * Tx already in mempool or conflicts with a tx in the chain * (if it conflicts with another tx in mempool, we use MEMPOOL_POLICY as it failed to reach the RBF threshold) * Currently this is only used if the transaction already exists in the mempool or on chain. |