@ -389,10 +389,10 @@ Value getblocktemplate(const Array& params, bool fHelp)
" }\n"
" ,...\n"
" ],\n"
"\"coinbaseaux\" : { (json object) data that should be included in the coinbase's scriptSig content\n"
"\"flags\" : \"flags\" (string) \n"
" },\n"
"\"coinbasevalue\" : n, (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in Satoshis)\n"
// " \"coinbaseaux\" : { (json object) data that should be included in the coinbase's scriptSig content\n"
// " \"flags\" : \"flags\" (string) \n"
// " },\n"
// " \"coinbasevalue\" : n, (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in Satoshis)\n"
"\"coinbasetxn\" : { ... }, (json object) information for coinbase transaction\n"
"\"target\" : \"xxxx\", (string) The hash target\n"
"\"mintime\" : xxx, (numeric) The minimum timestamp appropriate for next block time in seconds since epoch (Jan 1 1970 GMT)\n"
@ -415,8 +415,15 @@ Value getblocktemplate(const Array& params, bool fHelp)
LOCK(cs_main);
// Wallet is required because we support coinbasetxn
if(pwalletMain==NULL){
throwJSONRPCError(RPC_METHOD_NOT_FOUND,"Method not found (disabled)");
}
std::stringstrMode="template";
Valuelpval=Value::null;
// TODO: Re-enable coinbasevalue once a specification has been written
boolcoinbasetxn=true;
if(params.size()>0)
{
constObject&oparam=params[0].get_obj();
@ -529,7 +536,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
// Clear pindexPrev so future calls make a new block, despite any failures from here on
pindexPrev=NULL;
// Store the pindexBest used before CreateNewBlock, to avoid races
// Store the pindexBest used before CreateNewBlockWithKey, to avoid races