Port code base to Bitcoin Core 0.13.2 #450
Merged
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
Github-Pull: bitcoin#9168 Rebased-From: 307acdd
Increase wallet-dump RPC timeout from 30 seconds to 1 minute. This avoids a
timeout error that seemed to happen regularly (around 50% of builds) on a
particular jenkins server during the first getnewaddress RPC call made by the
test.
The failing stack trace looked like:
Unexpected exception caught during testing: timeout('timed out',)
File ".../bitcoin/qa/rpc-tests/test_framework/test_framework.py", line 146, in main
self.run_test()
File ".../bitcoin/qa/rpc-tests/wallet-dump.py", line 73, in run_test
addr = self.nodes[0].getnewaddress()
File ".../bitcoin/qa/rpc-tests/test_framework/coverage.py", line 49, in __call__
return_val = self.auth_service_proxy_instance.__call__(*args, **kwargs)
File ".../bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 145, in __call__
response = self._request('POST', self.__url.path, postdata.encode('utf-8'))
File ".../bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 121, in _request
return self._get_response()
File ".../bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 160, in _get_response
http_response = self.__conn.getresponse()
File "/usr/lib/python3.4/http/client.py", line 1171, in getresponse
response.begin()
File "/usr/lib/python3.4/http/client.py", line 351, in begin
version, status, reason = self._read_status()
File "/usr/lib/python3.4/http/client.py", line 313, in _read_status
line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1")
File "/usr/lib/python3.4/socket.py", line 374, in readinto
return self._sock.recv_into(b)
Github-Pull: bitcoin#9077
Rebased-From: 8463aaa
Replace previous timeout('timed out',) exception with more detailed error.
Github-Pull: bitcoin#9077
Rebased-From: e89614b
Make a copy of the boost time-point to wait for, otherwise the head of the queue may be deleted by another thread while this one is waiting, while the boost function still has a reference to it. Although this problem is in non-test code, this is not an actual problem outside of the tests because we use the thread scheduler with only one service thread, so there will never be threads fighting at the head of the queue. The old boost fallback escapes this problem because it passes a scalar value to wait_until instead of a const object reference. Found by running the tests in LLVM-4.0-master asan. Github-Pull: bitcoin#9186 Rebased-From: 12519bf
Change check_announcement_of_new_block() to wait specifically for the announcement of the newly created block, instead of waiting for any announcement at all. A difficult to reproduce failure in check_announcement_of_new_block() that happened in a travis build (https://travis-ci.org/bitcoin/bitcoin/jobs/175198367) might have happened because an older announcement was mistaken for the expected one. The error looked like: Assertion failed: Failed File ".../bitcoin/qa/rpc-tests/test_framework/test_framework.py", line 145, in main self.run_test() File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 787, in run_test self.test_sendcmpct(self.nodes[1], self.segwit_node, 2, old_node=self.old_node) File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 201, in test_sendcmpct check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None and p.last_inv is not None) File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 194, in check_announcement_of_new_block assert(predicate(peer)) This commit also changes the assertion failed message above to include more detailed information for debug. Github-Pull: bitcoin#9159 Rebased-From: dfa44d1
Bug caused the wait_for_block_announcement to be called on the wrong node, leading to nondeterminism and occasional test failures. Bug was introduced in merge commit: d075479 Merge bitcoin#8882: [qa] Fix race conditions in p2p-compactblocks.py and sendheaders.py Underlying commits which conflicted were: 27acfc1 [qa] Update p2p-compactblocks.py for compactblocks v2 6976db2 [qa] Another attempt to fix race condition in p2p-compactblocks.py The first commit changed the test_compactblock_construction function signature and second commit added code which wasn't updated during the merge to use the new arguments. Suhas Daftuar <sdaftuar@chaincode.com> noticed the bug and suggested the fix. Github-Pull: bitcoin#9058 Rebased-From: 47e9659
Clear test_node.last_block before requesting blocks in the compactblocks_not_at_tip test so comparisons won't fail if a blocks were received before the test started. The bug doesn't currently cause any problems due to the order tests run, but this will change in the next commit. Github-Pull: bitcoin#9058 Rebased-From: 55bfddc
Github-Pull: bitcoin#8637 Rebased-From: 02a337d
Unit test adaptations by Pieter Wuille. Github-Pull: bitcoin#8637 Rebased-From: fe998e9
Github-Pull: bitcoin#8637 Rebased-From: b2e93a3
Github-Pull: bitcoin#8637 Rebased-From: 3ac6de0
The current getblocktxn implementation drops and ignores requests for old blocks, which causes occasional sync_block timeouts during the p2p-compactblocks.py test as reported in bitcoin#8842. The p2p-compactblocks.py test setup creates many new blocks in a short period of time, which can lead to getblocktxn requests for blocks below the hardcoded depth limit of 10 blocks. This commit changes the getblocktxn handler not to ignore these requests, so the peer nodes in the test setup will reliably be able to sync. The protocol change is documented in BIP-152 update "Allow block responses to getblocktxn requests" at bitcoin/bips#469. The protocol change is not expected to affect nodes running outside the test environment, because there shouldn't normally be lots of new blocks being rapidly added that need to be synced. Github-Pull: bitcoin#9058 Rebased-From: dac53b5 Github-Pull: bitcoin#9160 Rebased-From: ec34648
When generating a new service key, explicitly request a RSA1024 one. The bitcoin P2P protocol has no support for the longer hidden service names that will come with ed25519 keys, until it does, we depend on the old hidden service type so make this explicit. See bitcoin#9214. Rebased-From: 7d3b627 Github-Pull: bitcoin#9234
This reverts commit caf6150. getaddrinfo_a has a nasty tendency to segfault internally in its background thread, on every version of glibc I tested, especially under helgrind. See https://sourceware.org/bugzilla/show_bug.cgi?id=20874 Github-Pull: bitcoin#9229 Rebased-From: 10ae7a7
e846166 Modify getblocktxn handler not to drop requests for old blocks (Russell Yanofsky) 2cad5db Align constant names for maximum compact block / blocktxn depth (Pieter Wuille) 3d23a0e Add cmpctblock to debug help list (instagibbs) 76ba1c9 More agressively filter compact block requests (Matt Corallo) 36e3b95 Dont remove a "preferred" cmpctblock peer if they provide a block (Matt Corallo) 286e548 [qa] Fix stale data bug in test_compactblocks_not_at_tip (Russell Yanofsky) 2ba5d78 [qa] Fix bug in compactblocks v2 merge (Russell Yanofsky) eca9b46 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky) dccdc3a test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan) da4926b [qa] Add more helpful RPC timeout message (Russell Yanofsky) 1d4c884 [qa] Increase wallet-dump RPC timeout (Russell Yanofsky) 3107280 [qa] add assert_raises_message to check specific error message (mrbandrews)
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
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
…stors, sanity check txn before ATMP e1ff0db reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders) 4bf2bec Test for fix of txn chaining in wallet (Gregory Sanders) f00066a CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders) bdd6d4c SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders)
77eaadb doc: Clean out release notes on 0.13.x branch (Wladimir J. van der Laan) 0d71914 doc: Remove ... from release notes (Wladimir J. van der Laan) da233db Bump man pages (MarcoFalke) 3882c05 [qt] Bump BLOCK_CHAIN_SIZE (MarcoFalke) 7a26a34 Bump nMinimumChainWork (MarcoFalke) 20817ce Bump version to 0.13.2 (MarcoFalke) 8e707e8 doc: Add bitcoin#9382 to release notes (Wladimir J. van der Laan) e1ff0db reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders) 4bf2bec Test for fix of txn chaining in wallet (Gregory Sanders) f00066a CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders) bdd6d4c SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders) 7201dd7 qt: Pre-rc1 translations update (Wladimir J. van der Laan) 2c5fc0d doc: Add initial pulls + authors list for 0.13.2 (Wladimir J. van der Laan) 49a612f [qa] Don't set unknown rpcserialversion (MarcoFalke) c365556 Complain when unknown rpcserialversion is specified (Pieter Wuille) f5d606e Return txid even if ATMP fails for new transaction (Pieter Wuille) 35174a0 Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell) a0f7ece Update for OpenSSL 1.1 API (Gregory Maxwell) 43bcfca [Wallet] Bugfix: FRT: don't terminate when keypool is empty (Jonas Schnelli) 0cc07f8 [QA] add fundrawtransaction test on a locked wallet with empty keypool (Jonas Schnelli) 53b656f [qa] Update compactblocks test for multi-peer reconstruction (Suhas Daftuar) 4ced313 Allow compactblock reconstruction when block is in flight (Suhas Daftuar) 64dfdde Squashed 'src/secp256k1/' changes from 6c527ec..8225239 (MarcoFalke) 57aec3b Add release notes for wallet/mempool rejections. (PR bitcoin#9302 and bitcoin#9290) (Gregory Maxwell) 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 bitcoin#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) 5998a09 IsInitialBlockDownload no longer uses header-only timestamps. (Gregory Maxwell) 5b93eee Remove GetTotalBlocksEstimate and checkpoint tests that test nothing. (Gregory Maxwell) ad20cdd IBD check uses minimumchain work instead of checkpoints. (Gregory Maxwell) 4c71fc4 Remove duplicate nBlocksEstimate cmp (we already checked IsIBD()) (Matt Corallo) 3688866 Disable fee estimates for a confirm target of 1 block (Alex Morcos) e846166 Modify getblocktxn handler not to drop requests for old blocks (Russell Yanofsky) 2cad5db Align constant names for maximum compact block / blocktxn depth (Pieter Wuille) 3d23a0e Add cmpctblock to debug help list (instagibbs) 76ba1c9 More agressively filter compact block requests (Matt Corallo) 36e3b95 Dont remove a "preferred" cmpctblock peer if they provide a block (Matt Corallo) 286e548 [qa] Fix stale data bug in test_compactblocks_not_at_tip (Russell Yanofsky) 2ba5d78 [qa] Fix bug in compactblocks v2 merge (Russell Yanofsky) eca9b46 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky) dccdc3a test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan) da4926b [qa] Add more helpful RPC timeout message (Russell Yanofsky) 1d4c884 [qa] Increase wallet-dump RPC timeout (Russell Yanofsky) 3107280 [qa] add assert_raises_message to check specific error message (mrbandrews) b172377 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo) 94531b5 torcontrol: Explicitly request RSA1024 private key (Wladimir J. van der Laan) Conflicts: src/bitcoind.cpp src/qt/bitcoin.cpp
|
This still needs some tweaks, e.g. here: https://travis-ci.org/OmniLayer/omnicore/jobs/190282352#L1494 |
A recent patch of 0.13.2 changed the constructor of GUIUtil::TableViewLastColumnResizingFixer.
dexX7
force-pushed
the
0.2-port-0.13.2
branch
from
c02214d
to
162429e
Compare
|
I fixed one remaining issue via 162429e, but there is still an issue with the RPC tests, and right now I can't figure out what's causing it. When I run the whole test suite, at some point it crashes, but when running these tests isolated, they all pass.. I'm waiting for some feedback from @msgilligan. |
TODO: - use new format, when BitcoinJ is ready
|
Last issue resolved via 8d8d0bf. Ready for review. @zathras-crypto :) |
|
Awesome thanks for prepping this @dexX7... I'm testing now - given these are all commits to the underlying Bitcoin source I wouldn't need to test each individual commit I believe? Thanks |
|
Yup, they are directly taken from the 0.13 Bitcoin Core branch. :) |
|
Been testing this out for a few days, haven't noticed anything unusual, looks good - OK to merge :) Thanks bud :) |
dexX7
added a commit
that referenced
this pull request
Jan 23, 2017
8d8d0bf Use non-segwit serialization for RPC tests (dexX7) 162429e Fix initialization of GUIUtil::TableViewLastColumnResizingFixer (dexX7) 0d71914 doc: Remove ... from release notes (Wladimir J. van der Laan) da233db Bump man pages (MarcoFalke) 3882c05 [qt] Bump BLOCK_CHAIN_SIZE (MarcoFalke) 7a26a34 Bump nMinimumChainWork (MarcoFalke) 20817ce Bump version to 0.13.2 (MarcoFalke) 8e707e8 doc: Add bitcoin#9382 to release notes (Wladimir J. van der Laan) e1ff0db reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders) 4bf2bec Test for fix of txn chaining in wallet (Gregory Sanders) f00066a CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders) bdd6d4c SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders) 7201dd7 qt: Pre-rc1 translations update (Wladimir J. van der Laan) 2c5fc0d doc: Add initial pulls + authors list for 0.13.2 (Wladimir J. van der Laan) 49a612f [qa] Don't set unknown rpcserialversion (MarcoFalke) c365556 Complain when unknown rpcserialversion is specified (Pieter Wuille) f5d606e Return txid even if ATMP fails for new transaction (Pieter Wuille) 35174a0 Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell) a0f7ece Update for OpenSSL 1.1 API (Gregory Maxwell) 43bcfca [Wallet] Bugfix: FRT: don't terminate when keypool is empty (Jonas Schnelli) 0cc07f8 [QA] add fundrawtransaction test on a locked wallet with empty keypool (Jonas Schnelli) 53b656f [qa] Update compactblocks test for multi-peer reconstruction (Suhas Daftuar) 4ced313 Allow compactblock reconstruction when block is in flight (Suhas Daftuar) 64dfdde Squashed 'src/secp256k1/' changes from 6c527ec..8225239 (MarcoFalke) 57aec3b Add release notes for wallet/mempool rejections. (PR bitcoin#9302 and bitcoin#9290) (Gregory Maxwell) 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 bitcoin#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) 5998a09 IsInitialBlockDownload no longer uses header-only timestamps. (Gregory Maxwell) 5b93eee Remove GetTotalBlocksEstimate and checkpoint tests that test nothing. (Gregory Maxwell) ad20cdd IBD check uses minimumchain work instead of checkpoints. (Gregory Maxwell) 4c71fc4 Remove duplicate nBlocksEstimate cmp (we already checked IsIBD()) (Matt Corallo) 3688866 Disable fee estimates for a confirm target of 1 block (Alex Morcos) e846166 Modify getblocktxn handler not to drop requests for old blocks (Russell Yanofsky) 2cad5db Align constant names for maximum compact block / blocktxn depth (Pieter Wuille) 3d23a0e Add cmpctblock to debug help list (instagibbs) 76ba1c9 More agressively filter compact block requests (Matt Corallo) 36e3b95 Dont remove a "preferred" cmpctblock peer if they provide a block (Matt Corallo) 286e548 [qa] Fix stale data bug in test_compactblocks_not_at_tip (Russell Yanofsky) 2ba5d78 [qa] Fix bug in compactblocks v2 merge (Russell Yanofsky) eca9b46 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky) dccdc3a test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan) da4926b [qa] Add more helpful RPC timeout message (Russell Yanofsky) 1d4c884 [qa] Increase wallet-dump RPC timeout (Russell Yanofsky) 3107280 [qa] add assert_raises_message to check specific error message (mrbandrews) b172377 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo) 94531b5 torcontrol: Explicitly request RSA1024 private key (Wladimir J. van der Laan)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 pull request merges/ports Bitcoin Core 0.13.2 into our code base.
There were two minor conflicts due to the renaming of "Bitcoin Core" to "Omni Core", otherwise the merge was clean.
See https://github.com/bitcoin/bitcoin/blob/v0.13.2/doc/release-notes.md for the release notes.