|
|
@ -1107,13 +1107,13 @@ static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Conse |
|
|
|
return rv; |
|
|
|
return rv; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void BIP9SoftForkDescPushBack(UniValue& bip9_softforks, const std::string &name, const Consensus::Params& consensusParams, Consensus::DeploymentPos id) |
|
|
|
void BIP9SoftForkDescPushBack(UniValue& bip9_softforks, const Consensus::Params& consensusParams, Consensus::DeploymentPos id) |
|
|
|
{ |
|
|
|
{ |
|
|
|
// Deployments with timeout value of 0 are hidden.
|
|
|
|
// Deployments with timeout value of 0 are hidden.
|
|
|
|
// A timeout value of 0 guarantees a softfork will never be activated.
|
|
|
|
// A timeout value of 0 guarantees a softfork will never be activated.
|
|
|
|
// This is used when softfork codes are merged without specifying the deployment schedule.
|
|
|
|
// This is used when softfork codes are merged without specifying the deployment schedule.
|
|
|
|
if (consensusParams.vDeployments[id].nTimeout > 0) |
|
|
|
if (consensusParams.vDeployments[id].nTimeout > 0) |
|
|
|
bip9_softforks.push_back(Pair(name, BIP9SoftForkDesc(consensusParams, id))); |
|
|
|
bip9_softforks.push_back(Pair(VersionBitsDeploymentInfo[id].name, BIP9SoftForkDesc(consensusParams, id))); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
UniValue getblockchaininfo(const JSONRPCRequest& request) |
|
|
|
UniValue getblockchaininfo(const JSONRPCRequest& request) |
|
|
@ -1185,8 +1185,9 @@ UniValue getblockchaininfo(const JSONRPCRequest& request) |
|
|
|
softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams)); |
|
|
|
softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams)); |
|
|
|
softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams)); |
|
|
|
softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams)); |
|
|
|
softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams)); |
|
|
|
softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams)); |
|
|
|
BIP9SoftForkDescPushBack(bip9_softforks, "csv", consensusParams, Consensus::DEPLOYMENT_CSV); |
|
|
|
for (int pos = Consensus::DEPLOYMENT_CSV; pos != Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++pos) { |
|
|
|
BIP9SoftForkDescPushBack(bip9_softforks, "segwit", consensusParams, Consensus::DEPLOYMENT_SEGWIT); |
|
|
|
BIP9SoftForkDescPushBack(bip9_softforks, consensusParams, static_cast<Consensus::DeploymentPos>(pos)); |
|
|
|
|
|
|
|
} |
|
|
|
obj.push_back(Pair("softforks", softforks)); |
|
|
|
obj.push_back(Pair("softforks", softforks)); |
|
|
|
obj.push_back(Pair("bip9_softforks", bip9_softforks)); |
|
|
|
obj.push_back(Pair("bip9_softforks", bip9_softforks)); |
|
|
|
|
|
|
|
|
|
|
|