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

Make sure command line takes precedence when processing evbparams

Browse source
This commit is contained in:
Pablo Greco 2021-10-30 09:35:07 +00:00
parent 24cafa50cf
commit 19f54eb5e0
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/chainparams.cpp
View file

@ -94,6 +94,7 @@ static void UpdateElementsActivationParametersFromArgs(Consensus::Params& consen
{
if (!args.IsArgSet("-evbparams")) return;
std::map<std::string,int> map_deployments;
for (const std::string& strDeployment : args.GetArgs("-evbparams")) {
std::vector<std::string> vDeploymentParams;
boost::split(vDeploymentParams, strDeployment, boost::is_any_of(":"));
@ -129,7 +130,13 @@ static void UpdateElementsActivationParametersFromArgs(Consensus::Params& consen
bool found = false;
for (int j=0; j < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j) {
if (vDeploymentParams[0] == VersionBitsDeploymentInfo[j].name) {
if(map_deployments[vDeploymentParams[0]]) {
found = true;
LogPrintf("Ignoring duplicated version bits activation parameters for \"%s\"\n", strDeployment.c_str());
break;
}
std::string extra_logging;
map_deployments[vDeploymentParams[0]]=1;
Consensus::DeploymentPos d=Consensus::DeploymentPos(j);
if (use_nStartTime) {
consensus.vDeployments[d].nStartTime = nStartTime;