X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Frpcmining.cpp;h=fa0244242940e693d2efb3716d3518f0d02260ba;hb=cecf7a56ed5a5efd939b21c760c69da616306005;hp=103b933173d82824f12ce5315105d1bc64e386a6;hpb=84a4a7763f386934da90e2bd1e355b70023fa9ca;p=novacoin.git diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 103b933..fa02442 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -5,62 +5,44 @@ #include "main.h" #include "db.h" +#include "txdb.h" #include "init.h" +#include "miner.h" +#include "kernel.h" #include "bitcoinrpc.h" +#include +#include +#include + using namespace json_spirit; using namespace std; -Value getgenerate(const Array& params, bool fHelp) -{ - if (fHelp || params.size() != 0) - throw runtime_error( - "getgenerate\n" - "Returns true or false."); - - return GetBoolArg("-gen"); -} - +extern uint256 nPoWBase; +extern uint64_t nStakeInputsMapSize; -Value setgenerate(const Array& params, bool fHelp) +Value getsubsidy(const Array& params, bool fHelp) { - if (fHelp || params.size() < 1 || params.size() > 2) + if (fHelp || params.size() > 1) throw runtime_error( - "setgenerate [genproclimit]\n" - " is true or false to turn generation on or off.\n" - "Generation is limited to [genproclimit] processors, -1 is unlimited."); + "getsubsidy [nTarget]\n" + "Returns proof-of-work subsidy value for the specified value of target."); - bool fGenerate = true; - if (params.size() > 0) - fGenerate = params[0].get_bool(); + unsigned int nBits = 0; - if (params.size() > 1) + if (params.size() != 0) { - int nGenProcLimit = params[1].get_int(); - mapArgs["-genproclimit"] = itostr(nGenProcLimit); - if (nGenProcLimit == 0) - fGenerate = false; + CBigNum bnTarget(uint256(params[0].get_str())); + nBits = bnTarget.GetCompact(); + } + else + { + nBits = GetNextTargetRequired(pindexBest, false); } - mapArgs["-gen"] = (fGenerate ? "1" : "0"); - - GenerateBitcoins(fGenerate, pwalletMain); - return Value::null; -} - - -Value gethashespersec(const Array& params, bool fHelp) -{ - if (fHelp || params.size() != 0) - throw runtime_error( - "gethashespersec\n" - "Returns a recent hashes per second performance measurement while generating."); - if (GetTimeMillis() - nHPSTimerStart > 8000) - return (boost::int64_t)0; - return (boost::int64_t)dHashesPerSec; + return (uint64_t)GetProofOfWorkReward(nBits); } - Value getmininginfo(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) @@ -68,20 +50,186 @@ Value getmininginfo(const Array& params, bool fHelp) "getmininginfo\n" "Returns an object containing mining-related information."); - Object obj; + 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)); - obj.push_back(Pair("difficulty", (double)GetDifficulty())); + + diff.push_back(Pair("proof-of-work", GetDifficulty())); + diff.push_back(Pair("proof-of-stake", GetDifficulty(GetLastBlockIndex(pindexBest, true)))); + diff.push_back(Pair("search-interval", (int)nLastCoinStakeSearchInterval)); + 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("errors", GetWarnings("statusbar"))); - obj.push_back(Pair("generate", GetBoolArg("-gen"))); - obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); - obj.push_back(Pair("hashespersec", gethashespersec(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); + + 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("testnet", fTestNet)); return obj; } +// scaninput '{"txid":"95d640426fe66de866a8cf2d0601d2c8cf3ec598109b4d4ffa7fd03dad6d35ce","difficulty":0.01, "days":10}' +Value scaninput(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 1) + throw runtime_error( + "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"); + + string txid = txid_v.get_str(); + if (!IsHex(txid)) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected hex txid"); + + uint256 hash(txid); + int32_t nDays = 90; + uint32_t nBits = GetNextTargetRequired(pindexBest, true); + + 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) (dDiff * 1000); + nBits = bnTarget.GetCompact(); + } + + const Value& days_v = find_value(scanParams, "days"); + if (days_v.type() == int_type) + { + 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)) + { + 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 + { + 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; + + 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"); +} + Value getworkex(const Array& params, bool fHelp) { if (fHelp || params.size() > 2) @@ -106,7 +254,7 @@ Value getworkex(const Array& params, bool fHelp) // Update block static unsigned int nTransactionsUpdatedLast; static CBlockIndex* pindexPrev; - static int64 nStart; + static int64_t nStart; static CBlock* pblock; if (pindexPrev != pindexBest || (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60)) @@ -204,9 +352,6 @@ Value getworkex(const Array& params, bool fHelp) pblock->hashMerkleRoot = pblock->BuildMerkleTree(); - if (!pblock->SignBlock(*pwalletMain)) - throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); - return CheckWork(pblock, *pwalletMain, reservekey); } } @@ -240,7 +385,7 @@ Value getwork(const Array& params, bool fHelp) // Update block static unsigned int nTransactionsUpdatedLast; static CBlockIndex* pindexPrev; - static int64 nStart; + static int64_t nStart; static CBlock* pblock; if (pindexPrev != pindexBest || (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60)) @@ -320,9 +465,6 @@ Value getwork(const Array& params, bool fHelp) pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second; pblock->hashMerkleRoot = pblock->BuildMerkleTree(); - if (!pblock->SignBlock(*pwalletMain)) - throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); - return CheckWork(pblock, *pwalletMain, reservekey); } } @@ -379,7 +521,7 @@ Value getblocktemplate(const Array& params, bool fHelp) // Update block static unsigned int nTransactionsUpdatedLast; static CBlockIndex* pindexPrev; - static int64 nStart; + static int64_t nStart; static CBlock* pblock; if (pindexPrev != pindexBest || (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5)) @@ -500,13 +642,10 @@ 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"); } - if (!block.SignBlock(*pwalletMain)) - throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); - bool fAccepted = ProcessBlock(NULL, &block); if (!fAccepted) return "rejected";