aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-14Merge #9211: [0.12 branch] Backportsv0.12-finalWladimir J. van der Laan
d609895 [Wallet] Bugfix: FRT: don't terminate when keypool is empty (Jonas Schnelli) 8dee97f [QA] add fundrawtransaction test on a locked wallet with empty keypool (Jonas Schnelli) 82e29e8 torcontrol: Explicitly request RSA1024 private key (Wladimir J. van der Laan) cca151b Send tip change notification from invalidateblock (Russell Yanofsky) ad99a79 [rpcwallet] Don't use floating point (MarcoFalke)
2016-12-07[Wallet] Bugfix: FRT: don't terminate when keypool is emptyJonas Schnelli
Github-Pull: #9295 Rebased-From: c24a4f5981d47d55aa9e4eb40294832a4d38fb80
2016-12-07[QA] add fundrawtransaction test on a locked wallet with empty keypoolJonas Schnelli
Github-Pull: #9295 Rebased-From: 1a6eacbf3b7e3d5941fec1154079bbc4678ce861
2016-11-30torcontrol: Explicitly request RSA1024 private keyWladimir J. van der Laan
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 #9214. Github-Pull: #9234 Rebased-From: 7d3b627395582ae7c9d54ebdbc68096d7042162b
2016-11-23Send tip change notification from invalidateblockRussell Yanofsky
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 <sdaftuar@chaincode.com> in https://github.com/bitcoin/bitcoin/pull/8680#r78209060 Github-Pull: #9196 Rebased-From: 67c6326abd1788e6f411feb4f44b69774e76aae2
2016-11-23[rpcwallet] Don't use floating pointMarcoFalke
Github-Pull: #8317 Rebased-From: 477777f2503e3a56a267556f0fc5091042d93340
2016-09-01Merge #8176: [0.12.x]: Versionbits: GBT supportWladimir J. van der Laan
db4bacf getblocktemplate: Use version/force mutation to support pre-BIP9 clients (Luke Dashjr) 65ee332 getblocktemplate: Explicitly handle the distinction between GBT-affecting softforks vs not (Luke Dashjr) 40e81f5 qa/rpc-tests: bip9-softforks: Add tests for getblocktemplate versionbits updates (Luke Dashjr) ddd8c01 Implement BIP 9 GBT changes (Luke Dashjr)
2016-08-31Merge #8187: [0.12.2] backport: [qa] Switch to py3Wladimir J. van der Laan
2826565 [qa] Switch to py3 (MarcoFalke)
2016-07-15[qa] Switch to py3MarcoFalke
Github-Pull: #7814 Rebased-From: fa389d4edc367073e2ccc6d1f0790c4b72ba17f2
2016-07-11Merge #8302: 0.12.2: [Qt] Disable some menu items during ↵Wladimir J. van der Laan
splashscreen/verification state fe98533 [Qt] Disable some menu items during splashscreen/verification state (Jonas Schnelli)
2016-07-11Merge #8318: [0.12] Backport "Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY #7540"Wladimir J. van der Laan
c4e5688 Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests (BtcDrak) ac5577b Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY (BtcDrak)
2016-07-08Rename NOP3 to CHECSEQUENCEVERIFY in rpc testsBtcDrak
2016-07-08Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFYBtcDrak
2016-07-04[Qt] Disable some menu items during splashscreen/verification stateJonas Schnelli
Github-Pull: #8042 Rebased-From: 276ce84fd3a9561a11ae4c5a00c71ff44d3a59a9
2016-06-28Merge #8148: Backport leveldb build integration to 0.12Wladimir J. van der Laan
9462e79 This is a cherry-pick of 89c844d back to 0.12. (Johnathan Corgan) 932aedd Cherry-pick of f59dceb (#7925) to 0.12. (Johnathan Corgan) 03c709b Backport leveldb build integration to 0.12 (Johnathan Corgan)
2016-06-22Merge #8236: [doc] 0.12.2: prepare release notesWladimir J. van der Laan
ffff324 [doc] 0.12: prepare release notes (MarcoFalke)
2016-06-22[doc] 0.12: prepare release notesMarcoFalke
2016-06-21Merge #8230: Fix LogPrint to LogPrintfWladimir J. van der Laan
ba61949 Fix LogPrint to LogPrintf (TheLazieR Yip)
2016-06-21Fix LogPrint to LogPrintfTheLazieR Yip
Printing Log without category defined should use LogPrintf
2016-06-20Merge #8185: [0.12.2] Various qa and test backportsWladimir J. van der Laan
dc38a53 [qa] Move create_tx() to util.py (MarcoFalke) c0fe8b5 [qa] smartfees: Properly use ordered dict (MarcoFalke) 493b89e [qa] test_framework: Properly print exceptions and assert empty dict (MarcoFalke) 7a83489 Tests: Fix deserialization of reject messages (Suhas Daftuar) e0b1bbe [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke) 697ed8c Check if zmq is installed in tests, update docs (Elliot Olds) d5a9de3 tests: Check Content-Type header returned from RPC server (Wladimir J. van der Laan) ed2f0e3 [qa] maxblocksinflight: Actually enable test (MarcoFalke) 3036282 [qa] httpbasics: Actually test second connection (MarcoFalke) afbc000 test_framework: python3.4 authproxy compat (Wladimir J. van der Laan) 80b6bfa test_framework: detect failure of bitcoind startup (Wladimir J. van der Laan) 4ffd309 Create SingleNodeConnCB class for RPC tests (Alex Morcos) 4fd6008 travis: 'make check' in parallel and verbose (Cory Fields) 2d2b045 Reenable multithread scheduler test (Pavel Janík) 658307e test: Add more thorough test for dbwrapper iterators (Wladimir J. van der Laan)
2016-06-10[qa] Move create_tx() to util.pyMarcoFalke
(cherry picked from commit fa8cd46f39778925eaf2caf812cccd9fb8503368)
2016-06-10[qa] smartfees: Properly use ordered dictMarcoFalke
Github-Pull: #7980 Rebased-From: fa17f93fbd2889c020849b941a94c5bd8a619a3c 43bbcd075355630544a530f3cc52014edb3787b2
2016-06-10[qa] test_framework: Properly print exceptions and assert empty dictMarcoFalke
Github-Pull: #7951 Rebased-From: 5555528b47b7d33a5b963c076e6bb09ee25931b5 fada064f67302502f6b51d9d22927381c2707cbb
2016-06-10Tests: Fix deserialization of reject messagesSuhas Daftuar
Github-Pull: #7912 Rebased-From: 807fa47a1e5c9f072d7dbf549bf17f66c47dbf46
2016-06-10[qa] pull-tester: Don't mute zmq ImportErrorMarcoFalke
Github-Pull: #7851 Rebased-From: fa05e22e919b7e2e816606f0c0d3dea1bd325bfd faa4f22342b682a5ead1bbb8587facd761b4ac2d fae1f4ebfe6be4426685b22166f5367c92ba0833
2016-06-10Check if zmq is installed in tests, update docsElliot Olds
Github-Pull: #7635 Rebased-From: 2ab835ae6c02de14264896d571c0bba230a1e9f0
2016-06-10tests: Check Content-Type header returned from RPC serverWladimir J. van der Laan
Github-Pull: #7833 Rebased-From: 5078ca45438e8f8d8e7cd937659887fb8ec70038
2016-06-10[qa] maxblocksinflight: Actually enable testMarcoFalke
Github-Pull: #7803 Rebased-From: fac724c78f281168ea174c36cada4f95112aea6d
2016-06-10[qa] httpbasics: Actually test second connectionMarcoFalke
Github-Pull: #7802 Rebased-From: fa24456d0c4cd0f6571bcf3d8f1f51d8d4242a3e
2016-06-09test_framework: python3.4 authproxy compatWladimir J. van der Laan
Github-Pull: #7751 Rebased-From: d7b80b54fbb73acc92ddee84697ac4cc10d4d336 e7e48ba66cb597621a30945da9ca7fc36a6dc84c
2016-06-09test_framework: detect failure of bitcoind startupWladimir J. van der Laan
Github-Pull: #7744 Rebased-From: 018b60c5ea703ed12edcde034a185f79e77e5576
2016-06-09Create SingleNodeConnCB class for RPC testsAlex Morcos
(cherry picked from commit 5fa66e4682a59047d2ed2934760ccc052fd85f50)
2016-06-09travis: 'make check' in parallel and verboseCory Fields
Github-Pull: #8072 Rebased-From: 401ae654b247d80e29e76ebd094e9e37409941bd
2016-06-09Reenable multithread scheduler testPavel Janík
Github-Pull: #8016 Rebased-From: db18ab28c7a74bb289bfe6a5f9a4a9f963f71c0b 166e4b0dfa283fbdedc9a6a1e83296500c853a31
2016-06-09test: Add more thorough test for dbwrapper iteratorsWladimir J. van der Laan
Github-Pull: #7992 Rebased-From: 84c13e759dbb0de282e2c8ce43d77f4d52fda6d9 6030625631c62b0ffab2ac545c8351fa59dca483 269a4402a8617a539a70b2c332e86f0fe292a7a6
2016-06-09OSX diskimages need 0775 folder permissionsJonas Schnelli
Avoids endless Gatekeeper warnings (#7085) Conflicts: contrib/gitian-descriptors/gitian-osx-signer.yml Github-Pull: #8169 Rebased-From: cdf7dff4248ec4050e535079227dd57cbfb610e4
2016-06-09Merge #7938: [0.12.2] BackportsWladimir J. van der Laan
c3d1bc3 CBase58Data::SetString: cleanse the full vector (Kaz Wesley) 43c14ac Fix headers announcements edge case (Suhas Daftuar) 06c73a1 Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp`. (Alexander Regueiro) 7e71785 Use txid as key in mapAlreadyAskedFor (Suhas Daftuar) 5583a3d Add curl to Gitian setup instrustions (BtcDrak) d3ead9b Avoid "Unknown command" messages when receiving getaddr on outbound connections. (R E Broadley) a5bc6a1 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman) 52c1011 Clarify description of blockindex (Matthew Zipkin) 21b2f82 Don't resend wallet txs that aren't in our own mempool (Alex Morcos) 66d5408 Fix memleak in TorController [rework] (Wladimir J. van der Laan) 1c3d38b Remove spurious dollar sign. Fixes #7189. (Chris Moore) 64fd0ce fix spelling of advertise in src and doc (jloughry) a9e73f7 Fix and cleanup listreceivedbyX documentation (instagibbs) 9095594 Do not download transactions during inital sync (ptschip)
2016-06-08getblocktemplate: Use version/force mutation to support pre-BIP9 clientsLuke Dashjr
2016-06-08getblocktemplate: Explicitly handle the distinction between GBT-affecting ↵Luke Dashjr
softforks vs not
2016-06-08qa/rpc-tests: bip9-softforks: Add tests for getblocktemplate versionbits updatesLuke Dashjr
2016-06-08Implement BIP 9 GBT changesLuke Dashjr
- BIP9DeploymentInfo struct for static deployment info - VersionBitsDeploymentInfo: Avoid C++11ism by commenting parameter names - getblocktemplate: Make sure to set deployments in the version if it is LOCKED_IN - In this commit, all rules are considered required for clients to support
2016-06-08This is a cherry-pick of 89c844d back to 0.12.Johnathan Corgan
===== Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035.
2016-06-08Cherry-pick of f59dceb (#7925) to 0.12.Johnathan Corgan
===== qt: Fix out-of-tree GUI builds Without this patch: - When I compile the GUI from the bitcoin directory itself, it works as expected. - When I build the GUI in an out-of-tree build, I cannot get it to select tabs. When I click, say the "Receive" tab nothing happens, the button selects but it doesn't switch the page. The rest - even the debug window - seems to work. See full discussion here: https://github.com/bitcoin/bitcoin/pull/7911#issuecomment-212413442 This turned out to be caused by a mismatch in the arguments to moc, preventing it from finding `bitcoin-config.h`. Fix this by passing `$(DEFAULT_INCLUDES)` to it, which gets set to the appropriate path by autoconf itself.
2016-06-05Backport leveldb build integration to 0.12Johnathan Corgan
This is a cherry-pick of a4625acb with minor conflict resolution. Conflicts: src/Makefile.am ===== leveldb: integrate leveldb into our buildsystem leveldb's buildsystem causes us a few problems: - breaks out-of-tree builds - forces flags used for some tools - limits cross builds Rather than continuing to add wrappers around it, simply integrate it into our build.
2016-06-04CBase58Data::SetString: cleanse the full vectorKaz Wesley
SetString seems to be passing the length of the wrong variable to memory_cleanse, resulting in the last byte of the temporary buffer not being securely erased. Github-Pull: #7922 Rebased-From: 57704499be948c640c789c7fc11ed1abf8a681bd
2016-05-31Merge #8001: [0.12.2] backport script_tests improvementsWladimir J. van der Laan
e3a9ce9 Refactor script tests (Pieter Wuille) 87129b2 test: script_error checking in script_invalid tests (Wladimir J. van der Laan)
2016-05-18doc: Remove outdated qt4 install information from README.mdWladimir J. van der Laan
- doc: Remove outdated qt4 install information from README.md - doc: 32 and 64 bit packages are seperate Github-Pull: #8048 Rebased-From: e5764e69cbd0bf4eb98c96eeb31c94349bbe7b7c 6075bc4d67bcd5f95561dc6d53b4fdbaf2c63f4b
2016-05-04Refactor script testsPieter Wuille
Github-Pull: #7818 Rebased-From: c7c664191fd6ca4843cfe9d00abf8f2362b9550f 269281b7cc56e728fa64803fc7509ab3a0ce1805 d03e46625ac95954bb9ecbc2cf73ffd8de6b8a13 76da7613517d05aca31c2cee42b5ebf3d5c54974 009b503792737ab03aeb6e15060bc4f499500a96 dde46d3ae1de18700e089bc1861cf1e18649dc5d
2016-05-04test: script_error checking in script_invalid testsWladimir J. van der Laan
Github-Pull: #7517 Rebased-From: b0ff8572aeb8211ad30f24ca42d20a46debb5e9d 2317ad7c56c6f5a55984459947f69cc3bfbe340a 0ecb3401fe157cb0779d3970c6080b463b1b0ed2
2016-04-27Fix headers announcements edge caseSuhas Daftuar
Previously we would assert that if every block in vBlockHashesToAnnounce is in chainActive, then the blocks to be announced must connect. However, there are edge cases where this assumption could be violated (eg using invalidateblock / reconsiderblock), so just check for this case and revert to inv-announcement instead. Github-Pull: #7919 Rebased-From: 3a99fb2cb14955f5e029d315041a093e957e6c3e