aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #7920: Switch Travis to TrustyWladimir J. van der Laan2016-04-265-12/+90
|\ | | | | | | | | | | | | | | | | a33b7c9 travis: temporarily disable qt to avoid timeouts (Cory Fields) 174023c travis: Don't disable writing ccache for pull-requests (Cory Fields) cf77fcd travis: drop MAKEJOBS=2 for windows compilers (Cory Fields) 9267a47 depends: enable pre-compiled headers for qt (Cory Fields) 06fdffd travis: switch to Trusty (Cory Fields) a6666b2 depends: mac deploy Py3 compatibility (Wladimir J. van der Laan)
| * travis: temporarily disable qt to avoid timeoutsCory Fields2016-04-261-3/+3
| | | | | | | | | | These builds take longer than they did on precise. Disable them now to keep things working, we can re-enable them after experimentation
| * travis: Don't disable writing ccache for pull-requestsCory Fields2016-04-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | This was doing more harm than good. The original intention was to speed up builds, since a PR's ccache results will be thrown away anyway. However, each PR maintains its own cache, so disabling writes means that subsequent pushes don't benefit from the fresh cache. This is significant when (for example) many headers are touched in a PR, then the PR is updated. With this change, the updated PR will take advantage of the cache generated during the PR's previous build.
| * travis: drop MAKEJOBS=2 for windows compilersCory Fields2016-04-251-2/+2
| | | | | | | | These were only in place because of the old precice mingw toolchain
| * depends: enable pre-compiled headers for qtCory Fields2016-04-251-1/+1
| | | | | | | | | | All trusty compilers work ok with this now, and it shaves a few minutes off of build time
| * travis: switch to TrustyCory Fields2016-04-211-7/+9
| |
| * depends: mac deploy Py3 compatibilityWladimir J. van der Laan2016-04-213-3/+80
| | | | | | | | | | | | This fixes the gitian MacOSX build, it was broken in #7723. The patch to `native_mac_alias` should probably make it upstream.
* | Merge #7944: Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035.Wladimir J. van der Laan2016-04-261-0/+1
|\ \ | | | | | | | | | 89c844d Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035. (randy-waterhouse)
| * | Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035.randy-waterhouse2016-04-261-0/+1
| | |
* | | Merge #7688: List solvability in listunspent output and improve helpWladimir J. van der Laan2016-04-255-8/+14
|\ \ \ | | | | | | | | | | | | c3932b3 List solvability in listunspent output and improve help (Pieter Wuille)
| * | | List solvability in listunspent output and improve helpPieter Wuille2016-03-145-8/+14
| | | |
* | | | Merge #7881: Update release processWladimir J. van der Laan2016-04-255-125/+203
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f154470 [contrib] Remove reference to sf and add doc to verify.sh (MarcoFalke) 182bec4 contrib: remove hardcoded version from verify.sh (Wladimir J. van der Laan) c907f4d doc: Update release process (Wladimir J. van der Laan)
| * | | | [contrib] Remove reference to sf and add doc to verify.shMarcoFalke2016-04-253-3/+10
| | | | |
| * | | | contrib: remove hardcoded version from verify.shWladimir J. van der Laan2016-04-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #7595 as by removing the hardcoded version number from `verify.sh`.
| * | | | doc: Update release processWladimir J. van der Laan2016-04-252-118/+191
| | | | | | | | | | | | | | | | | | | | | | | | | The actual release process quite diverged from what was written here, also clarify things a bit.
* | | | | Merge #7927: Minor changes to dbwrapper to simplify support for other databasesWladimir J. van der Laan2016-04-254-68/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 869cf12 dbwrapper: Move `HandleError` to `dbwrapper_private` (Wladimir J. van der Laan) b69836d dbwrapper: Pass parent CDBWrapper into CDBBatch and CDBIterator (Wladimir J. van der Laan) 878bf48 dbwrapper: Remove CDBWrapper::GetObfuscateKeyHex (Wladimir J. van der Laan) 74f7b12 dbwrapper: Remove throw keywords in function signatures (Wladimir J. van der Laan)
| * | | | | dbwrapper: Move `HandleError` to `dbwrapper_private`Wladimir J. van der Laan2016-04-232-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | HandleError is implementation-specific.
| * | | | | dbwrapper: Pass parent CDBWrapper into CDBBatch and CDBIteratorWladimir J. van der Laan2016-04-234-30/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass parent wrapper directly instead of obfuscation key. This makes it possible for other databases which re-use this code to use other properties from the database. Add a namespace dbwrapper_private for private functions to be used only in dbwrapper.h/cpp and dbwrapper_tests.
| * | | | | dbwrapper: Remove CDBWrapper::GetObfuscateKeyHexWladimir J. van der Laan2016-04-232-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is an unnecessary method as it is used only two times and only internally, and the whole implementation is HexStr(obfuscate_key).
| * | | | | dbwrapper: Remove throw keywords in function signaturesWladimir J. van der Laan2016-04-232-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using throw() specifications in function signatures is not only not required in C++, it is considered deprecated for [various reasons](https://stackoverflow.com/questions/1055387/throw-keyword-in-functions-signature). It is not implemented by any of the common C++ compilers. The usage is also inconsistent with the rest of the source code.
* | | | | | Merge #7925: qt: Fix out-of-tree GUI buildsWladimir J. van der Laan2016-04-221-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | f59dceb qt: Fix out-of-tree GUI builds (Wladimir J. van der Laan)
| * | | | | qt: Fix out-of-tree GUI buildsWladimir J. van der Laan2016-04-221-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge #7911: leveldb: integrate leveldb into our buildsystemWladimir J. van der Laan2016-04-223-19/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | a4625ac leveldb: integrate leveldb into our buildsystem (Cory Fields)
| * | | | | leveldb: integrate leveldb into our buildsystemCory Fields2016-04-193-19/+106
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge #7922: CBase58Data::SetString: cleanse the full vectorWladimir J. van der Laan2016-04-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 5770449 CBase58Data::SetString: cleanse the full vector (Kaz Wesley)
| * | | | | CBase58Data::SetString: cleanse the full vectorKaz Wesley2016-04-211-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge #7919: Fix headers announcements edge caseWladimir J. van der Laan2016-04-221-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 3a99fb2 Fix headers announcements edge case (Suhas Daftuar)
| * | | | | Fix headers announcements edge caseSuhas Daftuar2016-04-201-1/+15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge #7816: [Wallet] slighly refactor GetOldestKeyPoolTime()Wladimir J. van der Laan2016-04-221-5/+12
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 9f7336b [Wallet] slightly refactor GetOldestKeyPoolTime() (Jonas Schnelli)
| * | | | [Wallet] slightly refactor GetOldestKeyPoolTime()Jonas Schnelli2016-04-061-5/+12
| | | | |
* | | | | Merge #7912: Tests: Fix deserialization of reject messagesMarcoFalke2016-04-211-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 807fa47 Tests: Fix deserialization of reject messages (Suhas Daftuar)
| * | | | | Tests: Fix deserialization of reject messagesSuhas Daftuar2016-04-201-2/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Assume that reject messages for blocks or transactions due to reason REJECT_MALFORMED will not include the hash of the block or tx being rejected.
* | | | | Merge #7921: [contrib] verify-commits: Add MarcoFalke fingerprintWladimir J. van der Laan2016-04-211-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | fa24329 [contrib] verify-commits: Add MarcoFalke fingerprint (MarcoFalke)
| * | | | | [contrib] verify-commits: Add MarcoFalke fingerprintMarcoFalke2016-04-211-0/+1
|/ / / / /
* | | | | Merge #7916: Explicitly pass CChainParams& to DisconnectTip()Wladimir J. van der Laan2016-04-213-17/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 176869f Explicitly pass CChainParams to ConnectBlock (face) d0a6353 Pass CChainParams to DisconnectTip() (face) 764d237 Globals: Explicitly pass const CChainParams& to UpdateTip() (Jorge Timón)
| * | | | | Explicitly pass CChainParams to ConnectBlockface2016-04-202-6/+7
| | | | | |
| * | | | | Pass CChainParams to DisconnectTip()face2016-04-193-8/+7
| | | | | |
| * | | | | Globals: Explicitly pass const CChainParams& to UpdateTip()Jorge Timón2016-04-191-4/+4
| | | | | |
* | | | | | Merge #7913: Fix for incorrect locking in GetPubKey() (keystore.cpp)Pieter Wuille2016-04-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 220f950 Fix for incorrect locking in GetPubKey() (keystore.cpp) (Yuri Zhykin)
| * | | | | | Fix for incorrect locking in GetPubKey() (keystore.cpp)Yuri Zhykin2016-04-201-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge #7868: net: Split DNS resolving functionality out of net structuresPieter Wuille2016-04-215-35/+46
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d39f5b4 net: disable resolving from storage structures (Cory Fields) 3675699 net: resolve outside of storage structures (Cory Fields) a98cd1f net: manually resolve dns seed sources (Cory Fields) e9fc71e net: require lookup functions to specify all arguments (Cory Fields)
| * | | | | net: disable resolving from storage structuresCory Fields2016-04-203-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | CNetAddr/CService/CSubnet can no longer resolve DNS.
| * | | | | net: resolve outside of storage structuresCory Fields2016-04-202-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than allowing CNetAddr/CService/CSubNet to launch DNS queries, require that addresses are already resolved. This greatly simplifies async resolve logic, and makes it harder to accidentally leak DNS queries.
| * | | | | net: manually resolve dns seed sourcesCory Fields2016-04-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Some seeds aren't actually returning an IP for their name entries, so they're being added to addrman with a source of [::]. This commit shouldn't change that behavior, for better or worse.
| * | | | | net: require lookup functions to specify all argumentsCory Fields2016-04-172-5/+5
| |/ / / / | | | | | | | | | | | | | | | To make it clear where DNS resolves are happening
* | | | | Merge #7787: [Moveonly] Create ui_interface.cppWladimir J. van der Laan2016-04-196-58/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fa10ce6 Move ui_interface.cpp to libbitcoin_server_a_SOURCES (MarcoFalke) fabbf80 [ui] Move InitError, InitWarning, AmountErrMsg (MarcoFalke)
| * | | | | Move ui_interface.cpp to libbitcoin_server_a_SOURCESMarcoFalke2016-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is only needed by bitcoind and bitcoin-qt
| * | | | | [ui] Move InitError, InitWarning, AmountErrMsgMarcoFalke2016-04-026-58/+56
| | | | | |
* | | | | | Merge #7762: [ZMQ] append a message sequence number to every ZMQ notificationWladimir J. van der Laan2016-04-196-13/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b25a9f [ZMQ] append a message sequence number to every ZMQ notification (Jonas Schnelli) de821d5 [ZMQ] refactor message string (Jonas Schnelli)
| * | | | | | [ZMQ] append a message sequence number to every ZMQ notificationJonas Schnelli2016-04-196-13/+69
| | | | | | |