From deffe0df6c36225bada18603b5a840139f030f2c Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Fri, 15 Apr 2022 05:49:31 +1000 Subject: [PATCH] deploymentstatus: allow chainman in place of consensusParams --- src/validation.cpp | 1 - src/validation.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/validation.cpp b/src/validation.cpp index 3fb1f16366c..6bed75a185f 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/src/validation.h b/src/validation.h index 55f8b841f4c..9d6b1d5932b 100644 --- a/src/validation.h +++ b/src/validation.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -1003,6 +1004,25 @@ public: ~ChainstateManager(); }; +/** Deployment* info via ChainstateManager */ +template +bool DeploymentActiveAfter(const CBlockIndex* pindexPrev, const ChainstateManager& chainman, DEP dep) +{ + return DeploymentActiveAfter(pindexPrev, chainman.GetConsensus(), dep); +} + +template +bool DeploymentActiveAt(const CBlockIndex& index, const ChainstateManager& chainman, DEP dep) +{ + return DeploymentActiveAt(index, chainman.GetConsensus(), dep); +} + +template +bool DeploymentEnabled(const ChainstateManager& chainman, DEP dep) +{ + return DeploymentEnabled(chainman.GetConsensus(), dep); +} + using FopenFn = std::function; /** Dump the mempool to disk. */