Skip to content
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.

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

DIP3 and DIP6 bugs #2815

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions src/rpc/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ static const CRPCConvertParam vRPCConvertParams[] = {
{ "preparebudget", 3, "start" },
{ "preparebudget", 5, "montly_payment" },
{ "prioritisetransaction", 1, "fee_delta" },
{ "protx_register_prepare", 1, "collateralIndex" },
{ "quorumdkgsimerror", 1, "rate" },
{ "quorumdkgstatus", 0, "detail_level" },
{ "rawdelegatestake", 1, "amount" },
Expand Down
10 changes: 4 additions & 6 deletions src/rpc/masternode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,6 @@ void SerializeMNB(UniValue& statusObjRet, const CMasternodeBroadcast& mnb, const

UniValue startmasternode(const JSONRPCRequest& request)
{
// Skip after legacy obsolete. !TODO: remove when transition to DMN is complete
if (deterministicMNManager->LegacyMNObsolete()) {
throw JSONRPCError(RPC_MISC_ERROR, "startmasternode is not supported when deterministic masternode list is active (DIP3)");
}

CWallet * const pwallet = GetWalletForJSONRPCRequest(request);

if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
Expand Down Expand Up @@ -462,7 +457,10 @@ UniValue startmasternode(const JSONRPCRequest& request)

"\nExamples:\n" +
HelpExampleCli("startmasternode", "\"alias\" \"0\" \"my_mn\"") + HelpExampleRpc("startmasternode", "\"alias\" \"0\" \"my_mn\""));

// Skip after legacy obsolete. !TODO: remove when transition to DMN is complete
if (deterministicMNManager->LegacyMNObsolete()) {
throw JSONRPCError(RPC_MISC_ERROR, "startmasternode is not supported when deterministic masternode list is active (DIP3)");
}
bool fLock = (request.params[1].get_str() == "true" ? true : false);

EnsureWalletIsUnlocked(pwallet);
Expand Down