commits from bitcoin/master #332
Merged
Conversation
This file contains hidden or 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
Changes the maximum upgradewallet version to the latest wallet version number, 159900. Non-HD wallets will be upgraded to use HD derivation. Non HD chain split wallets will be upgraded to HD chain split. If a non-HD wallet is upgraded to HD, the keypool will be entirely regenerated. Since upgradewallet is effectively run during a first run, all of the first run initial setup stuff is combined with the upgrade to HD
After upgrading to HD chain split, we want to continue to use keys from the old keypool. To do this, before we generate any new keys after upgrading, we mark all of the keypool entries as being pre-chain split and move them to a separate pre chain split keypool. Keys are fetched from that keypool until it is emptied. Only then are the new internal and external keypools used.
Bump the wallet version to indicate support for the pre split keypool. Also prevents any wallets from upgrading to versions between HD_SPLIT and PRE_SPLIT_KEYPOOL.
Since 265d7c4, when wait_until() fails, an error message is logged to the test framework log. This means that if wait_until() is called inside a try-except with the expectation that it will fail, a spurious error message is logged. wait_until() shouldn't be called with the expectation of failure. Fix that in p2p_segwit.py.
According to the BerkeleyDB docs, the DbEnv handle may not be accessed after close() has been called. This change ensures that we create a new handle after close() is called. This avoids a segfault when the first connection attempt fails and then a second connection attempt tries to call open() on the already closed DbEnv handle.
Various changes: * Don't check $GCC and $GXX * Prefer -Og instead of -O0 * If -g3 isn't available, use -g This also incidentally fixes compiler warnings with GCC and glibc when using --enable-debug, as the old default values mixed poorly with the hardening flags.
* reading variable 'mapTx' requires holding mutex 'cs' * reading variable 'mapNextTx' requires holding mutex 'cs' * reading variable 'nCheckFrequency' requires holding mutex 'cs'
* writing variable 'nCheckFrequency' requires holding mutex 'cs'
Since -includeconf cannot be used recursively, the user would not see feedback that an -includeconf in an -includeconf'd file was silently ignored.
[qt]: extracts html tags from translator. [qt]: removes missed tr() call.
chain.h does not actually depend on the methods defined in pow.h, just its include of consensus/params.h, which is standalone and can be included instead. Confirmed by inspection and successful build.
…by m_cs_callbacks_pending
FeatherCoin
approved these changes
May 16, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
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.
Enable Travis checking for two Python linting rules we are currently not violating
bitcoin/bitcoin#13214
[wallet] Upgrade path for non-HD wallets to HD
bitcoin/bitcoin#12560
[tests] Remove spurious error log in p2p_segwit.py
bitcoin/bitcoin#13205
Add Clang thread safety annotations for variables guarded by cs_{rpcWarmup,nTimeOffset,warnings}
bitcoin/bitcoin#13116
wallet: Reset BerkeleyDB handle after connection fails
bitcoin/bitcoin#13161
wallet: Add compile time checking for cs_wallet runtime locking assertions
bitcoin/bitcoin#13081
Make --enable-debug to pick better options
bitcoin/bitcoin#13005
wallet: Add Clang thread safety annotations for variables guarded by cs_db
bitcoin/bitcoin#13127
mempool: Fix missing locking in CTxMemPool::check(…) and CTxMemPool::setSanityCheck(…)
bitcoin/bitcoin#11689
util: warn about ignored recursive -includeconf calls
bitcoin/bitcoin#13197
Fix Clang Static Analyzer warnings
bitcoin/bitcoin#12963
[Qt]: Improve sendcoinsdialog readability
bitcoin/bitcoin#13158
Break circular dependency: chain -> pow -> chain
bitcoin/bitcoin#13234
Minor optimizations to bech32::Decode(); add tests.
bitcoin/bitcoin#12881
scheduler: Add Clang thread safety annotations for variables guarded by m_cs_callbacks_pending
bitcoin/bitcoin#13125