zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change getblocksubsidy RPC to take into account funding streams. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2020-07-09 18:28:06 +01:00
parent 6bd85925e7
commit 8121e874e2
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rpc/mining.cpp
View File

@ -6,6 +6,7 @@
#include "amount.h"
#include "chainparams.h"
#include "consensus/consensus.h"
#include "consensus/funding.h"
#include "consensus/validation.h"
#include "core_io.h"
#ifdef ENABLE_MINING
@ -880,6 +881,7 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
"{\n"
" \"miner\" : x.xxx (numeric) The mining reward amount in " + CURRENCY_UNIT + ".\n"
" \"founders\" : x.xxx (numeric) The founders reward amount in " + CURRENCY_UNIT + ".\n"
" \"fundingstreams\" : {...} (optional map) A map from funding stream recipients to amounts in " + CURRENCY_UNIT + ".\n"
"}\n"
"\nExamples:\n"
+ HelpExampleCli("getblocksubsidy", "1000")
@ -891,14 +893,27 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
if (nHeight < 0)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
CAmount nReward = GetBlockSubsidy(nHeight, Params().GetConsensus());
auto consensus = Params().GetConsensus();
CAmount nBlockSubsidy = GetBlockSubsidy(nHeight, consensus);
CAmount nMinerReward = nBlockSubsidy;
CAmount nFoundersReward = 0;
if ((nHeight > 0) && (nHeight <= Params().GetConsensus().GetLastFoundersRewardBlockHeight(nHeight))) {
nFoundersReward = nReward/5;
nReward -= nFoundersReward;
}
bool canopyActive = consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY);
UniValue result(UniValue::VOBJ);
result.pushKV("miner", ValueFromAmount(nReward));
if (canopyActive) {
UniValue fundingstreams(UniValue::VOBJ);
auto elems = Consensus::GetActiveFundingStreams(nHeight, consensus);
for (auto elem : elems) {
CAmount value = elem.Value(nBlockSubsidy);
fundingstreams.pushKV(elem.recipient, value);
nMinerReward -= value;
}
result.pushKV("fundingstreams", fundingstreams);
} else if (nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight(nHeight)) {
nFoundersReward = nBlockSubsidy/5;
nMinerReward -= nFoundersReward;
}
result.pushKV("miner", ValueFromAmount(nMinerReward));
result.pushKV("founders", ValueFromAmount(nFoundersReward));
return result;
}