GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f7f9555792 into merged_master (Elements PR ElementsProject/elements#1044)

Browse source
This commit is contained in:
Andrew Poelstra 2021-09-18 21:37:37 +00:00
commit 5d8b55ce47
6 changed files with 156 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/versionbits.cpp
View file

@ -186,8 +186,20 @@ protected:
int64_t BeginTime(const Consensus::Params& params) const override { return params.vDeployments[id].nStartTime; }
int64_t EndTime(const Consensus::Params& params) const override { return params.vDeployments[id].nTimeout; }
int MinActivationHeight(const Consensus::Params& params) const override { return params.vDeployments[id].min_activation_height; }
int Period(const Consensus::Params& params) const override { return params.nMinerConfirmationWindow; }
int Threshold(const Consensus::Params& params) const override { return params.nRuleChangeActivationThreshold; }
int Period(const Consensus::Params& params) const override {
if (params.vDeployments[id].nPeriod) {
return *params.vDeployments[id].nPeriod;
} else {
return params.nMinerConfirmationWindow;
}
}
int Threshold(const Consensus::Params& params) const override {
if (params.vDeployments[id].nThreshold) {
return *params.vDeployments[id].nThreshold;
} else {
return params.nRuleChangeActivationThreshold;
}
}
bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override
{