-
Notifications
You must be signed in to change notification settings - Fork 38.8k
[0.13] Backports #8772
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[0.13] Backports #8772
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
Github-Pull: bitcoin#8693 Rebased-From: 62ffbbd
Github-Pull: bitcoin#8662 Rebased-From: 46606af
Github-Pull: bitcoin#8528 Rebased-From: bc1d1f2
Github-Pull: bitcoin#8528 Rebased-From: 5547aeb
The value for "other" inputs should be -1 (0xffffffffffffffff) instead of 0 Github-Pull: bitcoin#8667 Rebased-From: 2f2548d
Github-Pull: bitcoin#8678 Rebased-From: 0480293
Github-Pull: bitcoin#8664 Rebased-From: c40b034
Github-Pull: bitcoin#8563 Rebased-From: 878faac
Github-Pull: bitcoin#8683 Rebased-From: df2d2e7
Github-Pull: bitcoin#8673 Rebased-From: 426e7bc
Add statement about MIT licensing to indirectmap.h. I forgot the license preamble when I originally wrote the file. Github-Pull: bitcoin#8414 Rebased-From: d3af342
Github-Pull: bitcoin#8417 Rebased-From: 54af51d
Github-Pull: bitcoin#8427 Rebased-From: 5c9e49d
Github-Pull: bitcoin#8400 Rebased-From: 0ff4375
Github-Pull: bitcoin#8400 Rebased-From: 9bbb414
Github-Pull: bitcoin#8419 Rebased-From: 8bfd708
Github-Pull: bitcoin#8442 Rebased-From: fa4439d
Updating documentation for adding new unit test files Removing unneeded sentence from README Removing uint160_tests.cpp as it DNE Formatting command line instructions to use `` fixing 80 char formatting issue in README fixing more nits Github-Pull: bitcoin#8428 Rebased-From: b8db185
Github-Pull: bitcoin#8392 Rebased-From: 0fd2a33
Github-Pull: bitcoin#8392 Rebased-From: aa59f2e
Github-Pull: bitcoin#8392 Rebased-From: 9d4eb9a
Just a quick run through some docs and fixing some text errors. Github-Pull: bitcoin#8503 Rebased-From: e11f9a2
Github-Pull: bitcoin#8492 Rebased-From: 216d796
Github-Pull: bitcoin#8293 Rebased-From: 8a270b2
Github-Pull: bitcoin#8512 Rebased-From: 6ffd996
…clang-602.0.53) (based on LLVM 3.6.0svn) Github-Pull: bitcoin#8513 Rebased-From: 8194a6e
Github-Pull: bitcoin#8505 Rebased-From: 1aacfc2
Github-Pull: bitcoin#8531 Rebased-From: fa64306
Github-Pull: bitcoin#8461 Rebased-From: 65f4532
Github-Pull: bitcoin#8443 Rebased-From: 7e5d94d
Github-Pull: bitcoin#8607 Rebased-From: fafe7b3
Github-Pull: bitcoin#8625 Rebased-From: 1467561
Fixes building error looking like this: CXX wallet/libbitcoin_wallet_a-db.o wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’: wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous DbEnv(0).remove(strPath.c_str(), 0); ^ wallet/db.cpp:46:16: note: candidates are: In file included from wallet/db.h:21:0, from wallet/db.cpp:6: /usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&) DbEnv(const DbEnv &); ^ /usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV) DbEnv(DB_ENV *dbenv); ^ /usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t) DbEnv(u_int32_t flags); ^ Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1 Github-Pull: bitcoin#8626 Rebased-From: 323a5fe
After bitcoin#8594 the addrFrom sent by a node is not used anymore at all, so don't bother sending it. Also mitigates the privacy issue in (bitcoin#8616). It doesn't completely solve the issue as GetLocalAddress is also called in AdvertiseLocal, but at least when advertising addresses it stands out less as *our* address. Github-Pull: bitcoin#8740 Rebased-From: d9c99c3
Github-Pull: bitcoin#8724 Rebased-From: fad41f3
Homebrew now installs Protobuf version 3 by default, which doesn't currently compile. Install Protobuf 2.6.x from the versions tap instead. Github-Pull: bitcoin#8754 Rebased-From: b16a7f6
Changed 'build' to 'create', as the section name have changed in newer versions of release-process.md Github-Pull: bitcoin#8720 Rebased-From: dad932c
Github-Pull: bitcoin#8742 Rebased-From: c4084c2
Github-Pull: bitcoin#8716 Rebased-From: fa644d0
Github-Pull: bitcoin#8737 Rebased-From: b4fb512
Github-Pull: bitcoin#8701 Rebased-From: 37a7fe9
Github-Pull: bitcoin#8702 Rebased-From: 4677b19
Github-Pull: bitcoin#8676 Rebased-From: 783e930
Years are set according to 'git log' history Github-Pull: bitcoin#8700 Rebased-From: 0766d1c
Github-Pull: bitcoin#8762 Rebased-From: 12a721b
Member
It's not a bug fix, nor critical, so no. Cleanups in general don't need to be backported unless they facilitate later backporting of critical changes, which here is not the case. |
Member
|
utACK b70b4a2, commit list looks good to me. |
Member
|
"commit list looks good to me"-ACK b70b4a2 |
This was referenced Sep 26, 2016
laanwj
added a commit
that referenced
this pull request
Sep 26, 2016
b70b4a2 Trivial: Fix typo (Marty Jones) 702fd2e [copyright] add MIT license headers to .sh scripts where missing (isle2983) a60d7cc [copyright] Add missing copyright headers (isle2983) ea2a6be [copyright] add MIT License copyright header to remaining Python files (isle2983) 9a903f9 [copyright] add MIT License copyright header to zmq_sub.py (isle2983) 084cae9 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík) e34374e [qa] wallet: Check legacy wallet as well (MarcoFalke) d31ac72 Specify Protobuf version 2 in paymentrequest.proto (fanquake) 5e15fce Minor change in section name (Anders Øyvind Urke-Sætre) 0e2c6bd [Doc] Target protobuf 2.6 in OS X build notes. (Michael Ford) da94272 [qa] walletbackup: Sync blocks inside the loop (MarcoFalke) 42ea51a net: No longer send local address in addrMe (Wladimir J. van der Laan) ea51b0f Berkeley DB v6 compatibility fix (Alexey Vesnin) 0a35573 [doc] - clarify statement about parallel jobs in rpc-tests.py (isle2983) 752fbae contrib: Make fix-copyright-headers.py more portable (MarcoFalke) 486650a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke) c18a9ca [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke) 9556745 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan) 4f84082 Set jonasschnellis dns-seeder filter flag (Jonas Schnelli) 863ae74 [doc] Update git-subtree-check.sh README (MarcoFalke) c493f43 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas) cb07f19 CDB: fix debug output (crowning-) 75d5484 Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan) 305d8ac Use __func__ to get function name for output printing (MarcoFalke) 464dedd [Wallet] Trivial cleanup of HD wallet changes (Jonas Schnelli) b17a3f9 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp) a27cdd8 [qa] abandonconflict: Use assert_equal (MarcoFalke) befe654 various typos (leijurv) 4e5fc31 Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin) 156e305 Corrected JSON typo on setban of net.cpp (Sev) fa5b249 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr) 8b0bdd3 configure: Allow building bench_bitcoin by itself (Luke Dashjr) 749c8a5 [doc] typos, READMEs, comments (Justin Camarena) fc34928 Do diskspace check before import thread is started (Pieter Wuille) 3b354d2 Add extra message to avoid a long 'Loading banlist' (Pieter Wuille) 30eac2d Use a signal to continue init after genesis activation (Pieter Wuille) 9b00979 Update README.md (Chris Stewart) 8bb1efd [qa] Rework hd wallet dump test (MarcoFalke) a7aa3cc Enable size accounting in mining unit tests (Suhas Daftuar) bea02dc [qa]: enable rpcbind_test (whythat) e111904 [qa]: add parsing for '<host>:<port>' argument form to rpc_url() (whythat) 69d1cd2 net: Ignore `notfound` P2P messages (Wladimir J. van der Laan) f70be14 [QA] Add walletdump RPC test (including HD- & encryption-tests) (Jonas Schnelli) 1f21d16 prepend license statement to indirectmap (Kaz Wesley) 03b0196 Fix obvious assignment/equality error in test (Jeremy Rubin) 8a7d7ff update name of file bitcoin.qrc (Gaurav Rana) 147003c Add configure check for -latomic (Anthony Towns) 091cdeb Clear witness with vin/vout in CWallet::CreateTransaction() (Suhas Daftuar) 8e03382 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee (Jonas Schnelli) 6b07362 Fix SIGHASH_SINGLE bug in test_framework SignatureHash (Johnson Lau) a114a02 p2psegwit.py transaction is rejected due to premature witness not size (instagibbs) 3606b6b Update p2p-segwit.py to reflect correct AskFor behavior (instagibbs) 733760a Update btcdrak signing key (BtcDrak) c6a6291 add witness address to address book (instagibbs)
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.
Bugfixes, QA, and copyright headers (checked that no old/removed code needed approval)
One thing it's missing is removal of the qt4.6 depends package. Not sure if that should be backported or not.
Current to master as of 1c24d5f