mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
RPC/Mining: Clean out pre-Segwit miner compatibility code
This commit is contained in:
parent
ac59112a6a
commit
90a5dfa509
@ -598,7 +598,6 @@ static RPCHelpMan getblocktemplate()
|
||||
std::string strMode = "template";
|
||||
UniValue lpval = NullUniValue;
|
||||
std::set<std::string> setClientRules;
|
||||
int64_t nMaxVersionPreVB = -1;
|
||||
CChainState& active_chainstate = chainman.ActiveChainstate();
|
||||
CChain& active_chain = active_chainstate.m_chain;
|
||||
if (!request.params[0].isNull())
|
||||
@ -650,12 +649,6 @@ static RPCHelpMan getblocktemplate()
|
||||
const UniValue& v = aClientRules[i];
|
||||
setClientRules.insert(v.get_str());
|
||||
}
|
||||
} else {
|
||||
// NOTE: It is important that this NOT be read if versionbits is supported
|
||||
const UniValue& uvMaxVersion = find_value(oparam, "maxversion");
|
||||
if (uvMaxVersion.isNum()) {
|
||||
nMaxVersionPreVB = uvMaxVersion.getInt<int64_t>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -863,7 +856,6 @@ static RPCHelpMan getblocktemplate()
|
||||
if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
|
||||
// Not supported by the client; make sure it's safe to proceed
|
||||
if (!vbinfo.gbt_force) {
|
||||
// If we do anything other than throw an exception here, be sure version/force isn't sent to old clients
|
||||
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Support for '%s' rule requires explicit client support", vbinfo.name));
|
||||
}
|
||||
}
|
||||
@ -876,14 +868,6 @@ static RPCHelpMan getblocktemplate()
|
||||
result.pushKV("vbavailable", vbavailable);
|
||||
result.pushKV("vbrequired", int(0));
|
||||
|
||||
if (nMaxVersionPreVB >= 2) {
|
||||
// If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
|
||||
// Because BIP 34 changed how the generation transaction is serialized, we can only use version/force back to v2 blocks
|
||||
// This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
|
||||
// Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
|
||||
aMutable.push_back("version/force");
|
||||
}
|
||||
|
||||
result.pushKV("previousblockhash", pblock->hashPrevBlock.GetHex());
|
||||
result.pushKV("transactions", transactions);
|
||||
result.pushKV("coinbaseaux", aux);
|
||||
|
Loading…
Reference in New Issue
Block a user