X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Frpcmining.cpp;h=62d8837d4e174bc7e4ebad6db83512e4ae7ad28e;hb=5a7a2125b6b4ed7d3ea55f333d0cf2345bd1d916;hp=498e1af8733278318b512c05f01aa43f199842e4;hpb=38663dc48fc85ff2cd44b2fcb5b246a928c04e1f;p=novacoin.git diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 498e1af..62d8837 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -13,7 +13,6 @@ #include #include -#include using namespace json_spirit; using namespace std; @@ -50,7 +49,7 @@ Value getmininginfo(const Array& params, bool fHelp) "getmininginfo\n" "Returns an object containing mining-related information."); - 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)); @@ -147,9 +146,21 @@ Value scaninput(const Array& params, bool fHelp) 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() )); + for (size_t i = 0; i != tx.vout.size(); ++i) vInputs.push_back(i); } CTxDB txdb("r");