diff options
| author | Anthony Towns <aj@erisian.com.au> | 2022-04-15 06:53:19 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2022-05-10 12:09:33 +1000 |
| commit | bb5c24b120a3ac7df367a1c5d9b075ca564efb5f (patch) | |
| tree | fb615ac890a78c4536a985db148c0d70d4ad2ef7 /src/deploymentstatus.h | |
| parent | eca22c726ac48b4216bb68cc0f0bbd655c43ac12 (diff) | |
| download | bitcoin-bb5c24b120a3ac7df367a1c5d9b075ca564efb5f.tar.xz | |
validation: move g_versionbitscache into ChainstateManager
Diffstat (limited to 'src/deploymentstatus.h')
| -rw-r--r-- | src/deploymentstatus.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/deploymentstatus.h b/src/deploymentstatus.h index 29679ae800..9f5919f71b 100644 --- a/src/deploymentstatus.h +++ b/src/deploymentstatus.h @@ -10,30 +10,27 @@ #include <limits> -/** Global cache for versionbits deployment status */ -extern VersionBitsCache g_versionbitscache; - /** Determine if a deployment is active for the next block */ -inline bool DeploymentActiveAfter(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::BuriedDeployment dep, [[maybe_unused]] VersionBitsCache& versionbitscache = g_versionbitscache) +inline bool DeploymentActiveAfter(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::BuriedDeployment dep, [[maybe_unused]] VersionBitsCache& versionbitscache) { assert(Consensus::ValidDeployment(dep)); return (pindexPrev == nullptr ? 0 : pindexPrev->nHeight + 1) >= params.DeploymentHeight(dep); } -inline bool DeploymentActiveAfter(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos dep, VersionBitsCache& versionbitscache = g_versionbitscache) +inline bool DeploymentActiveAfter(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos dep, VersionBitsCache& versionbitscache) { assert(Consensus::ValidDeployment(dep)); return ThresholdState::ACTIVE == versionbitscache.State(pindexPrev, params, dep); } /** Determine if a deployment is active for this block */ -inline bool DeploymentActiveAt(const CBlockIndex& index, const Consensus::Params& params, Consensus::BuriedDeployment dep, [[maybe_unused]] VersionBitsCache& versionbitscache = g_versionbitscache) +inline bool DeploymentActiveAt(const CBlockIndex& index, const Consensus::Params& params, Consensus::BuriedDeployment dep, [[maybe_unused]] VersionBitsCache& versionbitscache) { assert(Consensus::ValidDeployment(dep)); return index.nHeight >= params.DeploymentHeight(dep); } -inline bool DeploymentActiveAt(const CBlockIndex& index, const Consensus::Params& params, Consensus::DeploymentPos dep, VersionBitsCache& versionbitscache = g_versionbitscache) +inline bool DeploymentActiveAt(const CBlockIndex& index, const Consensus::Params& params, Consensus::DeploymentPos dep, VersionBitsCache& versionbitscache) { assert(Consensus::ValidDeployment(dep)); return DeploymentActiveAfter(index.pprev, params, dep, versionbitscache); |