aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-16Merge src/leveldb changes for LevelDB 1.18.Pieter Wuille
2014-10-16Squashed 'src/leveldb/' changes from 7924331..7d41e6fPieter Wuille
7d41e6f Merge upstream LevelDB 1.18 803d692 Release 1.18 git-subtree-dir: src/leveldb git-subtree-split: 7d41e6f89ff04ce9e6a742932924796f69c6e23d
2014-10-15Merge pull request #5082Pieter Wuille
5f4bcf6 boost: drop boost dependency in version.cpp. (Cory Fields) 352058e boost: drop boost dependency in utilstrencodings.cpp (Cory Fields) e1c9467 boost: drop boost dependency in core.cpp (Cory Fields) e405aa4 boost: remove CPrivKey dependency from CECKey (Cory Fields) 5295506 boost: drop dependency on tuple in serialization (Cory Fields) 1d9b86d boost: drop dependency on is_fundamental in serialization (Cory Fields)
2014-10-15boost: drop boost dependency in version.cpp.Cory Fields
Also add a test to verify.
2014-10-15boost: drop boost dependency in utilstrencodings.cppCory Fields
2014-10-15boost: drop boost dependency in core.cppCory Fields
2014-10-15boost: remove CPrivKey dependency from CECKeyCory Fields
This allows CECKey to be used without directly depending on the secure allocators
2014-10-15boost: drop dependency on tuple in serializationCory Fields
There's only one user of this form of serialization, so it can be easily dropped. It could be re-added if desired when we switch to c++11.
2014-10-15boost: drop dependency on is_fundamental in serializationCory Fields
There's only one case where a vector containing a fundamental type is serialized all-at-once, unsigned char. Anything else would lead to strange results. Use a dummy argument to overload in that case.
2014-10-14Merge pull request #4942Wladimir J. van der Laan
9406471 Write fee estimate and peers files only when initialized (Wladimir J. van der Laan)
2014-10-14Merge pull request #5074Wladimir J. van der Laan
005b5af rpc-tests: don't spew non-errors to stdout (Cory Fields)
2014-10-13Merge pull request #5080Pieter Wuille
e21b2e0 Typo in test (Luke)
2014-10-13Typo in testLuke
2014-10-13Merge pull request #4937Wladimir J. van der Laan
ccca27a [Wallet] Watch-only fixes (Cozz Lovan)
2014-10-11Merge pull request #5073Wladimir J. van der Laan
d5fd094 build: fix qt test build when libprotobuf is in a non-standard path (Cory Fields) a7d1f03 build: fix dynamic boost check when --with-boost= is used (Cory Fields)
2014-10-10rpc-tests: don't spew non-errors to stdoutCory Fields
There's a brief race here, the process might've already exited and cleaned up after itself. If that's the case, reading from the pidfile will harmlessly fail. Keep those quiet.
2014-10-10build: fix qt test build when libprotobuf is in a non-standard pathCory Fields
2014-10-10build: fix dynamic boost check when --with-boost= is usedCory Fields
2014-10-10Merge pull request #4802Wladimir J. van der Laan
6fd546d Remove CChainParams::NetworkID() (jtimon) cc97210 Add fTestnetToBeDeprecatedFieldRPC to CChainParams (jtimon) e11712d Move checkpoint data selection to chainparams (jtimon) 6de50c3 qt: add network-specific style object (Wladimir J. van der Laan)
2014-10-10Remove CChainParams::NetworkID()jtimon
2014-10-10Add fTestnetToBeDeprecatedFieldRPC to CChainParamsjtimon
2014-10-10Move checkpoint data selection to chainparamsjtimon
2014-10-10qt: add network-specific style objectWladimir J. van der Laan
Mainly cleanups: Gets rid of isTestNet everywhere, by keeping track of network-specific theming in a central place. Also makes GUI no longer dependent on the network ID enumeration, which alleviates concerns about #4802.
2014-10-10Merge pull request #5072Wladimir J. van der Laan
caecb42 Travis: Descriptive build names (Luke Dashjr)
2014-10-10Travis: Descriptive build namesLuke Dashjr
2014-10-09Merge pull request #5032Wladimir J. van der Laan
4bd1185 Qt: allow "emergency" shutdown during startup (Philip Kaufmann)
2014-10-09Merge pull request #5059Gavin Andresen
dbca89b Trigger -alertnotify if network is upgrading without you (Gavin Andresen) e01a793 Refactor -alertnotify code (Gavin Andresen) Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>
2014-10-09Trigger -alertnotify if network is upgrading without youGavin Andresen
This adds a -regetest-only undocumented (for regression testing only) command-line option -blockversion=N to set block.nVersion. Adds to the "has the rest of the network upgraded to a block.nVersion we don't understand" code so it calls -alertnotify when 51 of the last 100 blocks are up-version. But it only alerts once, not with every subsequent new, upversion block. And adds a forknotify.py regression test to make sure it works. Tested using forknotify.py: Before adding CAlert::Notify, get: Assertion failed: -alertnotify did not warn of up-version blocks Before adding code to only alert once: Assertion failed: -alertnotify excessive warning of up-version blocks After final code in this pull: Tests successful
2014-10-09Refactor -alertnotify codeGavin Andresen
Refactor common -alertnotify code into static CAlert::Notify method.
2014-10-08Merge pull request #4996Pieter Wuille
d0c4197 change exit(1) to an assert in CWallet::EncryptWallet (Philip Kaufmann) 870da77 fix possible memory leaks in CWallet::EncryptWallet (Philip Kaufmann) f606bb9 fix a possible memory leak in CWalletDB::Recover (Philip Kaufmann)
2014-10-08Merge pull request #5004Pieter Wuille
9df9cf5 Make SCRIPT_VERIFY_STRICTENC compatible with BIP62 (Pieter Wuille)
2014-10-08Make SCRIPT_VERIFY_STRICTENC compatible with BIP62Pieter Wuille
* Delete canonical_tests.cpp, and move the tests to script_tests.cpp. * Split off SCRIPT_VERIFY_DERSIG from SCRIPT_VERIFY_STRICTENC (the BIP62 part of it). * Change signature STRICTENC/DERSIG semantics to fail the script entirely rather than the CHECKSIG result (softfork safety, and BIP62 requirement). * Add many autogenerated tests for several odd cases. * Mention specific BIP62 rules in the script verification flags.
2014-10-08Merge pull request #4834Pieter Wuille
7c70438 Get rid of the dummy CCoinsViewCache constructor arg (Pieter Wuille) ed27e53 Add coins_tests with a large randomized CCoinViewCache test. (Pieter Wuille) 058b08c Do not keep fully spent but unwritten CCoins entries cached. (Pieter Wuille) c9d1a81 Get rid of CCoinsView's SetCoins and SetBestBlock. (Pieter Wuille) f28aec0 Use ModifyCoins instead of mutable GetCoins. (Pieter Wuille)
2014-10-08Merge pull request #5051Wladimir J. van der Laan
aedc74d contrib: make linearize-data.py cope with out-of-order blocks (Wladimir J. van der Laan)
2014-10-08Merge pull request #4979Wladimir J. van der Laan
de10efd add -timeout default as constant and use them (Philip Kaufmann)
2014-10-08Merge pull request #5055Wladimir J. van der Laan
2c930d9 Prettify JSON tests and minimize diffs (Pieter Wuille)
2014-10-08Merge pull request #5050Wladimir J. van der Laan
772ab0e contrib: use batched JSON-RPC in linarize-hashes (Wladimir J. van der Laan)
2014-10-07Merge pull request #4976Wladimir J. van der Laan
27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
2014-10-07Merge pull request #5041Wladimir J. van der Laan
1f9be98 Disable App Nap on OSX 10.9+ (Michael Ford)
2014-10-07Merge pull request #5047Wladimir J. van der Laan
3e61eb9 minor txindex documentation improvement (Cozz Lovan)
2014-10-07contrib: revert changes to github-merge.sh in #5038Wladimir J. van der Laan
2014-10-07Merge pull request #5053Wladimir J. van der Laan
27368e7 Homebrew lang fix (Dominyk Tiller)
2014-10-07Prettify JSON tests and minimize diffsPieter Wuille
2014-10-07Merge pull request #5038Wladimir J. van der Laan
0b17964 Bugfix: Replace bashisms with standard sh in tests/tools (Luke Dashjr) ab72068 Bugfix: Replace bashisms with standard sh in gitian descriptors (Luke Dashjr) b77b4ed Bugfix: Replace bashisms with standard sh to fix build on non-BASH systems (Luke Dashjr) d6b0539 travis: add non-default shell testing to travis. (Cory Fields)
2014-10-07Merge pull request #4954Wladimir J. van der Laan
9d7cd4c Don't return an address for invalid pubkeys (Andy Alness)
2014-10-06Don't return an address for invalid pubkeysAndy Alness
2014-10-06Merge pull request #5049Pieter Wuille
4dc5eb0 fix a lock indentation in main.cpp (Philip Kaufmann) 5eed8c2 minor license, header end comment etc. cleanup in /script (Philip Kaufmann)
2014-10-06Homebrew lang fixDominyk Tiller
Very small tweak to correct the language on Homebrew's sandboxing process. Discussed in [this commit](https://github.com/bitcoin/bitcoin/commit/9fedafba4b903d7f3af044eb86dc313856e40b08).
2014-10-06minor txindex documentation improvementCozz Lovan
2014-10-06contrib: make linearize-data.py cope with out-of-order blocksWladimir J. van der Laan
Make it possible to read blocks in any order. This will be required after headers-first (#4468), so should be merged before that. - Read block header. For expected blocks, continue, else skip. - For in-order blocks: copy block contents directly. Write prior out-of-order blocks if this connects a consecutive span. - For out-of-order blocks, store extents of block data for later retrieval. Cache out-of-order blocks in memory up to 100MB (configurable).