@@ -303,7 +303,7 @@ static UniValue BIP22ValidationResult(const CValidationState& state)
303
303
}
304
304
305
305
std::string gbt_vb_name (const Consensus::DeploymentPos pos) {
306
- const struct BIP9DeploymentInfo & vbinfo = VersionBitsDeploymentInfo[pos];
306
+ const struct VBDeploymentInfo & vbinfo = VersionBitsDeploymentInfo[pos];
307
307
std::string s = vbinfo.name ;
308
308
if (!vbinfo.gbt_force ) {
309
309
s.insert (s.begin (), ' !' );
@@ -515,7 +515,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
515
515
// TODO: Maybe recheck connections/IBD and (if something wrong) send an expires-immediately template to stop miners?
516
516
}
517
517
518
- const struct BIP9DeploymentInfo & segwit_info = VersionBitsDeploymentInfo[Consensus::DEPLOYMENT_SEGWIT];
518
+ const struct VBDeploymentInfo & segwit_info = VersionBitsDeploymentInfo[Consensus::DEPLOYMENT_SEGWIT];
519
519
// If the caller is indicating segwit support, then allow CreateNewBlock()
520
520
// to select witness transactions, after segwit activates (otherwise
521
521
// don't).
@@ -629,7 +629,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
629
629
// FALL THROUGH to get vbavailable set...
630
630
case THRESHOLD_STARTED:
631
631
{
632
- const struct BIP9DeploymentInfo & vbinfo = VersionBitsDeploymentInfo[pos];
632
+ const struct VBDeploymentInfo & vbinfo = VersionBitsDeploymentInfo[pos];
633
633
vbavailable.push_back (Pair (gbt_vb_name (pos), consensusParams.vDeployments [pos].bit ));
634
634
if (setClientRules.find (vbinfo.name ) == setClientRules.end ()) {
635
635
if (!vbinfo.gbt_force ) {
@@ -642,7 +642,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
642
642
case THRESHOLD_ACTIVE:
643
643
{
644
644
// Add to rules only
645
- const struct BIP9DeploymentInfo & vbinfo = VersionBitsDeploymentInfo[pos];
645
+ const struct VBDeploymentInfo & vbinfo = VersionBitsDeploymentInfo[pos];
646
646
aRules.push_back (gbt_vb_name (pos));
647
647
if (setClientRules.find (vbinfo.name ) == setClientRules.end ()) {
648
648
// Not supported by the client; make sure it's safe to proceed
0 commit comments