diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-25 16:21:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-25 16:21:42 -0400 |
| commit | 36bd46f1c4330fa57a3730bd80706eca11510b55 (patch) | |
| tree | 1b85ec3e3b0f3a064f6378484fbdaca34f2704a9 | |
| parent | 13dd2d090e1acf8895854cedea18e38a6278c7ea (diff) | |
RPC: keypoolrefill gains optional size parameter
| -rw-r--r-- | src/bitcoinrpc.cpp | 1 | ||||
| -rw-r--r-- | src/rpcwallet.cpp | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 5908126200..9cd94f0234 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1199,6 +1199,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri if (strMethod == "importprivkey" && n > 2) ConvertTo<bool>(params[2]); if (strMethod == "verifychain" && n > 0) ConvertTo<boost::int64_t>(params[0]); if (strMethod == "verifychain" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "keypoolrefill" && n > 0) ConvertTo<boost::int64_t>(params[0]); return params; } diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 7d3cfad76a..f79fe78763 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1253,17 +1253,24 @@ Value backupwallet(const Array& params, bool fHelp) Value keypoolrefill(const Array& params, bool fHelp) { - if (fHelp || params.size() > 0) + if (fHelp || params.size() > 1) throw runtime_error( - "keypoolrefill\n" + "keypoolrefill [new-size]\n" "Fills the keypool." + HelpRequiringPassphrase()); + unsigned int kpSize = max(GetArg("-keypool", 100), 0LL); + if (params.size() > 0) { + if (params[0].get_int() < 0) + throw JSONRPCError(-8, "Invalid parameter, expected valid size"); + kpSize = (unsigned int) params[0].get_int(); + } + EnsureWalletIsUnlocked(); - pwalletMain->TopUpKeyPool(); + pwalletMain->TopUpKeyPool(kpSize); - if (pwalletMain->GetKeyPoolSize() < GetArg("-keypool", 100)) + if (pwalletMain->GetKeyPoolSize() < kpSize) throw JSONRPCError(RPC_WALLET_ERROR, "Error refreshing keypool."); return Value::null; |