foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-06 14:19:59 -05:00
Code Issues Activity

rpc: create rpc/mining.h, hoist default max tries values to constant

Browse source
This commit is contained in:
Jon Atack 2020-05-31 14:11:21 +02:00
parent 9bc7751cad
commit cb00510dba
No known key found for this signature in database
GPG key ID: 4F5721B3D0E3921D
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile.am
View file

@ -184,6 +184,7 @@ BITCOIN_CORE_H = \
reverse_iterator.h \ reverse_iterator.h \
rpc/blockchain.h \ rpc/blockchain.h \
rpc/client.h \ rpc/client.h \
rpc/mining.h \
rpc/protocol.h \ rpc/protocol.h \
rpc/rawtransaction_util.h \ rpc/rawtransaction_util.h \
rpc/register.h \ rpc/register.h \

11
src/rpc/mining.cpp
View file

@ -17,6 +17,7 @@
#include <policy/fees.h> #include <policy/fees.h>
#include <pow.h> #include <pow.h>
#include <rpc/blockchain.h> #include <rpc/blockchain.h>
#include <rpc/mining.h>
#include <rpc/server.h> #include <rpc/server.h>
#include <rpc/util.h> #include <rpc/util.h>
#include <script/descriptor.h> #include <script/descriptor.h>
@ -206,7 +207,7 @@ static UniValue generatetodescriptor(const JSONRPCRequest& request)
{ {
{"num_blocks", RPCArg::Type::NUM, RPCArg::Optional::NO, "How many blocks are generated immediately."}, {"num_blocks", RPCArg::Type::NUM, RPCArg::Optional::NO, "How many blocks are generated immediately."},
{"descriptor", RPCArg::Type::STR, RPCArg::Optional::NO, "The descriptor to send the newly generated bitcoin to."}, {"descriptor", RPCArg::Type::STR, RPCArg::Optional::NO, "The descriptor to send the newly generated bitcoin to."},
{"maxtries", RPCArg::Type::NUM, /* default */ "1000000", "How many iterations to try."}, {"maxtries", RPCArg::Type::NUM, /* default */ ToString(DEFAULT_MAX_TRIES), "How many iterations to try."},
}, },
RPCResult{ RPCResult{
RPCResult::Type::ARR, "", "hashes of blocks generated", RPCResult::Type::ARR, "", "hashes of blocks generated",
@ -220,7 +221,7 @@ static UniValue generatetodescriptor(const JSONRPCRequest& request)
.Check(request); .Check(request);
const int num_blocks{request.params[0].get_int()}; const int num_blocks{request.params[0].get_int()};
const int64_t max_tries{request.params[2].isNull() ? 1000000 : request.params[2].get_int()}; const uint64_t max_tries{request.params[2].isNull() ? DEFAULT_MAX_TRIES : request.params[2].get_int()};
CScript coinbase_script; CScript coinbase_script;
std::string error; std::string error;
@ -241,7 +242,7 @@ static UniValue generatetoaddress(const JSONRPCRequest& request)
{ {
{"nblocks", RPCArg::Type::NUM, RPCArg::Optional::NO, "How many blocks are generated immediately."}, {"nblocks", RPCArg::Type::NUM, RPCArg::Optional::NO, "How many blocks are generated immediately."},
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address to send the newly generated bitcoin to."}, {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address to send the newly generated bitcoin to."},
{"maxtries", RPCArg::Type::NUM, /* default */ "1000000", "How many iterations to try."}, {"maxtries", RPCArg::Type::NUM, /* default */ ToString(DEFAULT_MAX_TRIES), "How many iterations to try."},
}, },
RPCResult{ RPCResult{
RPCResult::Type::ARR, "", "hashes of blocks generated", RPCResult::Type::ARR, "", "hashes of blocks generated",
@ -257,7 +258,7 @@ static UniValue generatetoaddress(const JSONRPCRequest& request)
}.Check(request); }.Check(request);
int nGenerate = request.params[0].get_int(); int nGenerate = request.params[0].get_int();
uint64_t nMaxTries = 1000000; uint64_t nMaxTries{DEFAULT_MAX_TRIES};
if (!request.params[2].isNull()) { if (!request.params[2].isNull()) {
nMaxTries = request.params[2].get_int(); nMaxTries = request.params[2].get_int();
} }
@ -370,7 +371,7 @@ static UniValue generateblock(const JSONRPCRequest& request)
} }
uint256 block_hash; uint256 block_hash;
uint64_t max_tries{1000000}; uint64_t max_tries{DEFAULT_MAX_TRIES};
unsigned int extra_nonce{0}; unsigned int extra_nonce{0};
if (!GenerateBlock(EnsureChainman(request.context), block, max_tries, extra_nonce, block_hash) || block_hash.IsNull()) { if (!GenerateBlock(EnsureChainman(request.context), block, max_tries, extra_nonce, block_hash) || block_hash.IsNull()) {

11
src/rpc/mining.h Normal file
View file

@ -0,0 +1,11 @@
// Copyright (c) 2020 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_RPC_MINING_H
#define BITCOIN_RPC_MINING_H
/** Default max iterations to try in RPC generatetodescriptor, generatetoaddress, and generateblock. */
static const uint64_t DEFAULT_MAX_TRIES{1000000};
#endif // BITCOIN_RPC_MINING_H