diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-30 17:50:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-30 18:59:39 +0200 |
| commit | e8a8f3d4b22b76a14693f4c2af645021f656c823 (patch) | |
| tree | 40aa207b03af739b035705ca4824e5768e78980f /src/primitives | |
| parent | 60db51dcb2005506e91d13a37eaaca5cd82a76d7 (diff) | |
| parent | 71527a0f31ae67edad0a7fcda59c75a6ce5666ca (diff) | |
| download | bitcoin-e8a8f3d4b22b76a14693f4c2af645021f656c823.tar.xz | |
Merge #7648: BIP9 versionbits softfork for BIP68, BIP112 and BIP113
71527a0 Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier)
19d73d5 Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos)
12c89c9 Policy: allow transaction version 2 relay policy. (BtcDrak)
02c2435 Soft fork logic for BIP68 (BtcDrak)
478fba6 Soft fork logic for BIP113 (BtcDrak)
65751a3 Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille)
Diffstat (limited to 'src/primitives')
| -rw-r--r-- | src/primitives/transaction.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index e124dca365..149816406a 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -207,8 +207,15 @@ private: void UpdateHash() const; public: + // Default transaction version. static const int32_t CURRENT_VERSION=1; + // 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, |