aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implement SipHash in PythonPieter Wuille2016-07-292-0/+68
|
* Allow changing BIP9 parameters on regtestSuhas Daftuar2016-07-293-0/+52
|
* Merge #8274: util: Update tinyformatWladimir J. van der Laan2016-07-293-355/+375
|\ | | | | | | | | a5072a7 util: Remove zero-argument versions of LogPrint and error (Wladimir J. van der Laan) 695041e util: Update tinyformat (Wladimir J. van der Laan)
| * util: Remove zero-argument versions of LogPrint and errorWladimir J. van der Laan2016-06-272-23/+7
| | | | | | | | | | | | | | | | | | Changes in tinyformat, recently imported from upstream have made the zero-argument versions of formatting functions unnecessary. Remove them. This is a slight semantic change: `%` characters in the zero-argument call are now regarded and need to be escaped. As for as I know, the only use of this is in `main.cpp`.
| * util: Update tinyformatWladimir J. van der Laan2016-06-271-332/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates `tinyformat.h` to commit https://github.com/c42f/tinyformat/commit/3a33bbf65442432277eee079e83d3e8fac51730c upstream. Makes sure that our local changes are kept: - #3767 1b8fd35aadfad6a1e55391f02add6076c8c9ea8f Make tinyformat errors raise an exception instead of assert()ing - #4735 9b6d4c5cdc1ad7b12b8b7ba05125dad9ba2d396e Move strprintf define to tinyformat.h - #4748 6e5fd003e04b81115b6b164b21f048472d575535 include stdexcept (for std::exception) - #8000 9eaa0afa6ec5d3dd01e4d01121314ef51f2bc305 force USE_VARIADIC_TEMPLATES - Add `std::string format(const std::string &fmt...` added this at the time, as we want to be able to do `strprintf(_(...), ...)` Inspired by #8264.
* | Merge #8421: httpserver: drop boost (#8023 dependency)Wladimir J. van der Laan2016-07-292-35/+33
|\ \ | | | | | | | | | | | | | | | 7e87033 httpserver: replace boost threads with std (Cory Fields) d3773ca httpserver: explicitly detach worker threads (Cory Fields) 755aa05 httpserver: use a future rather than relying on boost's try_join_for (Cory Fields)
| * | httpserver: replace boost threads with stdCory Fields2016-07-282-27/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | along with mutex/condvar/bind/etc. httpserver handles its own interruption, so there's no reason not to use std threading. While we're at it, may as well kill the BOOST_FOREACH's as well.
| * | httpserver: explicitly detach worker threadsCory Fields2016-07-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using std::thread in place of boost::thread, letting the threads destruct results in a std::terminate. According to the docs, the same thing should be be happening in later boost versions: http://www.boost.org/doc/libs/1_55_0/doc/html/thread/thread_management.html#thread.thread_management.thread.destructor I'm unsure why this hasn't blown up already, but explicitly detaching can't hurt.
| * | httpserver: use a future rather than relying on boost's try_join_forCory Fields2016-07-281-8/+9
| | |
* | | Merge #8408: Prevent fingerprinting, disk-DoS with compact blocksWladimir J. van der Laan2016-07-291-2/+1
|\ \ \ | | | | | | | | | | | | | | | | 1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar) 1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
| * | | Ignore CMPCTBLOCK messages for pruned blocksSuhas Daftuar2016-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | Also ignores CMPCTBLOCK announcements that have too little work. This is to prevent disk-exhaustion DoS.
| * | | Ignore GETBLOCKTXN requests for unknown blocksSuhas Daftuar2016-07-261-1/+0
| | | | | | | | | | | | | | | | | | | | Don't disconnect peers, or else we leak information that could be used for fingerprinting.
* | | | Merge #8412: libconsensus: Expose a flag for BIP112Pieter Wuille2016-07-291-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)
| * | | libconsensus: Expose a flag for BIP112Jorge Timón2016-07-281-0/+1
| | | | | | | | | | | | | | | | We added the segwit one, but we forgot CHECKSEQUENCEVERIFY
* | | | Merge #8321: [trivial] Switched constants to sizeof()Wladimir J. van der Laan2016-07-282-16/+23
|\ \ \ \ | | | | | | | | | | | | | | | fbc6070 [trivial] Switched constants to sizeof() (Thomas Snider)
| * | | | [trivial] Switched constants to sizeof()Thomas Snider2016-07-182-16/+23
| | | | |
* | | | | Port from 0.13: Create a new HD seed after encrypting the walletJonas Schnelli2016-07-284-12/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward-ports two commits from 0.13: - [0.13] Create a new HD seed after encrypting the wallet - [Wallet] Add CKeyMetadata record for HDMasterKey(s), factor out HD key generation Github-Pull: #8389 Rebased-From: f142c11ac634df487cc4bc65a5f1c9a3e3563dd9 de45c065f0648c4c41b57cb492420ceeed29dd11
* | | | | Merge #8332: semi trivial: clarify witness branches in transaction.h ↵Wladimir J. van der Laan2016-07-281-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serialization e37b16a transaction: clarify witness branches (Daniel Cousens)
| * | | | | transaction: clarify witness branchesDaniel Cousens2016-07-141-3/+5
| | | | | |
* | | | | | Merge #8407: [Qt] Add dbcache migration pathWladimir J. van der Laan2016-07-282-1/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 893f379 [Qt] Add dbcache migration path (Jonas Schnelli)
| * | | | | | [Qt] Add dbcache migration pathJonas Schnelli2016-07-282-1/+24
| | | | | | |
* | | | | | | Merge #8348: Trivial: Segwit: Don't call IsWitnessEnabled from ↵Wladimir J. van der Laan2016-07-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContextualCheckBlock 38c4c8b Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlock (Jorge Timón)
| * | | | | | | Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlockJorge Timón2016-07-171-1/+1
| | | | | | | |
* | | | | | | | Merge #8414: prepend license statement to indirectmap.hWladimir J. van der Laan2016-07-281-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | d3af342 prepend license statement to indirectmap (Kaz Wesley)
| * | | | | | | | prepend license statement to indirectmapKaz Wesley2016-07-271-0/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add statement about MIT licensing to indirectmap.h. I forgot the license preamble when I originally wrote the file.
* | | | | | | | Merge #8206: [Wallet] Add HD xpriv to dumpwalletWladimir J. van der Laan2016-07-272-4/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | 77c912d [Wallet] add HD xpriv to dumpwallet (Jonas Schnelli)
| * | | | | | | [Wallet] add HD xpriv to dumpwalletJonas Schnelli2016-07-272-4/+27
| | | | | | | |
* | | | | | | | Merge #8358: [doc] gbuild: Set memory explicitly (default is too low)Wladimir J. van der Laan2016-07-261-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | faa5931 [doc] gbuild: Set memory explicitly (default is too low) (MarcoFalke)
| * | | | | | | | [doc] gbuild: Set memory explicitly (default is too low)MarcoFalke2016-07-181-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge #8381: Make witness v0 outputs non-standardWladimir J. van der Laan2016-07-264-7/+89
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | c59c434 qa: Add test for standardness of segwit v0 outputs (Suhas Daftuar) 1ffaff2 Make witness v0 outputs non-standard before segwit activation (Johnson Lau)
| * | | | | | | qa: Add test for standardness of segwit v0 outputsSuhas Daftuar2016-07-232-1/+79
| | | | | | | |
| * | | | | | | Make witness v0 outputs non-standard before segwit activationJohnson Lau2016-07-223-7/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge #8365: Treat high-sigop transactions as larger rather than rejecting themWladimir J. van der Laan2016-07-266-12/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ab942c1 Treat high-sigop transactions as larger rather than rejecting them (Pieter Wuille)
| * | | | | | | Treat high-sigop transactions as larger rather than rejecting themPieter Wuille2016-07-196-12/+15
| | | | | | | |
* | | | | | | | Merge #8362: Scale legacy sigop count in CreateNewBlockWladimir J. van der Laan2016-07-251-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 682aa0f Scale legacy sigop count in CreateNewBlock (Suhas Daftuar)
| * | | | | | | | Scale legacy sigop count in CreateNewBlockSuhas Daftuar2016-07-181-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge #8396: remove outdated legacy code from key.hWladimir J. van der Laan2016-07-251-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | cc021ef remove outdated legacy code (lizhi)
| * | | | | | | | remove outdated legacy codelizhi2016-07-241-3/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | CheckSignatureElement is not used,it be replaced by eccrypto::CheckSignatureElement.
* | | | | | | | Merge #8390: [Wallet] Correct hdmasterkeyid/masterkeyid name confusionJonas Schnelli2016-07-222-12/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | b50e1ac [Wallet] Correct hdmasterkeyid/masterkeyid name confusion (Jonas Schnelli)
| * | | | | | | [Wallet] Correct hdmasterkeyid/masterkeyid name confusionJonas Schnelli2016-07-212-12/+12
|/ / / / / / /
* | | | | | | Merge #8347: Trivial: Make CBlockIndex param const in ↵Wladimir J. van der Laan2016-07-212-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContextualCheckBlockHeader and ContextualCheckBlock 6f3d616 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock (Jorge Timón)
| * | | | | | | Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ↵Jorge Timón2016-07-172-4/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | ContextualCheckBlock
* | | | | | | Merge #8341: Consensus: Remove calls to error() from ContextualCheckBlockWladimir J. van der Laan2016-07-211-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7821889 Consensus: Remove calls to error() from ContextualCheckBlock (NicolasDorier)
| * | | | | | | Consensus: Remove calls to error() from ContextualCheckBlockNicolasDorier2016-07-211-4/+4
|/ / / / / / /
* | | | | | | Merge #8342: Consensus: Trivial transform BOOST_FOREACH into for loopWladimir J. van der Laan2016-07-211-9/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | a3e1984 Consensus: Trivial transform BOOST_FOREACH into for loop (NicolasDorier)
| * | | | | | Consensus: Trivial transform BOOST_FOREACH into for loopNicolasDorier2016-07-161-9/+9
| |/ / / / /
* | | | | | Merge #8378: [Wallet]Move SetMinVersion for FEATURE_HD to SetHDMasterKeyWladimir J. van der Laan2016-07-201-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 6523fca Move SetMinVersion for FEATURE_HD to SetHDMasterKey (Patrick Strateman)
| * | | | | | Move SetMinVersion for FEATURE_HD to SetHDMasterKeyPatrick Strateman2016-07-191-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge #8373: Fix OSX non-deterministic dmgWladimir J. van der Laan2016-07-202-0/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | 3b3ce25 build: fix non-deterministic biplist (Cory Fields)
| * | | | | build: fix non-deterministic biplistCory Fields2016-07-192-0/+34
|/ / / / / | | | | | | | | | | | | | | | | | | | | The non-deterministic ordering produced by biplist ends up in the .DS_Store file that is included in the OSX dmg.