diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-01 16:25:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-01 16:25:34 +0200 |
| commit | ec0afbd52b787ac0c8d49ad1b6c9dfa98d725b03 (patch) | |
| tree | 132d34784012f0be5fb32ae148f8367a124f028b /src/main.cpp | |
| parent | 15502d7b2543cb43688abde7e6019b7c2b9c3411 (diff) | |
| parent | db4bacf59092ae4aa923a58f379c36757edad932 (diff) | |
| download | bitcoin-ec0afbd52b787ac0c8d49ad1b6c9dfa98d725b03.tar.xz | |
Merge #8176: [0.12.x]: Versionbits: GBT support
db4bacf getblocktemplate: Use version/force mutation to support pre-BIP9 clients (Luke Dashjr)
65ee332 getblocktemplate: Explicitly handle the distinction between GBT-affecting softforks vs not (Luke Dashjr)
40e81f5 qa/rpc-tests: bip9-softforks: Add tests for getblocktemplate versionbits updates (Luke Dashjr)
ddd8c01 Implement BIP 9 GBT changes (Luke Dashjr)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5187d543a1..6dc2b3ba0c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2160,7 +2160,7 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const } // Protected by cs_main -static VersionBitsCache versionbitscache; +VersionBitsCache versionbitscache; int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params) { |