/bitcoin

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Reduce inefficiency of GetAccountAddress() #7262

Merged
merged 1 commit into from Jan 22, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Wallet
Projects
None yet
Milestone
No milestone
6 participants
@dooglus @dcousens @pstratem @laanwj @luke-jr @jonasschnelli
@dooglus
Contributor

dooglus commented Dec 29, 2015

  • Don't scan the wallet to see if the current key has been used if we're going to make a new key anyway.
  • Stop scanning the wallet as soon as we see that the current key has been used.
  • Don't call isValid() twice on the current key.
@dooglus
Reduce inefficiency of GetAccountAddress() 
Don't scan the wallet to see if the current key has been used if we're going to make a new key anyway.
Stop scanning the wallet as soon as we see that the current key has been used.
Don't call isValid() twice on the current key.
2409865
@dcousens
Contributor

dcousens commented Dec 29, 2015

utACK
@pstratem
Contributor

pstratem commented Dec 29, 2015

NACK accounts are deprecated

performance improvements for code which will be removed isn't worth it
@dcousens
Contributor

dcousens commented Dec 29, 2015

@pstratem is there a concrete list of deprecations somewhere?
@pstratem
Contributor

pstratem commented Dec 29, 2015

@dcousens #5575
@dcousens
Contributor

dcousens commented Dec 29, 2015

Why do they still exist if they were deprecated prior to 0.11?
Shouldn't they be removed for 0.12?
@dooglus
Contributor

dooglus commented Dec 29, 2015

Luke wrote "merchants and exchanges [...] shouldn't be using Bitcoin Core's wallet implementation at all right now" to which sipa responded "whether they should or not, I'm pretty sure that several do, and we don't want them to stop upgrading their software because we drop a feature".

I guess that's the crux of the matter. Dropping a feature that is in use without offering a replacement feature will cause people to either stop upgrading or worse.
@dcousens
Contributor

dcousens commented Dec 29, 2015

@laanwj this is obviously up to you, but IMHO we should NACK this if it is actually deprecated, then promptly remove all of the accounting features entirely (for 0.13, or even 0.12 if possible, may be too late now though).

If its staying around for a few more versions, then, IMHO, we should maintain it (aka, ACK).
@laanwj
Owner

laanwj commented Jan 4, 2016

No problem with using bitcoin core's wallet implementation, but indeed, the accounts mechanism is going to be removed at some point.
@laanwj
Owner

laanwj commented Jan 4, 2016

In any case that's not a reason for not merging this - this doesn't actually extend the API (which would be problematic) but purports make the current implementation more efficient. If this is code review correct and tested there's no reason not to merge it.
@pstratem
Contributor

pstratem commented Jan 5, 2016

@laanwj if anything we should be making these rpc calls slow in the hope that people notice they're deprecated

@laanwj laanwj added the Wallet label Jan 7, 2016

@luke-jr
Member

luke-jr commented Jan 15, 2016

Note that one reason accounts are not removed yet, is because we have no alternative to getaccountaddress yet... and it's likely this code will get reused in implementing whatever replaces it. So concept ACK.

@luke-jr luke-jr commented on the diff Jan 15, 2016

View full changes
src/wallet/rpcwallet.cpp
- ++it)
- {
- const CWalletTx& wtx = (*it).second;
- BOOST_FOREACH(const CTxOut& txout, wtx.vout)
- if (txout.scriptPubKey == scriptPubKey)
- bKeyUsed = true;
+ if (!bForceNew) {
+ if (!account.vchPubKey.IsValid())
+ bForceNew = true;
+ else {
+ // Check if the current key has been used
+ CScript scriptPubKey = GetScriptForDestination(account.vchPubKey.GetID());
+ for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin();
+ it != pwalletMain->mapWallet.end() && account.vchPubKey.IsValid();
+ ++it)
+ BOOST_FOREACH(const CTxOut& txout, (*it).second.vout)
@luke-jr

luke-jr Jan 15, 2016

Member

Flattening the wtx variable doesn't actually optimise anything, and makes it slightly harder to follow. I'd prefer to not change this aspect.
@luke-jr
Member

luke-jr commented Jan 15, 2016

Also utACK, with mentioned nit.
@jonasschnelli
Member

jonasschnelli commented Jan 20, 2016

utACK.
I agree that we should not extend the account API, but – as long as it's not removed – we should maintain it and should therefore accept optimizations.

@laanwj laanwj merged commit 2409865 into bitcoin:master Jan 22, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jan 22, 2016

@laanwj
Merge #7262: Reduce inefficiency of GetAccountAddress() 
2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
fc08994
@luke-jr
Member

luke-jr commented Jan 30, 2016

Perhaps of interest: BFGMiner uses getaccountaddress, and it adds a 1-2 second delay after finding a block, before it switches to mining the next one... Not sure the optimisations here are sufficient, but we definitely should improve this.
@pstratem
Contributor

pstratem commented Jan 30, 2016

@luke-jr er... why?
@luke-jr
Member

luke-jr commented Jan 30, 2016

Gets a non-reused address without filling the wallet with keys that invalidate backups.

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Feb 13, 2016

@dooglus @luke-jr
Reduce inefficiency of GetAccountAddress() 
Don't scan the wallet to see if the current key has been used if we're going to make a new key anyway.
Stop scanning the wallet as soon as we see that the current key has been used.
Don't call isValid() twice on the current key.

Github-Pull: #7262
Rebased-From: 2409865
fb485f5

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 28, 2016

@luke-jr
Merge #7262 dooglus_faster-getaccountaddress
6bfc2dc

codablock added a commit to codablock/dash that referenced this pull request Sep 16, 2017

@laanwj @codablock
Merge #7262: Reduce inefficiency of GetAccountAddress() 
2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)
03a89b9

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

@laanwj @codablock
Merge #7262: Reduce inefficiency of GetAccountAddress() 
2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)
9ef1bb5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment