diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-12-15 22:06:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-12-15 22:46:49 +0100 |
| commit | dff0f6f753eafd932d7d65fbfa33585f620e8e54 (patch) | |
| tree | d843aa786c18012e6a0f0464a4bcaa93b7a33dc1 /src/primitives | |
| parent | c434e2cca9181ce184efef946ab2ce62f2cd2ee7 (diff) | |
| parent | fade6195b1c230edd561443637a7bde81c2594a4 (diff) | |
| download | bitcoin-dff0f6f753eafd932d7d65fbfa33585f620e8e54.tar.xz | |
Merge #20611: Move TX_MAX_STANDARD_VERSION to policy
fade6195b1c230edd561443637a7bde81c2594a4 Move TX_MAX_STANDARD_VERSION to policy (MarcoFalke)
Pull request description:
`primitives` should only be used for the raw datastructures (parsing and format). It is not the right place to document relay policy.
ACKs for top commit:
laanwj:
Code review ACK fade6195b1c230edd561443637a7bde81c2594a4
lontivero:
Concept ACK https://github.com/bitcoin/bitcoin/pull/20611/commits/fade6195b1c230edd561443637a7bde81c2594a4
Tree-SHA512: f809c4aecd14d7e9feaa7b50b9c0697232991eef36190cd960bcfb0ad6e20c71a4f6aab48c7747cf8a681eb14feda60c55b09a37f128673d519567224f29cd97
Diffstat (limited to 'src/primitives')
| -rw-r--r-- | src/primitives/transaction.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index c1e9f0af21..ec09668e7a 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -262,12 +262,6 @@ public: // Default transaction version. static const int32_t CURRENT_VERSION=2; - // Changing the default transaction version requires a two step process: first - // adapting relay policy by bumping MAX_STANDARD_VERSION, and then later date - // bumping the default CURRENT_VERSION at which point both CURRENT_VERSION and - // MAX_STANDARD_VERSION will be equal. - static const int32_t MAX_STANDARD_VERSION=2; - // The local variables are made const to prevent unintended modification // without updating the cached hash value. However, CTransaction is not // actually immutable; deserialization and assignment are implemented, |