From 01cad5f7e2c9945d15400b5ba3f870e5bba5b010 Mon Sep 17 00:00:00 2001 From: Alessandro Rezzi Date: Mon, 27 Feb 2023 21:28:11 +0100 Subject: [PATCH 1/4] Fixed broken RPC: protx_register_fund --- src/rpc/client.cpp | 1 + 1 file changed, 1 insertion(+) 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" }, From 8b00afabd857af2de5f964c80182dcb419273f2a Mon Sep 17 00:00:00 2001 From: Alessandro Rezzi Date: Mon, 27 Feb 2023 21:28:44 +0100 Subject: [PATCH 2/4] Fixed broken help command --- src/rpc/masternode.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index cfe22f9ec41e5..d1e51370fcb50 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -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)) @@ -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); From 958a76c8eb60af3a21ee9f95cbf4b2c135b367f3 Mon Sep 17 00:00:00 2001 From: Alessandro Rezzi Date: Sat, 4 Mar 2023 13:52:17 +0100 Subject: [PATCH 3/4] Improved startmasternode help handling --- src/rpc/masternode.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index d1e51370fcb50..57bb9b75b581f 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -408,6 +408,15 @@ 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()) { + 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); if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) @@ -457,10 +466,7 @@ 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); From 8d62932325c411110fddf9eca2722400956cdbf8 Mon Sep 17 00:00:00 2001 From: Liquid Date: Sun, 12 Mar 2023 17:19:11 -0500 Subject: [PATCH 4/4] Fix GUI to recognize MNReward in v6.0 --- src/qt/transactionrecord.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);