Backport missing PRs from Bitcoin 0.14 - Part 3 #1848
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
1d635ae fix op order to append first alert (rodasmith)
1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
1111ddb gitignore: Remove unused lines (MarcoFalke)
fa27d99 [qa] create_cache: Delete temp dir when done (MarcoFalke)
fad41f3 [qa] walletbackup: Sync blocks inside the loop (MarcoFalke)
…enabled fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
b16a7f6 [Doc] Target protobuf 2.6 in OS X build notes. (Michael Ford)
dad932c Minor change in section name (Anders Øyvind Urke-Sætre)
c4084c2 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
fa644d0 [qa] wallet: Check legacy wallet as well (MarcoFalke)
f3552da net: fix maxuploadtarget setting (Cory Fields)
…v), not on block files. b4fb512 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
…mq_sub.py 37a7fe9 [copyright] add MIT License copyright header to zmq_sub.py (isle2983)
…emaining Python files 4677b19 [copyright] add MIT License copyright header to remaining Python files (isle2983)
d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
783e930 [copyright] Add missing copyright headers (isle2983)
…s where missing 0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
faddd62 init: Get rid of some ENABLE_WALLET (MarcoFalke)
2ca6b9d Remove last reference to CWalletDB from accounting_tests.cpp (Patrick Strateman) 02e2a81 Remove pwalletdb parameter from CWallet::AddAccountingEntry (Patrick Strateman) d2e678d Add CWallet::ReorderTransactions and use in accounting_tests.cpp (Patrick Strateman) 59adc86 Add CWallet::ListAccountCreditDebit (Patrick Strateman)
…ple value queries 1586044 [Qt] RPC-Console: support nested commands and simple value queries (Jonas Schnelli)
12a721b Trivial: Fix typo (Marty Jones)
… removeprunedfunds c6f5ca8 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
04d91f4 Trivial: Fix ISO URL, capitalization (unsystemizer)
…elease-process needs to be updated 6f933c6 Trivial Bugfix: doc/gitian-building.md: Link to release-process needs to be updated (Luke Dashjr)
6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)
7c069a7 Do not shadow global variable (Pavel Janík)
faf87af [contrib] delete qt_translations.py (MarcoFalke)
fa13c5c [share] remove qt/protobuf.pri (MarcoFalke)
fa81d09 [contrib] Delete spendfrom (MarcoFalke)
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
f839350 Do not shadow in src/qt (Pavel Janík)
…tises itself. 6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
fa427ce [qa] pull-tester: Only print output when failed (MarcoFalke)
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
4b67402 Mandatory copyright agreement (Andrew Chow)
3f58a28 [Doc] Add missing autogen to example builds (Amir Abrams)
faa91bc CONTRIBUTING: Mention not to open several pulls (MarcoFalke)
edeaf24 Fix future copyright year (Mitchell Cash)
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
381826d bitcoin-cli: More detailed error reporting (Wladimir J. van der Laan)
c14ffd5 [trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
4731cab Do not shadow variables (Pavel Janík)
…eption 42f6aed tests: Add exception error message for JSONRPCException (Wladimir J. van der Laan)
Use correct genesis transaction hash
Changes in start_node args result in warnings being printed to stderr
UdjinM6
requested changes
Jan 11, 2018
src/init.cpp
Outdated
|
|
||
| nWalletBackups = GetArg("-createwalletbackups", 10); | ||
| nWalletBackups = std::max(0, std::min(10, nWalletBackups)); | ||
| std::string strWarning; |
There was a problem hiding this comment.
We can't just throw !fDisableWallet away here - IMO this autobackup part (L1244-L1257) should be wrapped into a separate function in CWallet which should start with smth like if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) return true; (similar to other functions modified by 06f41f3 init: Get rid of fDisableWallet) to preserve existing logic and follow the idea of newly introduced changes at the same time.
There was a problem hiding this comment.
Agree and updated PR. I left keePassInt.init() untouched because it doesn't do any logic beside getting some value from command line.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Continuation of #1770