From a3434dfdefbb38136946623dfc91526d4f930ec7 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sat, 7 Oct 2017 00:48:47 -0700 Subject: [PATCH 1/2] Hush aint got no founders reward --- src/rpcmining.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index bfeb146c4..b3760060a 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -878,13 +878,12 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getblocksubsidy height\n" - "\nReturns block subsidy reward, taking into account the mining slow start and the founders reward, of block at index provided.\n" + "\nReturns block subsidy reward, taking into account the mining slow start, of a block at index provided.\n" "\nArguments:\n" "1. height (numeric, optional) The block height. If not provided, defaults to the current height of the chain.\n" "\nResult:\n" "{\n" " \"miner\" : x.xxx (numeric) The mining reward amount in HUSH.\n" - " \"founders\" : x.xxx (numeric) The founders reward amount in HUSH.\n" "}\n" "\nExamples:\n" + HelpExampleCli("getblocksubsidy", "1000") @@ -897,13 +896,8 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range"); CAmount nReward = GetBlockSubsidy(nHeight, Params().GetConsensus()); - CAmount nFoundersReward = 0; - if ((nHeight > 0) && (nHeight <= Params().GetConsensus().GetLastFoundersRewardBlockHeight())) { - nFoundersReward = 0; - nReward -= nFoundersReward; - } + UniValue result(UniValue::VOBJ); result.push_back(Pair("miner", ValueFromAmount(nReward))); - result.push_back(Pair("founders", ValueFromAmount(nFoundersReward))); return result; } From 1eecc5e44fde5613a2efc7362901b052063c84d5 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sat, 7 Oct 2017 00:53:45 -0700 Subject: [PATCH 2/2] Remove the calculation of foundersreward, which does not exist in Hush --- src/rpcmining.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index b3760060a..81d2c6ad8 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -677,11 +677,6 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) entry.push_back(Pair("sigops", pblocktemplate->vTxSigOps[index_in_template])); if (tx.IsCoinBase()) { - // Show founders' reward if it is required - if (pblock->vtx[0].vout.size() > 1) { - // Correct this if GetBlockTemplate changes the order - entry.push_back(Pair("foundersreward", (int64_t)tx.vout[1].nValue)); - } entry.push_back(Pair("required", true)); txCoinbase = entry; } else {