diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 7c35b335c495b..c7cd3578878db 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -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); diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 56b4dfa3fbbf9..1d2a454bcb326 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -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" }, diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index cfe22f9ec41e5..57bb9b75b581f 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -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);