[Wallet] Watch-only fixes #4937

pull cozz wants to merge 1 commits into bitcoin:master from cozz:cozz10 changing 10 files +70 −13

cozz commented at 12:51 AM on September 18, 2014: contributor
- prevent importaddress if the wallet already contains the private key
- remove from watchonly, if you import the private key. (note that you need to restart to get the correct eye-icons in this scenario as updating dynamically would require some more fiddling with signals etc.)
- do not add locked watchonly to coincontrol. (we shouldnt allow locking watchonly in the first place, but thats for another pull)
- remove LOCKs from rpcdump.cpp for consistence
- add filter to GetCredit, fixes #4870 (also revert the 1 line from #4825 where we changed the filter to bool)
BitcoinPullTester commented at 1:05 AM on September 18, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4937_97eea5856978340f9b683d99fc4566e3e320e2bb/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
Diapolo commented at 5:33 AM on September 18, 2014: none

I always wondered how I can remove a watch-only address, can you explain @cozz?
laanwj commented at 7:27 AM on September 18, 2014: member

@Diapolo You can't. Bitcoin Core has no concept of removing anything from the wallet.
laanwj added the label Wallet on Sep 18, 2014
laanwj commented at 11:09 AM on September 23, 2014: member

Untested ACK
cozz commented at 1:03 PM on September 30, 2014: contributor

@wtogami We acquire the lock globally in rpcserver.cpp. We should remove them here, because otherwise they are confusing people...
sipa commented at 2:21 AM on October 2, 2014: member

Needs rebase.

in src/wallet.h:None in 97eea58569 outdated

 714 | -            return nCreditCached;
 715 | -        nCreditCached = pwallet->GetCredit(*this, ISMINE_ALL);
 716 | -        fCreditCached = true;
 717 | -        return nCreditCached;
 718 | +        int64_t credit = 0;
 719 | +        if(filter & ISMINE_SPENDABLE)

sipa commented at 2:22 AM on October 2, 2014:

Coding style (space after if).

sipa commented at 2:22 AM on October 2, 2014: member

Concept ACK.
wtogami referenced this in commit 293ec17dc7 on Oct 2, 2014
[Wallet] Watch-only fixes ccca27a788
cozz force-pushed on Oct 3, 2014
cozz commented at 3:22 AM on October 3, 2014: contributor

rebased
laanwj merged this on Oct 13, 2014
laanwj closed this on Oct 13, 2014
laanwj referenced this in commit d7e1950483 on Oct 13, 2014
wtogami referenced this in commit 770fa122d6 on Nov 14, 2014
wtogami referenced this in commit cb3d1359e2 on Dec 23, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#4825 Compiler warning C4800: 'type' forcing value to bool 'true' or 'false' (performance warning)#4870 gettransaction RPC always includes watchonly in credit calculation?