mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge #10604: [wallet] [tests] Add listwallets RPC, include wallet name in getwalletinfo
and add multiwallet test
3707fcd
[wallet] [tests] Add listwallets to multiwallet test (John Newbery)9508761
[wallet] [rpc] Add listwallets RPC (John Newbery)4a05715
[wallet] [rpc] print wallet name in getwalletinfo (John Newbery)09eacee
[wallet] fix comment for CWallet::Verify() (John Newbery) Pull request description: - fix comment for CWallet::Verify (cleanup after #8694) - expose the wallet name in `getwalletinfo` rpc - add `listwallets` rpc - returns array of wallet names - add functional test for multiwallet using new rpc functionality Tree-SHA512: 52f864726bf8a28421d4f3604a6cb95fffb3f4e19edbce18efaef06142c48dd4adb9e7a65a10de2955c80f13c00803ce27c78ccbc8434d92ef12cd36c4ccb4aa
This commit is contained in:
parent
ed8d9a780f
commit
af4450ffeb
@ -2452,6 +2452,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
|
|||||||
"Returns an object containing various wallet state info.\n"
|
"Returns an object containing various wallet state info.\n"
|
||||||
"\nResult:\n"
|
"\nResult:\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
|
" \"walletname\": xxxxx, (string) the wallet name\n"
|
||||||
" \"walletversion\": xxxxx, (numeric) the wallet version\n"
|
" \"walletversion\": xxxxx, (numeric) the wallet version\n"
|
||||||
" \"balance\": xxxxxxx, (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
|
" \"balance\": xxxxxxx, (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
|
||||||
" \"privatesend_balance\": xxxxxx, (numeric) the anonymized dash balance of the wallet in " + CURRENCY_UNIT + "\n"
|
" \"privatesend_balance\": xxxxxx, (numeric) the anonymized dash balance of the wallet in " + CURRENCY_UNIT + "\n"
|
||||||
@ -2485,6 +2486,8 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
|
|||||||
CHDChain hdChainCurrent;
|
CHDChain hdChainCurrent;
|
||||||
bool fHDEnabled = pwallet->GetHDChain(hdChainCurrent);
|
bool fHDEnabled = pwallet->GetHDChain(hdChainCurrent);
|
||||||
UniValue obj(UniValue::VOBJ);
|
UniValue obj(UniValue::VOBJ);
|
||||||
|
|
||||||
|
obj.push_back(Pair("walletname", pwallet->GetName()));
|
||||||
obj.push_back(Pair("walletversion", pwallet->GetVersion()));
|
obj.push_back(Pair("walletversion", pwallet->GetVersion()));
|
||||||
obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance())));
|
obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance())));
|
||||||
obj.push_back(Pair("privatesend_balance", ValueFromAmount(pwallet->GetAnonymizedBalance())));
|
obj.push_back(Pair("privatesend_balance", ValueFromAmount(pwallet->GetAnonymizedBalance())));
|
||||||
@ -2522,6 +2525,39 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
|
|||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UniValue listwallets(const JSONRPCRequest& request)
|
||||||
|
{
|
||||||
|
if (request.fHelp || request.params.size() != 0)
|
||||||
|
throw std::runtime_error(
|
||||||
|
"listwallets\n"
|
||||||
|
"Returns a list of currently loaded wallets.\n"
|
||||||
|
"For full information on the wallet, use \"getwalletinfo\"\n"
|
||||||
|
"\nResult:\n"
|
||||||
|
"[ (json array of strings)\n"
|
||||||
|
" \"walletname\" (string) the wallet name\n"
|
||||||
|
" ...\n"
|
||||||
|
"]\n"
|
||||||
|
"\nExamples:\n"
|
||||||
|
+ HelpExampleCli("listwallets", "")
|
||||||
|
+ HelpExampleRpc("listwallets", "")
|
||||||
|
);
|
||||||
|
|
||||||
|
UniValue obj(UniValue::VARR);
|
||||||
|
|
||||||
|
for (CWalletRef pwallet : vpwallets) {
|
||||||
|
|
||||||
|
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
|
||||||
|
return NullUniValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOCK(pwallet->cs_wallet);
|
||||||
|
|
||||||
|
obj.push_back(pwallet->GetName());
|
||||||
|
}
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
UniValue keepass(const JSONRPCRequest& request)
|
UniValue keepass(const JSONRPCRequest& request)
|
||||||
{
|
{
|
||||||
CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
|
CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
|
||||||
@ -3050,6 +3086,7 @@ static const CRPCCommand commands[] =
|
|||||||
{ "wallet", "listsinceblock", &listsinceblock, false, {"blockhash","target_confirmations","include_watchonly"} },
|
{ "wallet", "listsinceblock", &listsinceblock, false, {"blockhash","target_confirmations","include_watchonly"} },
|
||||||
{ "wallet", "listtransactions", &listtransactions, false, {"account","count","skip","include_watchonly"} },
|
{ "wallet", "listtransactions", &listtransactions, false, {"account","count","skip","include_watchonly"} },
|
||||||
{ "wallet", "listunspent", &listunspent, false, {"minconf","maxconf","addresses","include_unsafe","query_options"} },
|
{ "wallet", "listunspent", &listunspent, false, {"minconf","maxconf","addresses","include_unsafe","query_options"} },
|
||||||
|
{ "wallet", "listwallets", &listwallets, true, {} },
|
||||||
{ "wallet", "lockunspent", &lockunspent, true, {"unlock","transactions"} },
|
{ "wallet", "lockunspent", &lockunspent, true, {"unlock","transactions"} },
|
||||||
{ "wallet", "move", &movecmd, false, {"fromaccount","toaccount","amount","minconf","comment"} },
|
{ "wallet", "move", &movecmd, false, {"fromaccount","toaccount","amount","minconf","comment"} },
|
||||||
{ "wallet", "sendfrom", &sendfrom, false, {"fromaccount","toaddress","amount","minconf","addlocked","comment","comment_to"} },
|
{ "wallet", "sendfrom", &sendfrom, false, {"fromaccount","toaddress","amount","minconf","addlocked","comment","comment_to"} },
|
||||||
|
@ -1163,7 +1163,9 @@ public:
|
|||||||
//! Flush wallet (bitdb flush)
|
//! Flush wallet (bitdb flush)
|
||||||
void Flush(bool shutdown=false);
|
void Flush(bool shutdown=false);
|
||||||
|
|
||||||
//! Verify the wallet database and perform salvage if required
|
//! Responsible for reading and validating the -wallet arguments and verifying the wallet database.
|
||||||
|
// This function will perform salvage on the wallet if requested, as long as only one wallet is
|
||||||
|
// being loaded (CWallet::ParameterInteraction forbids -salvagewallet, -zapwallettxes or -upgradewallet with multiwallet).
|
||||||
static bool Verify();
|
static bool Verify();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2,9 +2,12 @@
|
|||||||
# Copyright (c) 2017 The Bitcoin Core developers
|
# Copyright (c) 2017 The Bitcoin Core developers
|
||||||
# Distributed under the MIT software license, see the accompanying
|
# Distributed under the MIT software license, see the accompanying
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
"""Test multiwallet."""
|
"""Test multiwallet.
|
||||||
|
|
||||||
|
Verify that a bitcoind node can load multiple wallet files
|
||||||
|
"""
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.util import *
|
from test_framework.util import assert_equal, assert_raises_jsonrpc
|
||||||
|
|
||||||
class MultiWalletTest(BitcoinTestFramework):
|
class MultiWalletTest(BitcoinTestFramework):
|
||||||
|
|
||||||
@ -18,20 +21,28 @@ class MultiWalletTest(BitcoinTestFramework):
|
|||||||
w1 = self.nodes[0] / "wallet/w1"
|
w1 = self.nodes[0] / "wallet/w1"
|
||||||
w1.generate(1)
|
w1.generate(1)
|
||||||
|
|
||||||
#accessing wallet RPC without using wallet endpoint fails
|
# accessing wallet RPC without using wallet endpoint fails
|
||||||
assert_raises_jsonrpc(-32601, "Method not found", self.nodes[0].getwalletinfo)
|
assert_raises_jsonrpc(-32601, "Method not found", self.nodes[0].getwalletinfo)
|
||||||
|
|
||||||
#check w1 wallet balance
|
# check w1 wallet balance
|
||||||
walletinfo = w1.getwalletinfo()
|
w1_info = w1.getwalletinfo()
|
||||||
assert_equal(walletinfo['immature_balance'], 500)
|
assert_equal(w1_info['immature_balance'], 500)
|
||||||
|
w1_name = w1_info['walletname']
|
||||||
|
assert_equal(w1_name, "w1")
|
||||||
|
|
||||||
#check w1 wallet balance
|
# check w1 wallet balance
|
||||||
w2 = self.nodes[0] / "wallet/w2"
|
w2 = self.nodes[0] / "wallet/w2"
|
||||||
walletinfo = w2.getwalletinfo()
|
w2_info = w2.getwalletinfo()
|
||||||
assert_equal(walletinfo['immature_balance'], 0)
|
assert_equal(w2_info['immature_balance'], 0)
|
||||||
|
w2_name = w2_info['walletname']
|
||||||
|
assert_equal(w2_name, "w2")
|
||||||
|
|
||||||
w3 = self.nodes[0] / "wallet/w3"
|
w3 = self.nodes[0] / "wallet/w3"
|
||||||
|
w3_name = w3.getwalletinfo()['walletname']
|
||||||
|
assert_equal(w3_name, "w3")
|
||||||
|
|
||||||
|
assert_equal({"w1", "w2", "w3"}, {w1_name, w2_name, w3_name})
|
||||||
|
|
||||||
w1.generate(101)
|
w1.generate(101)
|
||||||
assert_equal(w1.getbalance(), 1000)
|
assert_equal(w1.getbalance(), 1000)
|
||||||
assert_equal(w2.getbalance(), 0)
|
assert_equal(w2.getbalance(), 0)
|
||||||
|
@ -96,6 +96,7 @@ BASE_SCRIPTS= [
|
|||||||
'mempool_spendcoinbase.py',
|
'mempool_spendcoinbase.py',
|
||||||
'mempool_reorg.py',
|
'mempool_reorg.py',
|
||||||
'mempool_persist.py',
|
'mempool_persist.py',
|
||||||
|
'multiwallet.py',
|
||||||
'httpbasics.py',
|
'httpbasics.py',
|
||||||
'multi_rpc.py',
|
'multi_rpc.py',
|
||||||
'proxy_test.py',
|
'proxy_test.py',
|
||||||
|
Loading…
Reference in New Issue
Block a user