aboutsummaryrefslogtreecommitdiff
path: root/src/node
diff options
context:
space:
mode:
authorAnthony Towns <aj@erisian.com.au>2020-07-03 04:01:23 +1000
committerAnthony Towns <aj@erisian.com.au>2021-06-30 08:18:58 +1000
commitde55304f6e7a8b607e6b3fc7436de50910747b0c (patch)
treece1cb7ee0bcad78cb327650e0c4cb5e51b28074a /src/node
parent2b0d291da8f479739ff394dd92801da8c40b9f8e (diff)
downloadbitcoin-de55304f6e7a8b607e6b3fc7436de50910747b0c.tar.xz
[refactor] Add versionbits deployments to deploymentstatus.h
Adds support for versionbits deployments to DeploymentEnabled, DeploymentActiveAfter and DeploymentActiveAt. Also moves versionbitscache from validation to deploymentstatus.
Diffstat (limited to 'src/node')
-rw-r--r--src/node/interfaces.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 807b0143a6..183b5a5d91 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -6,6 +6,7 @@
#include <banman.h>
#include <chain.h>
#include <chainparams.h>
+#include <deploymentstatus.h>
#include <external_signer.h>
#include <init.h>
#include <interfaces/chain.h>
@@ -692,7 +693,7 @@ public:
{
LOCK(::cs_main);
const CBlockIndex* tip = Assert(m_node.chainman)->ActiveChain().Tip();
- return VersionBitsState(tip, Params().GetConsensus(), Consensus::DEPLOYMENT_TAPROOT, versionbitscache) == ThresholdState::ACTIVE;
+ return DeploymentActiveAfter(tip, Params().GetConsensus(), Consensus::DEPLOYMENT_TAPROOT);
}
NodeContext& m_node;
};