diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-23 15:52:57 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-23 15:53:06 +0100 |
| commit | 75bf23d8613a28928e18a0b05135d08e354452e0 (patch) | |
| tree | 6e13cade962fb6e655b5e77c6d22e8762286e549 /src/consensus/validation.h | |
| parent | a2fa11f9de7873325fd35f22cc559f697391f82e (diff) | |
| parent | fa074d2c7b9c3d34876c428d12672a505d4ce4eb (diff) | |
| download | bitcoin-75bf23d8613a28928e18a0b05135d08e354452e0.tar.xz | |
Merge #20399: Revert "Merge #19606: Backport wtxid relay to v0.20"
fa074d2c7b9c3d34876c428d12672a505d4ce4eb Revert "Merge #19606: Backport wtxid relay to v0.20" (MarcoFalke)
Pull request description:
The 0.20 branch has bugfixes that should be released. However, a tag can currently not be created because the latest merge introduced a regression and is not a bugfix (https://github.com/bitcoin/bitcoin/pull/20317#issuecomment-723754509, https://github.com/bitcoin/bitcoin/pull/20317#issuecomment-727624755).
Fix that by reverting the last merge. Can be reviewed by re-doing the revert or calling `git diff HEAD HEAD~2 | wc` and observing an empty diff.
ACKs for top commit:
laanwj:
Code review ACK fa074d2c7b9c3d34876c428d12672a505d4ce4eb
Tree-SHA512: 1a1314b9bb85f44696dc307845e80292998d6c9c000e7386c48405e74400d9cd22be6996e555f198da917e04024a1c8e609dfd830759a27fe4070168b0d272bb
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. |