0.13.2 backports #9264
Merged
0.13.2 backports #9264
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
This was referenced Dec 2, 2016
Merged
OBJCXX's std flags don't get defined by our cxx macro. Rather than hard-coding to c++11, just force OBJCXX to be the same as CXX unless the user specified otherwise. Github-Pull: bitcoin#9169 Rebased-From: 70266e9
Github-Pull: bitcoin#8838 Rebased-From: 5f274a1
When a BIP152 HB-mode peer is in the least preferred position and disconnects, they will not be by ForNode on the next loop. They will continue to sit in that position and prevent deactivating HB mode for peers that are still connected. There is no reason for them to stay in the list if already gone, so drop the first element unconditionally if there are too many. Fixes issue bitcoin#9163. Github-Pull: bitcoin#9199 Rebased-From: ca8549d
Github-Pull: bitcoin#9189 Rebased-From: ad04d1c
Github-Pull: bitcoin#9189 Rebased-From: 95f4a03
In 0.13 orphan transactions began being treated as implicit INVs for their parents. But the resulting getdata were not getting the witness flag. This fixes issue bitcoin#9182 reported by chjj and roasbeef on IRC. Github-Pull: bitcoin#9188 Rebased-From: 5b0150a
laanwj
force-pushed
the
2016_12_backports_0_13
branch
from
65a0770 to
ca1fd75
Compare
Use of node_network here is really meant to be a proxy of "likely to send us blocks in the future". RelevantServices is the right criteria now. Github-Pull: bitcoin#9052 Rebased-From: d32036a
Github-Pull: bitcoin#8896 Rebased-From: 2920be2
Github-Pull: bitcoin#8908 Rebased-From: 164196b
Github-Pull: bitcoin#8920 Rebased-From: 282abd8
Github-Pull: bitcoin#8920 Rebased-From: 6dd3723
This allows using `add-apt-repository`. Github-Pull: bitcoin#8929 Rebased-From: aa9d3c9
Github-Pull: bitcoin#8932 Rebased-From: b0aea80
Github-Pull: bitcoin#8972 Rebased-From: ef0c9ee
Github-Pull: bitcoin#8993 Rebased-From: 1d8e12b
Github-Pull: bitcoin#9042 Rebased-From: fa32619
- `--help`, `--version` etc should exit with `0` i.e. no error ("not enough args" case should still trigger an error)
- error reading config file should exit with `1`
Slightly refactor AppInitRPC/AppInitRawTx to return standard exit codes (EXIT_FAILURE/EXIT_SUCCESS) or CONTINUE_EXECUTION (-1)
Github-Pull: bitcoin#9067
Rebased-From: bd0de13
…agic numbers Github-Pull: bitcoin#9067 Rebased-From: 4441018
Github-Pull: bitcoin#9120 Rebased-From: 45d372f
Fixes bitcoin#9089. Github-Pull: bitcoin#9094 Rebased-From: e760b30
…mplete Github-Pull: bitcoin#9117 Rebased-From: 4662553
None of these are very serious, and are leaks in objects that are created at most one time. In most cases this means properly using the QObject parent hierarchy, except for BanTablePriv/PeerTablePriv which are not QObject, so use a std::unique_ptr instead. Github-Pull: bitcoin#9190 Rebased-From: 47db075
Make ownership of the QThread object clear, so that the RPCConsole can wait for the executor thread to quit before shutdown is called. This increases overall thread safety, and prevents some objects from leaking on exit. Github-Pull: bitcoin#9190 Rebased-From: 693384e
Make splash screen queue its own deletion when it receives the finished command, instead of relying on WA_DeleteOnClose which doesn't work under these circumstances. Github-Pull: bitcoin#9190 Rebased-From: e4f126a
Store a reference to the shutdown window on BitcoinApplication, so that it will be deleted when exiting the main loop. Github-Pull: bitcoin#9190 Rebased-From: 5204598
- Correctly manage the X509 and X509_STORE objects lifetime. Github-Pull: bitcoin#9190 Rebased-From: ed998ea
This change is needed to prevent sync_blocks timeouts in the mempool_reorg test after the sync_blocks update in the upcoming commit "[qa] Change sync_blocks to pick smarter maxheight". This change was initially suggested by Suhas Daftuar <[email protected]> in bitcoin#8680 (comment) Github-Pull: bitcoin#9196 Rebased-From: 67c6326
Make sure that the count is a zero modulo the new mask before scaling, otherwise the next time until a measure triggers will take only 1/2 as long as accounted for. This caused the 'min time' to be potentially off by as much as 100%. Github-Pull: bitcoin#9200 Rebased-From: e0a9cb2
Github-Pull: bitcoin#9224 Rebased-From: 498a1d7
Github-Pull: bitcoin#9253 Rebased-From: 9e1f468
Github-Pull: bitcoin#8950 Rebased-From: 9b0d8ef
there was only one instance of 'mem pool' and not 'mempool', so I changed it to conform to the others Github-Pull: bitcoin#9029 Rebased-From: 1c3ecc7
Github-Pull: bitcoin#9041 Rebased-From: 7f61b49
Github-Pull: bitcoin#8927 Rebased-From: acf853d
Github-Pull: bitcoin#9098 Rebased-From: fae19aa
This helps to skip over resources, which are blocked by regtest bitcoind zombie nodes Github-Pull: bitcoin#9098 Rebased-From: fab0f07
Member
Author
|
Pulled some further backports that weren't tagged but suggested and backported by @luke-jr. |
Member
|
Maybe #9251 as well? |
Github-Pull: bitcoin#9251 Rebased-From: 8a70a9d
Member
Author
Added. |
Github-Pull: bitcoin#9194 Rebased-From: 835c75acaac004c3315395dcd7d1f193dfb9e5da
Github-Pull: bitcoin#9194 Rebased-From: ad5c4c93cae53a2a6f74880ca11b4d788677a378
Contributor
|
I've reviewed all the backports of my commits here, so ACK on that. |
Member
Author
|
Added #9194. @instagibbs I did the backporting yesterday, so if you changed anything important in the rebase I won't have it picked up here. Please check. |
Member
|
@laanwj quick check ACK. Only differences I know about are CTransactionRef and dropped no |
Contributor
|
Tested ACK. |
laanwj
added a commit
that referenced
this pull request
Dec 14, 2016
f26dab7 Adapt ZMQ/rest serialization to take rpcserialversion arg (instagibbs) 21ccb9f Add option to return non-segwit serialization via rpc (Gregory Sanders) a710a43 Improvement of documentation of command line parameter 'whitelist' (wodry) 58eab24 [qa] rpc-tests: Apply random offset to portseed (MarcoFalke) ecd7db5 [qa] test_framework: Exit when tmpdir exists (MarcoFalke) 387ec9d Add script tests for FindAndDelete in pre-segwit and segwit scripts (Johnson Lau) 87fbced Change all instance of 'GMT epoch' to 'Unix epoch' (matthias) b1e978c instance of 'mem pool' to 'mempool' (S. Matthew English) ff55a2d Update gitian signing key of jl2012 (Johnson Lau) 28d0f22 Fix calculation of number of bound sockets to use (Matt Corallo) 396c405 Include select.h when WIN32 is not defined (Ivo van der Sangen) eebc699 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan) 0c09d9f Send tip change notification from invalidateblock (Russell Yanofsky) 6f7841c qt: Avoid OpenSSL certstore-related memory leak (Wladimir J. van der Laan) e5ad693 qt: Avoid shutdownwindow-related memory leak (Wladimir J. van der Laan) e4bea4f qt: Avoid splash-screen related memory leak (Wladimir J. van der Laan) c12f4e9 qt: Prevent thread/memory leak on exiting RPCConsole (Wladimir J. van der Laan) dc46b10 qt: Plug many memory leaks (Wladimir J. van der Laan) ff423cc [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan) 6d70a73 [Qt] fix coincontrol sort issue (Jonas Schnelli) 3fffbf7 Doxygen: Set PROJECT_NAME = "Bitcoin Core" (MarcoFalke) f82c81b fix getnettotals RPC description about timemillis. (Masahiko Hyuga) 6fe3981 net: don't send feefilter messages before the version handshake is complete (Cory Fields) 5f3a12c qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan) 08d1c90 Missed one "return false" in recent refactoring in #9067 (UdjinM6) f27596a Every main()/exit() should return/use one of EXIT_ codes instead of magic numbers (UdjinM6) f85ee01 Fix exit codes: - `--help`, `--version` etc should exit with `0` i.e. no error ("not enough args" case should still trigger an error) - error reading config file should exit with `1` (UdjinM6) 5bcb05d [rpc] ParseHash: Fail when length is not 64 (MarcoFalke) 973ca1e Fix doxygen comment: the transaction is returned in txOut (Pavel Janík) 6f86b53 [Qt] make warnings label selectable (Jonas Schnelli) 106da69 Sync bitcoin-tx with tx version policy (BtcDrak) 12428b4 add software-properties-common (Steven) 40169dc Set minimum required Boost to 1.47.0 (fanquake) c134d92 [build-aux] Boost_Base serial 27 (fanquake) 4a974b2 Simple Update to File 'bitcoin-qt.desktop' (matthias) 975ab12 Update INSTALL landing redirection notice for build instructions. (randy-waterhouse) 3a3bcbf Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell) ca1fd75 Make orphan parent fetching ask for witnesses. (Gregory Maxwell) b96a8f7 [qa] Test getblocktemplate default_witness_commitment (Suhas Daftuar) 99477c7 Always add default_witness_commitment with GBT client support (Pieter Wuille) da5a16b Always drop the least preferred HB peer when adding a new one. (Gregory Maxwell) 094848b log block size and weight correctly. (jnewbery) d1b4da9 build: fix qt5.7 build under macOS (Cory Fields)
Contributor
|
Any reason #9088 is missing? |
Member
|
@rebroad The modal overlay is not in 0.13.2? |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 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.
This backports all the current merged "backport needed" pulls with milestone "0.13.2".
Conflicts:
net: create generic functor accessors and move vNodes to CConnmanMake CBlock::vtx a vector of shared_ptr<CTransaction>Do not shadow variables@gmaxwell @sipa can you take a look at the backports of the above pulls and see if the conflicts were resolved in the right way.