Merge #15492: [rpc] remove deprecated generate method
07cae5287c
[wallet] remove unused GetScriptForMining (Sjors Provoost)8bb3e4c487
[rpc] remove deprecated generate method (Sjors Provoost) Pull request description: As announced in v0.18, the wallet generate rpc method is deprecated and will be fully removed in v0.19. Clients should transition to using the node rpc method `generatetoaddress`. Tree-SHA512: 9e5e913b59f3e18440b2b7b356124c7b87ad19f81a1ab6ada06a6c396b84e734895465f569296f1ba8c12abf74863bab5fd77765c9e806c239713aa83a59485f
This commit is contained in:
commit
9e3122de05
6 changed files with 21 additions and 86 deletions
11
doc/release-notes-15492.md
Normal file
11
doc/release-notes-15492.md
Normal file
|
@ -0,0 +1,11 @@
|
|||
Deprecated or removed RPCs
|
||||
--------------------------
|
||||
- The wallet's `generate` RPC method was deprecated in v0.18 and has now
|
||||
been fully removed. This RPC is only used for
|
||||
testing, but its implementation reached across multiple subsystems
|
||||
(wallet and mining), so it has been removed to simplify the
|
||||
wallet-node interface. Projects that are using `generate` for testing
|
||||
purposes should transition to using the `generatetoaddress` RPC, which
|
||||
does not require or use the wallet component. Calling
|
||||
`generatetoaddress` with an address returned by the `getnewaddress`
|
||||
RPC gives the same functionality as the old `generate` RPC.
|
|
@ -28,8 +28,6 @@ public:
|
|||
static const CRPCConvertParam vRPCConvertParams[] =
|
||||
{
|
||||
{ "setmocktime", 0, "timestamp" },
|
||||
{ "generate", 0, "nblocks" },
|
||||
{ "generate", 1, "maxtries" },
|
||||
{ "generatetoaddress", 0, "nblocks" },
|
||||
{ "generatetoaddress", 2, "maxtries" },
|
||||
{ "getnetworkhashps", 0, "nblocks" },
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include <policy/fees.h>
|
||||
#include <policy/policy.h>
|
||||
#include <policy/rbf.h>
|
||||
#include <rpc/mining.h>
|
||||
#include <rpc/rawtransaction.h>
|
||||
#include <rpc/server.h>
|
||||
#include <rpc/util.h>
|
||||
|
@ -3358,62 +3357,6 @@ static UniValue bumpfee(const JSONRPCRequest& request)
|
|||
return result;
|
||||
}
|
||||
|
||||
UniValue generate(const JSONRPCRequest& request)
|
||||
{
|
||||
std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
|
||||
CWallet* const pwallet = wallet.get();
|
||||
|
||||
|
||||
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
|
||||
return NullUniValue;
|
||||
}
|
||||
|
||||
if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) {
|
||||
throw std::runtime_error(
|
||||
RPCHelpMan{"generate",
|
||||
"\nMine up to nblocks blocks immediately (before the RPC call returns) to an address in the wallet.\n",
|
||||
{
|
||||
{"nblocks", RPCArg::Type::NUM, RPCArg::Optional::NO, "How many blocks are generated immediately."},
|
||||
{"maxtries", RPCArg::Type::NUM, /* default */ "1000000", "How many iterations to try."},
|
||||
},
|
||||
RPCResult{
|
||||
"[ blockhashes ] (array) hashes of blocks generated\n"
|
||||
},
|
||||
RPCExamples{
|
||||
"\nGenerate 11 blocks\n"
|
||||
+ HelpExampleCli("generate", "11")
|
||||
},
|
||||
}.ToString());
|
||||
}
|
||||
|
||||
if (!IsDeprecatedRPCEnabled("generate")) {
|
||||
throw JSONRPCError(RPC_METHOD_DEPRECATED, "The wallet generate rpc method is deprecated and will be fully removed in v0.19. "
|
||||
"To use generate in v0.18, restart bitcoind with -deprecatedrpc=generate.\n"
|
||||
"Clients should transition to using the node rpc method generatetoaddress\n");
|
||||
}
|
||||
|
||||
int num_generate = request.params[0].get_int();
|
||||
uint64_t max_tries = 1000000;
|
||||
if (!request.params[1].isNull()) {
|
||||
max_tries = request.params[1].get_int();
|
||||
}
|
||||
|
||||
std::shared_ptr<CReserveScript> coinbase_script;
|
||||
pwallet->GetScriptForMining(coinbase_script);
|
||||
|
||||
// If the keypool is exhausted, no script is returned at all. Catch this.
|
||||
if (!coinbase_script) {
|
||||
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
|
||||
}
|
||||
|
||||
//throw an error if no script was provided
|
||||
if (coinbase_script->reserveScript.empty()) {
|
||||
throw JSONRPCError(RPC_INTERNAL_ERROR, "No coinbase script available");
|
||||
}
|
||||
|
||||
return generateBlocks(coinbase_script, num_generate, max_tries, true);
|
||||
}
|
||||
|
||||
UniValue rescanblockchain(const JSONRPCRequest& request)
|
||||
{
|
||||
std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
|
||||
|
@ -4156,7 +4099,6 @@ UniValue importmulti(const JSONRPCRequest& request);
|
|||
static const CRPCCommand commands[] =
|
||||
{ // category name actor (function) argNames
|
||||
// --------------------- ------------------------ ----------------------- ----------
|
||||
{ "generating", "generate", &generate, {"nblocks","maxtries"} },
|
||||
{ "hidden", "resendwallettransactions", &resendwallettransactions, {} },
|
||||
{ "rawtransactions", "fundrawtransaction", &fundrawtransaction, {"hexstring","options","iswitness"} },
|
||||
{ "wallet", "abandontransaction", &abandontransaction, {"txid"} },
|
||||
|
|
|
@ -3819,17 +3819,6 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
|
|||
}
|
||||
}
|
||||
|
||||
void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)
|
||||
{
|
||||
std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);
|
||||
CPubKey pubkey;
|
||||
if (!rKey->GetReservedKey(pubkey))
|
||||
return;
|
||||
|
||||
script = rKey;
|
||||
script->reserveScript = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
|
||||
}
|
||||
|
||||
void CWallet::LockCoin(const COutPoint& output)
|
||||
{
|
||||
AssertLockHeld(cs_wallet); // setLockedCoins
|
||||
|
|
|
@ -1065,8 +1065,6 @@ public:
|
|||
|
||||
const std::string& GetLabelName(const CScript& scriptPubKey) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
|
||||
|
||||
void GetScriptForMining(std::shared_ptr<CReserveScript> &script);
|
||||
|
||||
unsigned int GetKeyPoolSize() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet)
|
||||
{
|
||||
AssertLockHeld(cs_wallet); // set{Ex,In}ternalKeyPool
|
||||
|
|
|
@ -4,29 +4,26 @@
|
|||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
"""Test deprecation of RPC calls."""
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
from test_framework.util import assert_raises_rpc_error
|
||||
# from test_framework.util import assert_raises_rpc_error
|
||||
|
||||
class DeprecatedRpcTest(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
self.num_nodes = 2
|
||||
self.setup_clean_chain = True
|
||||
self.extra_args = [[], ["-deprecatedrpc=generate"]]
|
||||
|
||||
def skip_test_if_missing_module(self):
|
||||
# The generate RPC method requires the wallet to be compiled
|
||||
self.skip_if_no_wallet()
|
||||
self.extra_args = [[], []]
|
||||
|
||||
def run_test(self):
|
||||
# This test should be used to verify correct behaviour of deprecated
|
||||
# RPC methods with and without the -deprecatedrpc flags. For example:
|
||||
#
|
||||
# self.log.info("Make sure that -deprecatedrpc=createmultisig allows it to take addresses")
|
||||
# assert_raises_rpc_error(-5, "Invalid public key", self.nodes[0].createmultisig, 1, [self.nodes[0].getnewaddress()])
|
||||
# self.nodes[1].createmultisig(1, [self.nodes[1].getnewaddress()])
|
||||
|
||||
self.log.info("Test generate RPC")
|
||||
assert_raises_rpc_error(-32, 'The wallet generate rpc method is deprecated', self.nodes[0].rpc.generate, 1)
|
||||
self.nodes[1].generate(1)
|
||||
# In set_test_params:
|
||||
# self.extra_args = [[], ["-deprecatedrpc=generate"]]
|
||||
#
|
||||
# In run_test:
|
||||
# self.log.info("Test generate RPC")
|
||||
# assert_raises_rpc_error(-32, 'The wallet generate rpc method is deprecated', self.nodes[0].rpc.generate, 1)
|
||||
# self.nodes[1].generate(1)
|
||||
self.log.info("No tested deprecated RPC methods")
|
||||
|
||||
if __name__ == '__main__':
|
||||
DeprecatedRpcTest().main()
|
||||
|
|
Loading…
Reference in a new issue