aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [depends] Boost 1.59.0fanquake2015-11-101-3/+3
|
* Merge pull request #6967Wladimir J. van der Laan2015-11-091-1/+1
|\ | | | | | | 9ea7762 Use Pieter's signing subkey instead of his primary key (Matt Corallo)
| * Use Pieter's signing subkey instead of his primary keyMatt Corallo2015-11-061-1/+1
| | | | | | | | This commit is signed.
* | Merge pull request #6908Wladimir J. van der Laan2015-11-091-10/+9
|\ \ | | | | | | | | | c53d48a BIP70: Chainparams: DRY: Make qt/guiutil.cpp fit BIP70 chain name strings (Jorge Timón)
| * | BIP70: Chainparams: DRY: Make qt/guiutil.cpp fit BIP70 chain name stringsJorge Timón2015-11-041-10/+9
| | | | | | | | | | | | As a side effect, the qt user will see "test" instead of "testnet"
* | | Merge pull request #6962Wladimir J. van der Laan2015-11-092-6/+8
|\ \ \ | | | | | | | | | | | | 6dd3a44 translations: Don't translate markdown or force English grammar (MarcoFalke)
| * | | translations: Don't translate markdown or force English grammarMarcoFalke2015-11-092-6/+8
| | | |
* | | | Merge pull request #6970Wladimir J. van der Laan2015-11-093-2/+35
|\ \ \ \ | |_|_|/ |/| | | | | | | 2980a18 Fix crash in validateaddress with -disablewallet (Wladimir J. van der Laan)
| * | | Fix crash in validateaddress with -disablewalletWladimir J. van der Laan2015-11-093-2/+35
|/ / / | | | | | | | | | Fix a null pointer dereference in validateaddress with -disablewallet. Also add a regression testcase.
* | | Merge pull request #6955Wladimir J. van der Laan2015-11-054-10/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | e167af2 [doc] Remove excessive white space (MarcoFalke) e0eeb67 [trivial] clang-format: Set AlignAfterOpenBracket: false (MarcoFalke) 0af8fe4 devtools: Update README.md (MarcoFalke)
| * | | [doc] Remove excessive white spaceMarcoFalke2015-11-052-9/+10
| | | |
| * | | [trivial] clang-format: Set AlignAfterOpenBracket: falseMarcoFalke2015-11-051-1/+2
| | | |
| * | | devtools: Update README.mdMarcoFalke2015-11-041-0/+5
| |/ /
* | | Merge pull request #6948Wladimir J. van der Laan2015-11-051-3/+8
|\ \ \ | | | | | | | | | | | | 22e7807 Always flush block and undo when switching to new file (Pieter Wuille)
| * | | Always flush block and undo when switching to new filePieter Wuille2015-11-051-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the undo weren't being flushed during a reindex because fKnown was set to true in FindBlockPos. That is the correct behaviour for block files as they aren't being touched, but undo files are touched. This changes the behaviour to always flush when switching to a new file (even for block files, though that isn't really necessary).
* | | | Merge pull request #6934Wladimir J. van der Laan2015-11-056-10/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d1c3762 Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints"" (Gregory Maxwell) e4e5334 Restore MedianTimePast for locktime. (Gregory Maxwell)
| * | | | Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point ↵Gregory Maxwell2015-11-032-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of lock-time constraints"" This reverts commit 8537ecdfc40181249ec37556015a99cfae4b21fd.
| * | | | Restore MedianTimePast for locktime.Gregory Maxwell2015-11-035-7/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations"" This reverts commit 40cd32e835092c3158175511da5193193ec54939. After careful analysis it was determined that the change was, in fact, safe and several people were suffering momentary confusion about locktime semantics.
* | | | | Merge pull request #6887Wladimir J. van der Laan2015-11-057-14/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 53238ff Clarify what minrelaytxfee does (MarcoFalke) abd8b76 [qt] Properly display required fee instead of minTxFee (MarcoFalke)
| * | | | | Clarify what minrelaytxfee doesMarcoFalke2015-11-032-2/+2
| | | | | |
| * | | | | [qt] Properly display required fee instead of minTxFeeMarcoFalke2015-11-035-12/+26
| | | | | |
* | | | | | Merge pull request #6944Wladimir J. van der Laan2015-11-051-197/+39
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | fb9857b Squashed 'src/leveldb/' changes from 7d41e6f..20ca81f (Pieter Wuille)
| * | | | | Update LevelDBPieter Wuille2015-11-041-197/+39
|/| | | | |
| * | | | | Squashed 'src/leveldb/' changes from 7d41e6f..20ca81fPieter Wuille2015-11-041-197/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20ca81f Merge pull request #9 7aa105e leveldb: Win32WritableFile without memory mapping git-subtree-dir: src/leveldb git-subtree-split: 20ca81f08fb7fa108923a091668e447dcf5c6b9d
* | | | | | Merge pull request #6938Wladimir J. van der Laan2015-11-043-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | dbacc69 build: If both Qt4 and Qt5 are installed, use Qt5 (Wladimir J. van der Laan)
| * | | | | | build: If both Qt4 and Qt5 are installed, use Qt5Wladimir J. van der Laan2015-11-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If both Qt4 and Qt5 development headers are installed, use Qt5. Building against Qt5 should be encouraged as that is where active development happens.
* | | | | | | Merge pull request #6864Wladimir J. van der Laan2015-11-047-11/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 268b79e [qt] rpcconsole: Scale monospace font to 95% (MarcoFalke) 28313b8 [qt] Use fixed pitch font for the rpc console (MarcoFalke)
| * | | | | | [qt] rpcconsole: Scale monospace font to 95%MarcoFalke2015-11-031-2/+2
| | | | | | |
| * | | | | | [qt] Use fixed pitch font for the rpc consoleMarcoFalke2015-10-297-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: * Preserve white space * Make fixed font as large as default font
* | | | | | | Merge pull request #6669Wladimir J. van der Laan2015-11-045-57/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6342a48 Init: Use DEFAULT_TRANSACTION_MINFEE in help message (MarcoFalke) a9c73a1 [wallet] Add comments for doxygen (MarcoFalke) 6b0e622 [wallet] Refactor to use new MIN_CHANGE (MarcoFalke)
| * | | | | | | Init: Use DEFAULT_TRANSACTION_MINFEE in help messageMarcoFalke2015-10-291-1/+1
| | | | | | | |
| * | | | | | | [wallet] Add comments for doxygenMarcoFalke2015-10-282-2/+21
| | | | | | | |
| * | | | | | | [wallet] Refactor to use new MIN_CHANGEMarcoFalke2015-10-284-56/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce new constant MIN_CHANGE and use it instead of the hardcoded "CENT" * Add test case for MIN_CHANGE * Introduce new constant for -mintxfee default: DEFAULT_TRANSACTION_MINFEE = 1000
* | | | | | | | Merge pull request #6927Wladimir J. van der Laan2015-11-043-6/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | de0499d Fix ZMQ Notification initialization and shutdown (João Barbosa)
| * | | | | | | Fix ZMQ Notification initialization and shutdownJoão Barbosa2015-11-043-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the call Initialize() from init.cpp to CreateWithArguments() and handles the return value. Moves the call Shutdown() from init.cpp to destructor. Changes Initialize() and Shutdown() to protected members.
* | | | | | | | Merge pull request #6933Wladimir J. van der Laan2015-11-043-18/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 35bb381 build: Improve build instructions (Wladimir J. van der Laan)
| * | | | | | | | build: Improve build instructionsWladimir J. van der Laan2015-11-043-18/+66
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add package instructions for Ubuntu 15.10 - Clarify BerkeleyDB/wallet situation for unix - Add basic build instructions for Windows (closes #1401)
* | | | | | | | Merge pull request #6905Wladimir J. van der Laan2015-11-047-16/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6efc01 Bugfix: Omit wallet-related options from -help when wallet is disabled (Luke Dashjr) 5f9260f Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo (Luke Dashjr) 420a82f Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool) (Luke Dashjr) caa3d42 Bugfix: RPC: blockchain: Display correct defaults in help for verifychain method (Luke Dashjr)
| * | | | | | | Bugfix: Omit wallet-related options from -help when wallet is disabledLuke Dashjr2015-10-301-0/+4
| | | | | | | |
| * | | | | | | Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also ↵Luke Dashjr2015-10-013-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show correct default in getmininginfo
| * | | | | | | Bugfix: Describe dblogsize option correctly (it refers to the wallet ↵Luke Dashjr2015-10-013-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database, not memory pool)
| * | | | | | | Bugfix: RPC: blockchain: Display correct defaults in help for verifychain methodLuke Dashjr2015-10-013-10/+13
| | | | | | | |
* | | | | | | | Merge pull request #6930Wladimir J. van der Laan2015-11-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ff2a2af build: don't distribute tests_config.py (Wladimir J. van der Laan)
| * | | | | | | | build: don't distribute tests_config.pyWladimir J. van der Laan2015-11-021-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is dynamically generated by configure based on the platform, it doesn't belong in the distribution archive. Fixes #6929.
* | | | | | | | Merge pull request #6928Wladimir J. van der Laan2015-11-026-58/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40cd32e Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations" (Gregory Maxwell) 8537ecd Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints" (Gregory Maxwell)
| * | | | | | | | Revert "Add rules--presently disabled--for using GetMedianTimePast as ↵Gregory Maxwell2015-11-015-54/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoint for lock-time calculations" This reverts commit 9d55050773d57c0e12005e524f2e54d9e622c6e2. As noted by Luke-Jr, under some conditions this will accept transactions which are invalid by the network rules. This happens when the current block time is head of the median time past and a transaction's locktime is in the middle. This could be addressed by changing the rule to MAX(this_block_time, MTP+offset) but this solution and the particular offset used deserve some consideration.
| * | | | | | | | Revert "Enable policy enforcing GetMedianTimePast as the end point of ↵Gregory Maxwell2015-11-012-5/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock-time constraints" This reverts commit dea8d21fc63e9f442299c97010e4740558f4f037.
* | | | | | | | Merge pull request #6926Wladimir J. van der Laan2015-11-021-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | 7497e80 tests: Initialize networking on windows (Wladimir J. van der Laan)
| * | | | | | | tests: Initialize networking on windowsWladimir J. van der Laan2015-11-011-0/+1
| | | | | | | |
* | | | | | | | qt: translation update prior to opening 0.12 translationsWladimir J. van der Laan2015-11-013-94/+129
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Also update transifex slug for new version.