aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5059Gavin Andresen2014-10-096-26/+103
|\ | | | | | | | | | | | | dbca89b Trigger -alertnotify if network is upgrading without you (Gavin Andresen) e01a793 Refactor -alertnotify code (Gavin Andresen) Signed-off-by: Gavin Andresen <[email protected]>
| * Trigger -alertnotify if network is upgrading without youGavin Andresen2014-10-094-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Refactor -alertnotify codeGavin Andresen2014-10-093-25/+26
| | | | | | | | Refactor common -alertnotify code into static CAlert::Notify method.
* | Merge pull request #4996Pieter Wuille2014-10-083-10/+31
|\ \ | | | | | | | | | | | | | | | 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)
| * | change exit(1) to an assert in CWallet::EncryptWalletPhilip Kaufmann2014-10-011-2/+4
| | |
| * | fix possible memory leaks in CWallet::EncryptWalletPhilip Kaufmann2014-10-012-6/+26
| | | | | | | | | | | | | | | | | | | | | - add missing deletes for pwalletdbEncryption - add an assert before trying to reserve memory for pwalletdbEncryption - add a destructor to CWallet, which ensures deletion of pwalletdbEncryption on object destruction
| * | fix a possible memory leak in CWalletDB::RecoverPhilip Kaufmann2014-10-011-4/+3
| | | | | | | | | | | | | | | - convert pdbCopy into a boost::scoped_ptr to ensure memory gets freed in all cases (e.g. after "ret > 0")
* | | Merge pull request #5004Pieter Wuille2014-10-088-164/+234
|\ \ \ | | | | | | | | | | | | 9df9cf5 Make SCRIPT_VERIFY_STRICTENC compatible with BIP62 (Pieter Wuille)
| * | | Make SCRIPT_VERIFY_STRICTENC compatible with BIP62Pieter Wuille2014-10-088-164/+234
|/ / / | | | | | | | | | | | | | | | | | | | | | * 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.
* | | Merge pull request #4834Pieter Wuille2014-10-0817-147/+393
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | Get rid of the dummy CCoinsViewCache constructor argPieter Wuille2014-09-2414-24/+24
| | | |
| * | | Add coins_tests with a large randomized CCoinViewCache test.Pieter Wuille2014-09-232-0/+179
| | | |
| * | | Do not keep fully spent but unwritten CCoins entries cached.Pieter Wuille2014-09-234-31/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing CCoins entries directly in CCoinsMap, store a CCoinsCacheEntry which additionally keeps track of whether a particular entry is: * dirty: potentially different from its parent view. * fresh: the parent view is known to not have a non-pruned version. This allows us to skip non-dirty cache entries when pushing batches of changes up, and to remove CCoins entries about transactions that are fully spent before the parent cache learns about them.
| * | | Get rid of CCoinsView's SetCoins and SetBestBlock.Pieter Wuille2014-09-237-44/+8
| | | | | | | | | | | | | | | | | | | | | | | | All direct modifications are now done through ModifyCoins, and BatchWrite is used for pushing batches of queued modifications up, so we don't need the low-level SetCoins and SetBestBlock anymore in the top-level CCoinsView class.
| * | | Use ModifyCoins instead of mutable GetCoins.Pieter Wuille2014-09-235-62/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the mutable non-copying GetCoins method with a ModifyCoins, which returns an encapsulated iterator, so we can keep track of concurrent modifications (as iterators can be invalidated by those) and run cleanup code after a modification is finished. This also removes the overloading of the 'GetCoins' name.
* | | | Merge pull request #5051Wladimir J. van der Laan2014-10-082-98/+162
|\ \ \ \ | | | | | | | | | | | | | | | aedc74d contrib: make linearize-data.py cope with out-of-order blocks (Wladimir J. van der Laan)
| * | | | contrib: make linearize-data.py cope with out-of-order blocksWladimir J. van der Laan2014-10-062-98/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | Merge pull request #4979Wladimir J. van der Laan2014-10-083-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | de10efd add -timeout default as constant and use them (Philip Kaufmann)
| * | | | | add -timeout default as constant and use themPhilip Kaufmann2014-10-063-8/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | - update help message text - simplify code in init to check for -timeout
* | | | | Merge pull request #5055Wladimir J. van der Laan2014-10-083-40/+179
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 2c930d9 Prettify JSON tests and minimize diffs (Pieter Wuille)
| * | | | | Prettify JSON tests and minimize diffsPieter Wuille2014-10-073-40/+179
| | | | | |
* | | | | | Merge pull request #5050Wladimir J. van der Laan2014-10-081-32/+39
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | 772ab0e contrib: use batched JSON-RPC in linarize-hashes (Wladimir J. van der Laan)
| * | | | | contrib: use batched JSON-RPC in linarize-hashesWladimir J. van der Laan2014-10-061-32/+39
| | | | | | | | | | | | | | | | | | | | | | | | Batch up to 10000 requests for a ~30x speedup.
* | | | | | Merge pull request #4976Wladimir J. van der Laan2014-10-071-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
| * | | | | | qt: add proxy to options overridden if necessary.Cory Fields2014-09-251-0/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | If proxy is disabled in the gui but enabled via the command line, it needs to be added to the override list.
* | | | | | Merge pull request #5041Wladimir J. van der Laan2014-10-071-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 1f9be98 Disable App Nap on OSX 10.9+ (Michael Ford)
| * | | | | | Disable App Nap on OSX 10.9+Michael Ford2014-10-041-0/+3
| | | | | | |
* | | | | | | Merge pull request #5047Wladimir J. van der Laan2014-10-072-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3e61eb9 minor txindex documentation improvement (Cozz Lovan)
| * | | | | | | minor txindex documentation improvementCozz Lovan2014-10-062-3/+5
| | | | | | | |
* | | | | | | | contrib: revert changes to github-merge.sh in #5038Wladimir J. van der Laan2014-10-071-13/+13
| | | | | | | |
* | | | | | | | Merge pull request #5053Wladimir J. van der Laan2014-10-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 27368e7 Homebrew lang fix (Dominyk Tiller)
| * | | | | | | | Homebrew lang fixDominyk Tiller2014-10-061-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very small tweak to correct the language on Homebrew's sandboxing process. Discussed in [this commit](https://github.com/bitcoin/bitcoin/commit/9fedafba4b903d7f3af044eb86dc313856e40b08).
* | | | | | | | Merge pull request #5038Wladimir J. van der Laan2014-10-0714-61/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | | | Bugfix: Replace bashisms with standard sh in tests/toolsLuke Dashjr2014-10-033-15/+15
| | | | | | | | |
| * | | | | | | | Bugfix: Replace bashisms with standard sh in gitian descriptorsLuke Dashjr2014-10-037-11/+11
| | | | | | | | |
| * | | | | | | | Bugfix: Replace bashisms with standard sh to fix build on non-BASH systemsLuke Dashjr2014-10-033-33/+36
| | | | | | | | |
| * | | | | | | | travis: add non-default shell testing to travis.Cory Fields2014-10-031-2/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4954Wladimir J. van der Laan2014-10-071-2/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | 9d7cd4c Don't return an address for invalid pubkeys (Andy Alness)
| * | | | | | | Don't return an address for invalid pubkeysAndy Alness2014-10-061-2/+13
| | | | | | | |
* | | | | | | | Merge pull request #5049Pieter Wuille2014-10-064-11/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 4dc5eb0 fix a lock indentation in main.cpp (Philip Kaufmann) 5eed8c2 minor license, header end comment etc. cleanup in /script (Philip Kaufmann)
| * | | | | | | fix a lock indentation in main.cppPhilip Kaufmann2014-10-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also ensure alphabetical ordering in file header
| * | | | | | | minor license, header end comment etc. cleanup in /scriptPhilip Kaufmann2014-10-063-6/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ensure all licenses are just MIT - add a missing header end comment - ensure alphabetical ordering
* | | | | | | Merge pull request #5036Wladimir J. van der Laan2014-10-064-220/+182
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb6b3b2 Update English translation (Wladimir J. van der Laan) b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
| * | | | | | | Update English translationWladimir J. van der Laan2014-10-022-201/+161
| | | | | | | |
| * | | | | | | Don't translate state.Abort() messagesWladimir J. van der Laan2014-10-022-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is only one message passed to AbortNode() that makes sense to translate to the user specifically: Disk space is low. For the others show a generic message and refer to debug.log for details. Reduces the number of confusing jargon translation messages.
* | | | | | | | Merge pull request #4890Wladimir J. van der Laan2014-10-0615-135/+215
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e790c37 Replace SCRIPT_VERIFY_NOCACHE by flag directly to checker (Pieter Wuille) 5c1e798 Make signature cache optional (Pieter Wuille) c7829ea Abstract out SignatureChecker (Pieter Wuille)
| * | | | | | | Replace SCRIPT_VERIFY_NOCACHE by flag directly to checkerPieter Wuille2014-10-0213-74/+64
| | | | | | | |
| * | | | | | | Make signature cache optionalPieter Wuille2014-10-029-88/+155
| | | | | | | |
| * | | | | | | Abstract out SignatureCheckerPieter Wuille2014-10-024-14/+37
| |/ / / / / /
* | | | | | | Merge pull request #5035Wladimir J. van der Laan2014-10-041-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | c9c51cb Make comptool more deterministic (Matt Corallo)