Skip to content

Commit 95d4744

Browse files
committed
Merge bitcoin#19391: RPC/Mining: Clean out pre-Segwit miner compatibility code
90a5dfa RPC/Mining: Clean out pre-Segwit miner compatibility code (Luke Dashjr) Pull request description: This is dead code post-Segwit. ACKs for top commit: achow101: ACK 90a5dfa Tree-SHA512: 5970aa3548d2a7da7c6e83fb9b910529faab10251b115122cec833bb7d3a54c7cb0714c1a873807be04c7817bb827c7ece1e20e8fa4c907aa58688487d0ec44d
2 parents 64f7a19 + 90a5dfa commit 95d4744

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

src/rpc/mining.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,6 @@ static RPCHelpMan getblocktemplate()
598598
std::string strMode = "template";
599599
UniValue lpval = NullUniValue;
600600
std::set<std::string> setClientRules;
601-
int64_t nMaxVersionPreVB = -1;
602601
CChainState& active_chainstate = chainman.ActiveChainstate();
603602
CChain& active_chain = active_chainstate.m_chain;
604603
if (!request.params[0].isNull())
@@ -650,12 +649,6 @@ static RPCHelpMan getblocktemplate()
650649
const UniValue& v = aClientRules[i];
651650
setClientRules.insert(v.get_str());
652651
}
653-
} else {
654-
// NOTE: It is important that this NOT be read if versionbits is supported
655-
const UniValue& uvMaxVersion = find_value(oparam, "maxversion");
656-
if (uvMaxVersion.isNum()) {
657-
nMaxVersionPreVB = uvMaxVersion.getInt<int64_t>();
658-
}
659652
}
660653
}
661654

@@ -863,7 +856,6 @@ static RPCHelpMan getblocktemplate()
863856
if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
864857
// Not supported by the client; make sure it's safe to proceed
865858
if (!vbinfo.gbt_force) {
866-
// If we do anything other than throw an exception here, be sure version/force isn't sent to old clients
867859
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Support for '%s' rule requires explicit client support", vbinfo.name));
868860
}
869861
}
@@ -876,14 +868,6 @@ static RPCHelpMan getblocktemplate()
876868
result.pushKV("vbavailable", vbavailable);
877869
result.pushKV("vbrequired", int(0));
878870

879-
if (nMaxVersionPreVB >= 2) {
880-
// If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
881-
// Because BIP 34 changed how the generation transaction is serialized, we can only use version/force back to v2 blocks
882-
// This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
883-
// Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
884-
aMutable.push_back("version/force");
885-
}
886-
887871
result.pushKV("previousblockhash", pblock->hashPrevBlock.GetHex());
888872
result.pushKV("transactions", transactions);
889873
result.pushKV("coinbaseaux", aux);

0 commit comments

Comments
 (0)