Fix issue #659, and cleanup wallet/command-line argument handling a bit #726
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Forgot to say how I tested: Ran bitcoind normally to get caught up on the block chain, verify that I get more than 8 connections, and verify (by looking at debug.log) that I connect to the dns seeds and IRC. Ran Vidalia on my Mac, got connected to the Tor network. Then removed addr.dat, and re-ran with -proxy... |
destenson
pushed a commit
to destenson/bitcoin--bitcoin
that referenced
this pull request
Jun 26, 2016
ptschip
pushed a commit
to ptschip/bitcoin
that referenced
this pull request
Aug 6, 2017
Basic wallet ui with CLTV coin freeze, watch & spend
kallewoof
pushed a commit
to kallewoof/bitcoin
that referenced
this pull request
Oct 4, 2019
… in initpegoutwallet 5c76fc5 Update initpegoutwallet help to describe derivation paths properly. (Gregory Sanders) 651b28c Fix other bug in initpegoutwallet descriptor parsing (Steven Roose) bf86c44 Temp disable pegout descriptors that are not pkh() (Steven Roose) 19c477e Support descriptors with checksums in initpegoutwallet (Steven Roose) Pull request description: Backport of bitcoin#726. Tree-SHA512: 603c6896f4407c53ef44ebbbab5064827203a1dccaaa8e7e164dfa085a914ef836dde58cfe85877c8c8bccd4aac4f405f42e820a5a8a42caa0ac24bf43e3d475
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This moves all of the "if running over Tor" logic to one place (in init.cpp).
It also fixes issues where settings made in the GUI (like fUseProxy) and stored in the wallet could not be over-ridden in the bitcoin.conf file or command-line, by moving command-line-flag-setting code to after the wallet has been loaded.
That also meant moving the "bind to listen port" to after the wallet was loaded, but that should be OK 99.99% of the time because the lock file is still checked early to protect against accidentally running bitcoin twice.