[qt] Move some WalletModel functions into CWallet #10295

ryanofsky · 2017-04-28T21:51:31Z

Motivation for moving these is to make supporting IPC simpler (#10102), so these lookups can be one-shot IPC requests, instead of back-and-forth interactions over the IPC channel.

Also these functions are potentially useful outside of the bitcoin GUI (e.g. for RPCs).

jonasschnelli · 2017-04-28T22:28:36Z

Yes. They belong to CWallet rather then WalletModel. The coincontrol's ListCoins function can potentially be useful for non GUI features. My only nit is if we should rename ListCoins to something more meaningful.

Concept ACK.

TheBlueMatt

Looks good, seems reasonable, though I hope we can delete half the code here (see #10337).

TheBlueMatt · 2017-05-03T21:22:47Z

src/wallet/wallet.cpp

@@ -1983,6 +1990,19 @@ CAmount CWallet::GetLegacyBalance(const isminefilter& filter, int minDepth, cons
    return balance;
 }

+CAmount CWallet::GetAvailableBalance(const CCoinControl* coinControl) const
+{
+    CAmount balance = 0;


nit: might be nice to LOCK here.

Not sure if a lock is required at this point. Do you want to protect const CCoinControl* coinControl?
AvailableCoins() does protect via cs_main/cs_wallet.

We have pointers in the COutput to entires in mapWallet, which can (theoretically) be delted out from under us thanks to the zap rpc.

Added in 14c1174

TheBlueMatt · 2017-05-04T17:02:57Z

src/wallet/wallet.cpp

+                CTxDestination address;
+                if (ExtractDestination(FindNonChangeParentOutput(*it->second.tx, output.n).scriptPubKey, address)) {
+                    result[address].emplace_back(
+                        &it->second, output.n, depth, true /* spendable */, true /* solvable */, false /* safe */);


Why did you change to false for safe here...looks like the old code did true? Does that have any effect?

Why did you change to false for safe here...looks like the old code did true? Does that have any effect?

It has no effect (I'm not even exposing it to Qt any more after 7a7795f in #10244) and false seemed like a more correct value.

TheBlueMatt · 2017-05-04T17:03:55Z

src/qt/walletmodel.cpp

@@ -596,37 +589,11 @@ bool WalletModel::isSpent(const COutPoint& outpoint) const
 void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) const
 {
    std::vector<COutput> vCoins;


We dont need vCoins anymore either, no?

Removed in f8bfecf.

ryanofsky

Squashed 14c1174 -> b6a9cc4 (pr/ipc-move.2 -> pr/ipc-move.3)

ryanofsky · 2017-05-04T20:44:46Z

src/qt/walletmodel.cpp

@@ -596,37 +589,11 @@ bool WalletModel::isSpent(const COutPoint& outpoint) const
 void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) const
 {
    std::vector<COutput> vCoins;


Removed in f8bfecf.

ryanofsky · 2017-05-04T20:44:54Z

src/wallet/wallet.cpp

@@ -1983,6 +1990,19 @@ CAmount CWallet::GetLegacyBalance(const isminefilter& filter, int minDepth, cons
    return balance;
 }

+CAmount CWallet::GetAvailableBalance(const CCoinControl* coinControl) const
+{
+    CAmount balance = 0;


Added in 14c1174

ryanofsky · 2017-05-04T20:44:59Z

src/wallet/wallet.cpp

+                CTxDestination address;
+                if (ExtractDestination(FindNonChangeParentOutput(*it->second.tx, output.n).scriptPubKey, address)) {
+                    result[address].emplace_back(
+                        &it->second, output.n, depth, true /* spendable */, true /* solvable */, false /* safe */);


Why did you change to false for safe here...looks like the old code did true? Does that have any effect?

It has no effect (I'm not even exposing it to Qt any more after 7a7795f in #10244) and false seemed like a more correct value.

TheBlueMatt · 2017-05-05T15:16:58Z

src/qt/test/wallettests.cpp

 {
+    return;


Were you planning on re-enabling this?

Wow, good catch. Fixed in 01f847b. This was just an accident, I didn't mean to disable it at all.

ryanofsky

Squashed 01f847b -> 38d3864 (pr/ipc-move.4 -> pr/ipc-move.5)

ryanofsky · 2017-05-05T15:47:06Z

src/qt/test/wallettests.cpp

 {
+    return;


Wow, good catch. Fixed in 01f847b. This was just an accident, I didn't mean to disable it at all.

TheBlueMatt

utACK 38d3864

TheBlueMatt · 2017-05-05T17:18:38Z

src/qt/walletmodel.cpp

@@ -657,10 +623,7 @@ void WalletModel::listLockedCoins(std::vector<COutPoint>& vOutpts)
 void WalletModel::loadReceiveRequests(std::vector<std::string>& vReceiveRequests)
 {
    LOCK(wallet->cs_wallet);


nit: maybe push this lock down into GetDestValues?

Done in e60a311

TheBlueMatt · 2017-05-05T17:19:05Z

src/wallet/wallet.cpp

@@ -2060,6 +2082,59 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe, const
    }
 }

+std::map<CTxDestination, std::vector<COutput>> CWallet::ListCoins() const
+{
+    std::map<CTxDestination, std::vector<COutput>> result;


nit: might be nice to AssertLockHeld here (because you cant call this without cs_wallet due to the COutput returns).

Not currently possible to just add the assert because Qt doesn't acquire the lock, but I added a todo in fe8c036

ryanofsky

Squashed fe8c036 -> a226c97 (pr/ipc-move.6 -> pr/ipc-move.7)

ryanofsky · 2017-05-09T14:57:49Z

src/qt/walletmodel.cpp

@@ -657,10 +623,7 @@ void WalletModel::listLockedCoins(std::vector<COutPoint>& vOutpts)
 void WalletModel::loadReceiveRequests(std::vector<std::string>& vReceiveRequests)
 {
    LOCK(wallet->cs_wallet);


Done in e60a311

ryanofsky · 2017-05-09T15:02:26Z

src/wallet/wallet.cpp

@@ -2060,6 +2082,59 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe, const
    }
 }

+std::map<CTxDestination, std::vector<COutput>> CWallet::ListCoins() const
+{
+    std::map<CTxDestination, std::vector<COutput>> result;


Not currently possible to just add the assert because Qt doesn't acquire the lock, but I added a todo in fe8c036

Add unit tests for some walletmodel functions that will be refactored & moved in the next commit.

Motivation for moving these is to make supporting IPC simpler (bitcoin#10102), so these lookups can be one-shot IPC requests, instead of back-and-forth interactions over the IPC channel. Also these functions are potentially useful outside of the bitcoin GUI (e.g. for RPCs).

After previous refactoring, the tests make more sense here.

ryanofsky · 2017-05-17T15:34:04Z

Rebased a226c97 -> 108f04f (pr/ipc-move.7 -> pr/ipc-move.8) because of conflict with #8952.

laanwj · 2017-05-23T17:29:45Z

utACK 108f04f

108f04f Add missing LOCK2 in CWallet::GetAvailableBalance (Russell Yanofsky) 429aa9e [test] Move some tests from qt -> wallet (Russell Yanofsky) d944bd7 [qt] Move some WalletModel functions into CWallet (Russell Yanofsky) ef8ca17 [test] Add tests for some walletmodel functions (Russell Yanofsky) Tree-SHA512: f6384d9f2ff3f7fb173d414588c3e7dc8c311b8ed2ce2b0979fb824a0ed83a7302890ccd3d83197f07f6fdcb6b1ca151584d90ea1961d88dfe8956c87087cde8

62b6f0f Add EXCLUSIVE_LOCKS_REQUIRED to CWallet::ListCoins (Russell Yanofsky) 545e85e Add AssertLockHeld assertions in CWallet::ListCoins (Russell Yanofsky) Pull request description: Fixes TODO from #10295 Tree-SHA512: 2dd03a8217e5e1313aa2119cb530e0c0daf3ae3a751b6fdec611df57b8090201a90b52ff05f8f696e978a1344aaf21989d67a03beb5ef6ef79b77be38d04b451

108f04f Add missing LOCK2 in CWallet::GetAvailableBalance (Russell Yanofsky) 429aa9e [test] Move some tests from qt -> wallet (Russell Yanofsky) d944bd7 [qt] Move some WalletModel functions into CWallet (Russell Yanofsky) ef8ca17 [test] Add tests for some walletmodel functions (Russell Yanofsky) Tree-SHA512: f6384d9f2ff3f7fb173d414588c3e7dc8c311b8ed2ce2b0979fb824a0ed83a7302890ccd3d83197f07f6fdcb6b1ca151584d90ea1961d88dfe8956c87087cde8

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

62b6f0f Add EXCLUSIVE_LOCKS_REQUIRED to CWallet::ListCoins (Russell Yanofsky) 545e85e Add AssertLockHeld assertions in CWallet::ListCoins (Russell Yanofsky) Pull request description: Fixes TODO from bitcoin#10295 Tree-SHA512: 2dd03a8217e5e1313aa2119cb530e0c0daf3ae3a751b6fdec611df57b8090201a90b52ff05f8f696e978a1344aaf21989d67a03beb5ef6ef79b77be38d04b451

ryanofsky mentioned this pull request Apr 28, 2017

Refactor: separate gui from wallet and node #10244

Merged

jonasschnelli added Refactoring Wallet labels Apr 28, 2017

TheBlueMatt reviewed May 4, 2017

View reviewed changes

ryanofsky force-pushed the pr/ipc-move branch from 861be88 to 7e9ee91 Compare May 4, 2017 21:25

ryanofsky commented May 4, 2017

View reviewed changes

TheBlueMatt reviewed May 5, 2017

View reviewed changes

ryanofsky force-pushed the pr/ipc-move branch 4 times, most recently from b6a9cc4 to 38d3864 Compare May 5, 2017 15:47

ryanofsky commented May 5, 2017

View reviewed changes

TheBlueMatt reviewed May 5, 2017

View reviewed changes

ryanofsky force-pushed the pr/ipc-move branch from 38d3864 to a226c97 Compare May 9, 2017 19:21

ryanofsky commented May 9, 2017

View reviewed changes

ryanofsky mentioned this pull request May 9, 2017

Multiprocess bitcoin #10102

Draft

ryanofsky added 4 commits May 17, 2017 05:18

[test] Add tests for some walletmodel functions

ef8ca17

Add unit tests for some walletmodel functions that will be refactored & moved in the next commit.

[test] Move some tests from qt -> wallet

429aa9e

After previous refactoring, the tests make more sense here.

Add missing LOCK2 in CWallet::GetAvailableBalance

108f04f

ryanofsky force-pushed the pr/ipc-move branch 2 times, most recently from f696122 to 108f04f Compare May 17, 2017 15:33

laanwj added this to Blockers in High-priority for review May 18, 2017

laanwj merged commit 108f04f into bitcoin:master May 23, 2017

sipa removed this from Blockers in High-priority for review May 23, 2017

ryanofsky mentioned this pull request Apr 6, 2018

Add AssertLockHeld assertions in CWallet::ListCoins #10605

Merged

random-zebra mentioned this pull request Apr 28, 2021

[Wallet] Laggard wallet-related backports from btc 0.15 PIVX-Project/PIVX#2351

Merged

1 task

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[qt] Move some WalletModel functions into CWallet #10295

[qt] Move some WalletModel functions into CWallet #10295

ryanofsky commented Apr 28, 2017

jonasschnelli commented Apr 28, 2017 •

edited

TheBlueMatt left a comment

TheBlueMatt May 3, 2017

jonasschnelli May 4, 2017

TheBlueMatt May 4, 2017

ryanofsky May 4, 2017

TheBlueMatt May 4, 2017

ryanofsky May 4, 2017

TheBlueMatt May 4, 2017

ryanofsky May 4, 2017

ryanofsky left a comment •

edited

ryanofsky May 4, 2017

ryanofsky May 4, 2017

ryanofsky May 4, 2017

TheBlueMatt May 5, 2017

ryanofsky May 5, 2017

ryanofsky left a comment

ryanofsky May 5, 2017

TheBlueMatt left a comment

TheBlueMatt May 5, 2017

ryanofsky May 9, 2017

TheBlueMatt May 5, 2017

ryanofsky May 9, 2017

ryanofsky left a comment

ryanofsky May 9, 2017

ryanofsky May 9, 2017

ryanofsky commented May 17, 2017

laanwj commented May 23, 2017

[qt] Move some WalletModel functions into CWallet #10295

[qt] Move some WalletModel functions into CWallet #10295

Conversation

ryanofsky commented Apr 28, 2017

jonasschnelli commented Apr 28, 2017 • edited

TheBlueMatt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryanofsky left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryanofsky left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheBlueMatt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryanofsky left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryanofsky commented May 17, 2017

laanwj commented May 23, 2017

jonasschnelli commented Apr 28, 2017 •

edited

ryanofsky left a comment •

edited