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.

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

DIP3 and DIP6 bugs #2815

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

DIP3 and DIP6 bugs #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01cad5f
Fixed broken RPC: protx_register_fund
panleone Feb 27, 2023
8b00afa
Fixed broken help command
panleone Feb 27, 2023
958a76c
Improved startmasternode help handling
panleone Mar 4, 2023
8d62932
Fix GUI to recognize MNReward in v6.0
Liquid369 Mar 12, 2023
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
4 changes: 2 additions & 2 deletions src/qt/transactionrecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ bool TransactionRecord::decomposeCreditTransaction(const CWallet* wallet, const
sub.address = getValueOrReturnEmpty(wtx.mapValue, "from");
}
if (wtx.IsCoinBase()) {
// Generated
sub.type = TransactionRecord::Generated;
// Generated or MN Reward in v6.0
sub.type = !Params().GetConsensus().NetworkUpgradeActive(wtx.m_confirm.block_height, Consensus::UPGRADE_V6_0) ? TransactionRecord::Generated : TransactionRecord::MNReward;
}

parts.append(sub);
Expand Down
1 change: 1 addition & 0 deletions src/rpc/client.cpp
View file
Open in desktop
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
6 changes: 5 additions & 1 deletion src/rpc/masternode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,11 @@ 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)");
if (request.fHelp) {
throw std::runtime_error("startmasternode (deprecated and no longer functional)");
} else {
throw JSONRPCError(RPC_MISC_ERROR, "startmasternode is not supported when deterministic masternode list is active (DIP3)");
}
}

CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
Expand Down