diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-08 15:28:45 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-08 15:44:07 +0200 |
| commit | 66ed450d771a8fc01c159a8402648ebd1c35eb4c (patch) | |
| tree | 43998454f3822caed7f0704f6f487e30c723d4c0 /src/main.cpp | |
| parent | 6a034ed89891e4f23eeaccba928731f32c8e2057 (diff) | |
| parent | 12c708a4b3a799478fbb3f93fda696706177a824 (diff) | |
| download | bitcoin-66ed450d771a8fc01c159a8402648ebd1c35eb4c.tar.xz | |
Merge #7935: Versionbits: GBT support
12c708a getblocktemplate: Use version/force mutation to support pre-BIP9 clients (Luke Dashjr)
9879060 getblocktemplate: Explicitly handle the distinction between GBT-affecting softforks vs not (Luke Dashjr)
72cd6b2 qa/rpc-tests: bip9-softforks: Add tests for getblocktemplate versionbits updates (Luke Dashjr)
d3df40e 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 bd028fefba..84edaebb82 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2181,7 +2181,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) { |