DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Migrate Zcash-specific code to UniValue

Browse Source
This commit is contained in:
Jack Grigg
2017-01-06 19:15:56 +01:00
parent f70084cf06
commit 0d37ae3a59
19 changed files with 258 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpcmining.cpp
View File

@@ -74,7 +74,7 @@ int64_t GetNetworkHashPS(int lookup, int height) {
return (int64_t)(workDiff.getdouble() / timeDiff);
}
Value getlocalsolps(const Array& params, bool fHelp)
UniValue getlocalsolps(const UniValue& params, bool fHelp)
{
if (fHelp)
throw runtime_error(
@@ -92,7 +92,7 @@ Value getlocalsolps(const Array& params, bool fHelp)
return GetLocalSolPS();
}
Value getnetworksolps(const Array& params, bool fHelp)
UniValue getnetworksolps(const UniValue& params, bool fHelp)
{
if (fHelp || params.size() > 2)
throw runtime_error(
@@ -647,7 +647,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal");
Value txCoinbase = NullUniValue;
UniValue txCoinbase = NullUniValue;
UniValue transactions(UniValue::VARR);
map<uint256, int64_t> setTxIndex;
int i = 0;
@@ -709,7 +709,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex()));
result.push_back(Pair("transactions", transactions));
if (coinbasetxn) {
assert(txCoinbase.type() == obj_type);
assert(txCoinbase.isObject());
result.push_back(Pair("coinbasetxn", txCoinbase));
} else {
result.push_back(Pair("coinbaseaux", aux));
@@ -868,7 +868,7 @@ UniValue estimatepriority(const UniValue& params, bool fHelp)
return mempool.estimatePriority(nBlocks);
}
Value getblocksubsidy(const Array& params, bool fHelp)
UniValue getblocksubsidy(const UniValue& params, bool fHelp)
{
if (fHelp || params.size() > 1)
throw runtime_error(
@@ -897,7 +897,7 @@ Value getblocksubsidy(const Array& params, bool fHelp)
nFoundersReward = nReward/5;
nReward -= nFoundersReward;
}
Object result;
UniValue result(UniValue::VOBJ);
result.push_back(Pair("miner", ValueFromAmount(nReward)));
result.push_back(Pair("founders", ValueFromAmount(nFoundersReward)));
return result;