Skip to content

chore: drop deprecated RPCs masternode current, masternode winner and getpoolinfo #6567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 2 commits into from
Feb 16, 2025
Merged

chore: drop deprecated RPCs masternode current, masternode winner and getpoolinfo #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cdd4f3
chore: drop deprecated `masternode` RPC verbs `winner` and `current`
kwvg Feb 10, 2025
7c81d53
chore: drop deprecated CoinJoin RPC `getpoolinfo`
kwvg Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/release-notes-6567.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Updated RPCs
------------

* The RPCs `masternode current` and `masternode winner` were deprecated in Dash Core
v0.17 and are now removed.
* The `getpoolinfo` RPC was deprecated in Dash Core v0.15 and is now removed.
17 changes: 0 additions & 17 deletions src/rpc/coinjoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,21 +365,6 @@ static RPCHelpMan coinjoinsalt_set()
}
#endif // ENABLE_WALLET

// TODO: remove it completely
static RPCHelpMan getpoolinfo()
{
return RPCHelpMan{"getpoolinfo",
"DEPRECATED. Please use getcoinjoininfo instead.\n",
{},
RPCResults{},
RPCExamples{""},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
throw JSONRPCError(RPC_METHOD_DEPRECATED, "Please use getcoinjoininfo instead");
},
};
}

static RPCHelpMan getcoinjoininfo()
{
return RPCHelpMan{"getcoinjoininfo",
Expand Down Expand Up @@ -480,8 +465,6 @@ static const CRPCCommand commands[] =
{ "dash", &coinjoinsalt_generate, },
{ "dash", &coinjoinsalt_get, },
{ "dash", &coinjoinsalt_set, },

{ "hidden", &getpoolinfo, },
#endif // ENABLE_WALLET
};
// clang-format on
Expand Down
67 changes: 0 additions & 67 deletions src/rpc/masternode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,71 +112,6 @@ static RPCHelpMan masternode_count()
};
}

static UniValue GetNextMasternodeForPayment(const CChain& active_chain, CDeterministicMNManager& dmnman, int heightShift)
{
const CBlockIndex *tip = WITH_LOCK(::cs_main, return active_chain.Tip());
auto mnList = dmnman.GetListForBlock(tip);
auto payees = mnList.GetProjectedMNPayees(tip, heightShift);
if (payees.empty())
return "unknown";
auto payee = payees.back();
CScript payeeScript = payee->pdmnState->scriptPayout;

CTxDestination payeeDest;
ExtractDestination(payeeScript, payeeDest);

UniValue obj(UniValue::VOBJ);

obj.pushKV("height", mnList.GetHeight() + heightShift);
obj.pushKV("IP:port", payee->pdmnState->addr.ToStringAddrPort());
obj.pushKV("proTxHash", payee->proTxHash.ToString());
obj.pushKV("outpoint", payee->collateralOutpoint.ToStringShort());
obj.pushKV("payee", IsValidDestination(payeeDest) ? EncodeDestination(payeeDest) : "UNKNOWN");
return obj;
}

// TODO: drop it
static RPCHelpMan masternode_winner()
{
return RPCHelpMan{"masternode winner",
"Print info on next masternode winner to vote for\n",
{},
RPCResults{},
RPCExamples{""},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
if (!IsDeprecatedRPCEnabled("masternode_winner")) {
throw std::runtime_error("DEPRECATED: set -deprecatedrpc=masternode_winner to enable it");
}

const NodeContext& node = EnsureAnyNodeContext(request.context);
const ChainstateManager& chainman = EnsureChainman(node);
return GetNextMasternodeForPayment(chainman.ActiveChain(), *CHECK_NONFATAL(node.dmnman), 10);
},
};
}

// TODO: drop it
static RPCHelpMan masternode_current()
{
return RPCHelpMan{"masternode current",
"Print info on current masternode winner to be paid the next block (calculated locally)\n",
{},
RPCResults{},
RPCExamples{""},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
if (!IsDeprecatedRPCEnabled("masternode_current")) {
throw std::runtime_error("DEPRECATED: set -deprecatedrpc=masternode_current to enable it");
}

const NodeContext& node = EnsureAnyNodeContext(request.context);
const ChainstateManager& chainman = EnsureChainman(node);
return GetNextMasternodeForPayment(chainman.ActiveChain(), *CHECK_NONFATAL(node.dmnman), 1);
},
};
}

#ifdef ENABLE_WALLET
static RPCHelpMan masternode_outputs()
{
Expand Down Expand Up @@ -753,8 +688,6 @@ static const CRPCCommand commands[] =
{ "dash", &masternode_status, },
{ "dash", &masternode_payments, },
{ "dash", &masternode_winners, },
{ "hidden", &masternode_current, },
{ "hidden", &masternode_winner, },
};
// clang-format on
for (const auto& command : commands) {
Expand Down
Loading