X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Frpcmining.cpp;h=fa0244242940e693d2efb3716d3518f0d02260ba;hb=cecf7a56ed5a5efd939b21c760c69da616306005;hp=8f02836681b6c2b22cef150cf5e7ff34ab8535dc;hpb=363358101373af438f57181db57df5bafee96550;p=novacoin.git diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 8f02836..fa02442 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -11,10 +11,15 @@ #include "kernel.h" #include "bitcoinrpc.h" +#include +#include +#include + using namespace json_spirit; using namespace std; extern uint256 nPoWBase; +extern uint64_t nStakeInputsMapSize; Value getsubsidy(const Array& params, bool fHelp) { @@ -45,10 +50,7 @@ Value getmininginfo(const Array& params, bool fHelp) "getmininginfo\n" "Returns an object containing mining-related information."); - float nKernelsRate = 0, nCoinDaysRate = 0; - pwalletMain->GetStakeStats(nKernelsRate, nCoinDaysRate); - - Object obj, diff, weight; + Object obj, diff; obj.push_back(Pair("blocks", (int)nBestHeight)); obj.push_back(Pair("currentblocksize",(uint64_t)nLastBlockSize)); obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx)); @@ -59,67 +61,173 @@ Value getmininginfo(const Array& params, bool fHelp) obj.push_back(Pair("difficulty", diff)); obj.push_back(Pair("blockvalue", (uint64_t)GetProofOfWorkReward(GetLastBlockIndex(pindexBest, false)->nBits))); - obj.push_back(Pair("netmhashps", GetPoWMHashPS())); - obj.push_back(Pair("netstakeweight", GetPoSKernelPS())); + obj.push_back(Pair("netmhashps", GetPoWMHashPS())); + obj.push_back(Pair("netstakeweight",GetPoSKernelPS())); obj.push_back(Pair("errors", GetWarnings("statusbar"))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); - weight.push_back(Pair("kernelsrate", nKernelsRate)); - weight.push_back(Pair("cdaysrate", nCoinDaysRate)); - obj.push_back(Pair("stakestats", weight)); + obj.push_back(Pair("stakeinputs", (uint64_t)nStakeInputsMapSize)); + obj.push_back(Pair("stakeinterest", GetProofOfStakeReward(0, GetLastBlockIndex(pindexBest, true)->nBits, GetLastBlockIndex(pindexBest, true)->nTime, true))); - obj.push_back(Pair("stakeinterest", (uint64_t)GetProofOfStakeReward(0, GetLastBlockIndex(pindexBest, true)->nBits, GetLastBlockIndex(pindexBest, true)->nTime, true))); obj.push_back(Pair("testnet", fTestNet)); return obj; } +// scaninput '{"txid":"95d640426fe66de866a8cf2d0601d2c8cf3ec598109b4d4ffa7fd03dad6d35ce","difficulty":0.01, "days":10}' Value scaninput(const Array& params, bool fHelp) { - if (fHelp || params.size() > 4 || params.size() < 2) + if (fHelp || params.size() != 1) throw runtime_error( - "scaninput [difficulty] [days]\n" - "Scan specified input for suitable kernel solutions.\n" - " [difficulty] - upper limit for difficulty, current difficulty by default;\n" - " [days] - time window, 365 days by default.\n" + "scaninput '{\"txid\":\"txid\", \"vout\":[vout1, vout2, ..., voutN], \"difficulty\":difficulty, \"days\":days}'\n" + "Scan specified transaction or input for suitable kernel solutions.\n" + " difficulty - upper limit for difficulty, current difficulty by default;\n" + " days - time window, 90 days by default.\n" ); + RPCTypeCheck(params, boost::assign::list_of(obj_type)); + + Object scanParams = params[0].get_obj(); + + const Value& txid_v = find_value(scanParams, "txid"); + if (txid_v.type() != str_type) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing txid key"); - uint256 hash; - hash.SetHex(params[0].get_str()); + string txid = txid_v.get_str(); + if (!IsHex(txid)) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected hex txid"); - uint32_t nOut = params[1].get_int(), nBits = GetNextTargetRequired(pindexBest, true), nDays = 365; + uint256 hash(txid); + int32_t nDays = 90; + uint32_t nBits = GetNextTargetRequired(pindexBest, true); - if (params.size() > 2) + const Value& diff_v = find_value(scanParams, "difficulty"); + if (diff_v.type() == real_type || diff_v.type() == int_type) { + double dDiff = diff_v.get_real(); + if (dDiff <= 0) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, diff must be greater than zero"); + CBigNum bnTarget(nPoWBase); bnTarget *= 1000; - bnTarget /= (int) (params[2].get_real() * 1000); + bnTarget /= (int) (dDiff * 1000); nBits = bnTarget.GetCompact(); } - if (params.size() > 3) + const Value& days_v = find_value(scanParams, "days"); + if (days_v.type() == int_type) { - nDays = params[3].get_int(); + nDays = days_v.get_int(); + if (nDays <= 0) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, interval length must be greater than zero"); } + CTransaction tx; uint256 hashBlock = 0; if (GetTransaction(hash, tx, hashBlock)) { - std::pair solution; - if (ScanInputForStakeKernelHash(tx, nOut, nBits, nDays * 86400, solution)) + if (hashBlock == 0) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to find transaction in the blockchain"); + + vector vInputs(0); + const Value& inputs_v = find_value(scanParams, "vout"); + if (inputs_v.type() == array_type) + { + Array inputs = inputs_v.get_array(); + BOOST_FOREACH(const Value &v_out, inputs) + { + int nOut = v_out.get_int(); + if (nOut < 0 || nOut > (int)tx.vout.size() - 1) + { + stringstream strErrorMsg; + strErrorMsg << boost::format("Invalid parameter, input number %d is out of range") % nOut; + throw JSONRPCError(RPC_INVALID_PARAMETER, strErrorMsg.str()); + } + + vInputs.push_back(nOut); + } + } + else if(inputs_v.type() == int_type) + { + int nOut = inputs_v.get_int(); + if (nOut < 0 || nOut > (int)tx.vout.size() - 1) + { + stringstream strErrorMsg; + strErrorMsg << boost::format("Invalid parameter, input number %d is out of range") % nOut; + throw JSONRPCError(RPC_INVALID_PARAMETER, strErrorMsg.str()); + } + + vInputs.push_back(nOut); + } + else { - Object r; - r.push_back(Pair("hash", solution.first.GetHex())); - r.push_back(Pair("time", DateTimeStrFormat(solution.second))); + vInputs = vector(boost::counting_iterator( 0 ), boost::counting_iterator( tx.vout.size() )); + } + + CTxDB txdb("r"); + + CBlock block; + CTxIndex txindex; + + // Load transaction index item + if (!txdb.ReadTxIndex(tx.GetHash(), txindex)) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to read block index item"); + + // Read block header + if (!block.ReadFromDisk(txindex.pos.nFile, txindex.pos.nBlockPos, false)) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "CBlock::ReadFromDisk() failed"); + + uint64_t nStakeModifier = 0; + if (!GetKernelStakeModifier(block.GetHash(), nStakeModifier)) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No kernel stake modifier generated yet"); + + std::pair interval; + interval.first = GetTime(); + // Only count coins meeting min age requirement + if (nStakeMinAge + block.nTime > interval.first) + interval.first += (nStakeMinAge + block.nTime - interval.first); + interval.second = interval.first + nDays * nOneDay; - return r; + Array results; + BOOST_FOREACH(const int &nOut, vInputs) + { + // Check for spent flag + // It doesn't make sense to scan spent inputs. + if (!txindex.vSpent[nOut].IsNull()) + continue; + + // Skip zero value outputs + if (tx.vout[nOut].nValue == 0) + continue; + + // Build static part of kernel + CDataStream ssKernel(SER_GETHASH, 0); + ssKernel << nStakeModifier; + ssKernel << block.nTime << (txindex.pos.nTxPos - txindex.pos.nBlockPos) << tx.nTime << nOut; + CDataStream::const_iterator itK = ssKernel.begin(); + + std::vector > result; + if (ScanKernelForward((unsigned char *)&itK[0], nBits, tx.nTime, tx.vout[nOut].nValue, interval, result)) + { + BOOST_FOREACH(const PAIRTYPE(uint256, uint32_t) solution, result) + { + Object item; + item.push_back(Pair("nout", nOut)); + item.push_back(Pair("hash", solution.first.GetHex())); + item.push_back(Pair("time", DateTimeStrFormat(solution.second))); + + results.push_back(item); + } + } } + + if (results.size() == 0) + return false; + + return results; } else throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction"); - - return Value::null; } Value getworkex(const Array& params, bool fHelp) @@ -534,7 +642,7 @@ Value submitblock(const Array& params, bool fHelp) try { ssBlock >> block; } - catch (std::exception &e) { + catch (const std::exception&) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed"); }