-
Notifications
You must be signed in to change notification settings - Fork 37.7k
[wallet] [tests] Add listwallets RPC, include wallet name in getwalletinfo
and add multiwallet test
#10604
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
87b0783
to
5454e5b
Compare
It's good to add the wallet name to I thought the approach we were going to take for multiwallet RPC support was to add some kind of |
Jonas had a suggestion about how we could use different RPC endpoints to access individual wallets here: #8694 (comment) Also more discussion in #8788 |
Sounds good, although I don't think that's relevant for this PR, since it doesn't touch any RPCs that are specific to a single wallet.
I missed that discussion (and can't find mention of |
Deriving the wallet from the RPC endpoint is relevant to this PR if you want getwalletinfo to be able to return information about all wallets without changing it to return an array.
There's no discussion about listwallets, I was just suggesting that as an alternative to making getwalletinfo return an array. |
I agree - last meeting we decided on using RPC endpoints to distinguish wallets. This means that the current wallet RPCs, including Also adding a new |
09d3ee7
to
73f43f1
Compare
@ryanofsky @laanwj - thanks for the useful feedback on the API here. I've updated this PR to add a new The PR still adds Also rebased on master. |
73f43f1
to
af03fe9
Compare
will review |
af03fe9
to
a952c04
Compare
getwalletinfo
and add multiwallet test
rebased |
API makes sense to me tACK 74882ca |
Looks good. |
Yes, good point to bring up. I see there was some discussion of this here: #10650 (comment) . My personal opinion is that wallet name should always equal filename to avoid confusion, but I'm happy to discuss if other people have different ideas. Perhaps one to bring up in tomorrow's meeting? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
src/wallet/wallet.h
Outdated
@@ -1053,7 +1053,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface | |||
//! Flush wallet (bitdb flush) | |||
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ultranit: extra white space
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. fixed
src/wallet/rpcwallet.cpp
Outdated
"For full information on the wallet, use \"getwalletinfo\"\n" | ||
"\nResult:\n" | ||
"[\n" | ||
" \"walletname\": xxxxx, (string) the wallet name\n" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it just prints the wallet name, not a pair
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
quite right. Fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 74882ca0ebc070ba80304e910af4562659e44a1f
src/wallet/rpcwallet.cpp
Outdated
+ HelpExampleRpc("listwallets", "") | ||
); | ||
|
||
LOCK(cs_main); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably should drop the cs_main lock. I don't think we decided what lock will be used to guard the vpwallets array, and no lock is used other places (it's not needed since the list doesn't change after initialization) so it would be inconsistent to add this here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Thanks!
src/wallet/rpcwallet.cpp
Outdated
"For full information on the wallet, use \"getwalletinfo\"\n" | ||
"\nResult:\n" | ||
"[\n" | ||
" \"walletname\": xxxxx, (string) the wallet name\n" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should drop the :xxxx,
here since an array is just a list of items, not key/value pairs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yup. Fixed
Also, should maybe clean up the PR description (remove all caps "EDITED") now that #10786 is merged. |
a952c04
to
011a860
Compare
bah! Unrelated intermittent travis failure. Job restarted. |
UniValue obj(UniValue::VARR); | ||
|
||
for (CWalletRef pwallet : vpwallets) { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit newline
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, agree, but in the interests of getting this merged, I won't change this now that 3707fcd has two ACKs
utACK 3707fcd |
ACK 3707fcd |
…me 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
Nit: No need to run multiwallet.py twice in the test runner ;)
…On Fri, Jul 21, 2017 at 3:38 PM, Wladimir J. van der Laan < ***@***.***> wrote:
Merged #10604 <#10604>.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#10604 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AGGmv-fIgKq7O65mkNaKFX2GC14F91Rvks5sQKnjgaJpZM4N7jWT>
.
|
Oops. Good catch! |
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in #10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
…llet 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 bitcoin#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
44eb9d4 [QA] Avoid running multiwallet.py twice (Jonas Schnelli) Pull request description: It's already on L92. Second script execution was introduced in bitcoin#10604 3707fcd (probably rebase issue) Reported by @MarcoFalke Tree-SHA512: cd2873df08e31cbf5b7a43b5e6713b643b758496d4357dcc99d1c3ad2da07e55f6d69996654d17d3f5484219cb5fd4e32da3bfd94701d1137bc955241d285e57
d5526bd Wrap dumpwallet warning and note scripts aren't dumped (MeshCollider) 3711c6a Add wallet backup text to import*, add* and dumpwallet RPCs (MeshCollider) dbda874 [Wallet] always show help-line of wallet encryption calls (Jonas Schnelli) 20c269b Avoid opening copied wallet databases simultaneously (Russell Yanofsky) e411b70 [wallet] Fix leak in CDB constructor (João Barbosa) f15aeea Change getmininginfo errors field to warnings (Andrew Chow) c04390b Unify help text for GetWarnings output in get*info RPCs (random-zebra) 1d966ce Add warnings field to getblockchaininfo (Andrew Chow) ffcd781 [Trivial] Cleanup after MOVE-ONLY commits (random-zebra) e067235 MOVEONLY: Init functions wallet/wallet.cpp -> wallet/init.cpp (random-zebra) e947eec MOVEONLY: Fee functions wallet/wallet.cpp -> wallet/fees.cpp (random-zebra) 2188c3e Move some static functions out of wallet.h/cpp (random-zebra) f49acf7 [wallet] [moveonly] Move CAffectedKeysVisitor (random-zebra) 8bd979f [wallet] Specify wallet name in wallet loading errors (random-zebra) 900bbfa Reject invalid wallet files (João Barbosa) a1f4e2a Reject duplicate wallet filenames (random-zebra) ee52c2e Fix misleading "Method not found" multiwallet errors (Russell Yanofsky) ce35e1e [Qt] Use wallet 0 in rpc console if running with multiple wallets (random-zebra) 37089d1 [tests] Update wallet_multiwallet.py functional test (random-zebra) 3955ee9 [Doc] Update release notes (random-zebra) 4fd5913 [wallet] [rpc] Add listwallets RPC (John Newbery) 1525281 [wallet] [rpc] print wallet name in getwalletinfo (John Newbery) fdf5da0 [wallet] fix comment for CWallet::Verify() (John Newbery) cf4a90b Remove factor of 3 from definition of dust. (random-zebra) a1c56fd [Policy] Introduce -dustrelayfee (random-zebra) 9fb29cc [Doc] Update multiwallet release notes (random-zebra) 379255e [Tests][Trivial] Add wallet_multiwallet.py to test_runner (random-zebra) 808fbc3 [Bugfix] consider boolean value of -zapwallettxes ParameterInteraction (random-zebra) f9141f8 [QA] Add wallet_multiwallet.py functional test (John Newbery) 2e02006 Rename -usewallet to -rpcwallet (Alex Morcos) a64440b Select wallet based on the given endpoint (Jonas Schnelli) 5683a9c Complete previous commit by moving mn stuff out of libbitcoin_wallet (random-zebra) b0fe92f Fix test_pivx circular dependency issue (random-zebra) 6cb2b92 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli) 7dd3916 Register wallet endpoint (Jonas Schnelli) 5bd1bd7 Properly forbid -salvagewallet and -zapwallettxes for multi wallet. (Alex Morcos) 41a7335 Remove unused variables (practicalswift) 5c3d73f Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings (Russell Yanofsky) e7cafab [Refactoring] Mimic ListCoins for sapling notes (random-zebra) 54fa122 [qt] Move some WalletModel functions into CWallet (random-zebra) 494ba64 [test] Add test for getmemoryinfo (random-zebra) 2394083 [Wallet] unset change position when there is no change on exact match (Gregory Sanders) 7d977ac Remove unused C++ code not covered by unit tests (random-zebra) 60bb4da ApproximateBestSubset should take inputs by reference, not value (Ryan Havar) 3633d75 Initialize nRelockTime (Patrick Strateman) 3a599d0 [Refactor] Return safeTx boolean in CheckTXAvailability (random-zebra) f219be9 Add safe flag to listunspent result (NicolasDorier) 0201065 Add COutput::fSafe member for safe handling of unconfirmed outputs (random-zebra) 75c8c6d Disallow copy of CReserveKeys (Gregory Sanders) 8378322 [Refactor] Replace optional reserveKey in PBF with unique pointer (random-zebra) Pull request description: I think these are all the remaining Bitcoin Core v0.15 PRs in the wallet area that we don't have yet, and are useful to us. I've grouped them here since they are all pretty small, simple, and narrow-focused (on the wallet/rpcwallet files). This changeset is based on top of - [x] #2337 as it keeps going with the multiwallet implementation, adding: - RPC endpoint support - `listwallets` RPC - wallet name in `getwalletinfo` RPC - `wallet_multiwallet.py` functional test As in some areas we are much closer to upstream, some of the commits needed adaptations (especially the functional tests). A couple of commits have been extended to include shield-related code. List of upstream PRs backported/adapted: - bitcoin#9906 : Disallow copy constructor CReserveKeys - bitcoin#9830 : Add safe flag to listunspent result - bitcoin#9993 : Initialize nRelockTime - bitcoin#10108 : ApproximateBestSubset should take inputs by reference, not value - bitcoin#10075 : Remove unused C++ code not covered by unit tests - bitcoin#10257 : Add test for getmemoryinfo - bitcoin#10295 : Move some WalletModel functions into CWallet - bitcoin#10500 : Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings - bitcoin#10522 : Remove unused variables - bitcoin#10816 : Properly forbid -salvagewallet and -zapwallettxes for multi wallet - bitcoin#10849 : Multiwallet: simplest endpoint support - bitcoin#9380 : Separate different uses of minimum fees (only dustRelayFee) - bitcoin#10817 : Redefine Dust and add a discard_rate (only first commit) - bitcoin#10883 : Rename -usewallet to -rpcwallet - bitcoin#10604 : Add listwallets RPC, include wallet name in getwalletinfo + tests - bitcoin#10893 : Avoid running multiwallet.py twice - bitcoin#10870 : Use wallet 0 in rpc console if running with multiple wallets - bitcoin#10931 : Fix misleading "method not found" multiwallet errors - bitcoin#10885 : Reject invalid wallets - bitcoin#11022 : Basic keypool topup - bitcoin#10976 : [MOVEONLY] Move some static functions out of wallet.h/cpp - bitcoin#11310 : Test listwallets RPC - bitcoin#10858 : "errors" to getblockchaininfo + unify "errors" field in get*info RPCs - bitcoin#11492 : Fix leak in CDB constructor - bitcoin#11476 : Avoid opening copied wallet databases simultaneously - bitcoin#11590 : always show help-line of wallet encryption calls - bitcoin#11289 : Add wallet backup text to import* and add* RPCs ACKs for top commit: furszy: re-re-utACK d5526bd. Fuzzbawls: ACK d5526bd Tree-SHA512: 115c4916ee212539b0a1b2cb25783ddf6753f5376de739a084191e874ed8717fff2c7cd9d744e397891f14eaa459ef2f48d675168621ef7316e81758fa6559f2
getwalletinfo
rpclistwallets
rpc - returns array of wallet names