diff options
| author | Anthony Towns <aj@erisian.com.au> | 2020-06-16 18:58:56 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2021-06-29 17:11:12 +1000 |
| commit | 2b0d291da8f479739ff394dd92801da8c40b9f8e (patch) | |
| tree | 50968fbedda38d56cfd6fa5b1a7c2a3ee037ddab /src/rpc/mining.cpp | |
| parent | eccd736f3dc231ac0306ca763c3b72cf8247230a (diff) | |
| download | bitcoin-2b0d291da8f479739ff394dd92801da8c40b9f8e.tar.xz | |
[refactor] Add deploymentstatus.h
Provides DeploymentEnabled, DeploymentActiveAt, and DeploymentActiveAfter
helpers for checking the status of buried deployments. Can be overloaded
so the same syntax works for non-buried deployments, allowing future
soft forks to be changed from signalled to buried deployments without
having to touch the implementation code.
Replaces IsWitnessEnabled and IsScriptWitnessEnabled.
Diffstat (limited to 'src/rpc/mining.cpp')
| -rw-r--r-- | src/rpc/mining.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 327f961196..f054c8b145 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -10,6 +10,7 @@ #include <consensus/params.h> #include <consensus/validation.h> #include <core_io.h> +#include <deploymentstatus.h> #include <key_io.h> #include <miner.h> #include <net.h> @@ -774,7 +775,7 @@ static RPCHelpMan getblocktemplate() pblock->nNonce = 0; // NOTE: If at some point we support pre-segwit miners post-segwit-activation, this needs to take segwit support into consideration - const bool fPreSegWit = (pindexPrev->nHeight + 1 < consensusParams.SegwitHeight); + const bool fPreSegWit = !DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT); UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal"); |