aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Chainparams: Explicit CChainParams arg for miner:Jorge Timón2015-11-116-24/+23
| | | | | | | -BitcoinMiner -CreateNewBlock -GenerateBitcoins -ProcessBlockFound
* Chainparams: Explicit CChainParams arg for main (pre miner):Jorge Timón2015-11-116-17/+18
| | | | | -ProcessNewBlock -TestBlockValidity
* Merge pull request #6978Wladimir J. van der Laan2015-11-117-27/+93
|\ | | | | | | | | 69d0513 build: Use fPIC rather than fPIE for qt objects. (Cory Fields) 17c4d9d build: Split hardening/fPIE options out (Cory Fields)
| * build: Use fPIC rather than fPIE for qt objects.Cory Fields2015-11-093-3/+41
| | | | | | | | But only if qt was built with reduced relocations.
| * build: Split hardening/fPIE options outCory Fields2015-11-097-27/+55
| | | | | | | | This allows for fPIE to be used selectively.
* | Merge pull request #6982Wladimir J. van der Laan2015-11-112-5/+3
|\ \ | | | | | | | | | 7267843 Globals: Make AcceptBlockHeader static (Fix #6163) (Jorge Timón)
| * | Globals: Make AcceptBlockHeader static (Fix #6163)Jorge Timón2015-11-112-5/+3
| | | | | | | | | | | | ..and at the same time prevent AcceptBlockHeader() from calling global function Params()
* | | Merge pull request #6985Wladimir J. van der Laan2015-11-111-4/+4
|\ \ \ | | | | | | | | | | | | 7791395 [gitian] Use vm-builder_0.12.4+bzr494 on Debian (Michael)
| * | | [gitian] Use vm-builder_0.12.4+bzr494 on DebianMichael2015-11-111-4/+4
|/ / /
* | | Merge pull request #6965Wladimir J. van der Laan2015-11-101-9/+19
|\ \ \ | | | | | | | | | | | | 77f1f59 Benchmark sanity checks and fork checks in ConnectBlock (Matt Corallo)
| * | | Benchmark sanity checks and fork checks in ConnectBlockMatt Corallo2015-11-061-9/+19
| | | |
* | | | qt: Periodic translations updateWladimir J. van der Laan2015-11-1072-4034/+3275
| | | |
* | | | Merge pull request #6940Wladimir J. van der Laan2015-11-101-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | 7ca73dc Improving labels for Sent / Received "Bytes" (Jonathan Cross)
| * | | | Improving labels for Sent / Received "Bytes"Jonathan Cross2015-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The labels for Sent & Received data in the "Peers" debug panel should not be defined as "Bytes" because the units (B, KB, MB) appear after the number. I decided to simply use "Sent" and "Received" (rather than "Data Sent" and "Data Received") because we already have translations for the former: https://www.transifex.com/bitcoin/bitcoin/viewstrings/#ja/qt-translation-011x/47533089?q=sent https://www.transifex.com/bitcoin/bitcoin/viewstrings/#ja/qt-translation-011x/47533089?q=received Demo of changes: Current UI: Bytes Sent 12 KB Bytes Received 26 MB With this pull request: Sent 12 KB Received 26 MB
* | | | | Merge pull request #6822Wladimir J. van der Laan2015-11-105-7/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e20d924 [trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEE (MarcoFalke) 536766c [trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000 (MarcoFalke) 5f46a7d transaction_tests: Be more strict checking dust (MarcoFalke)
| * | | | | [trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEEMarcoFalke2015-11-091-2/+2
| | | | | |
| * | | | | [trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000MarcoFalke2015-11-093-2/+4
| | | | | |
| * | | | | transaction_tests: Be more strict checking dustMarcoFalke2015-11-092-4/+19
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * Don't allow off-by-one or more * Make clear dust is coupled with minRelayTxFee * Check rounding for odd values
* | | | | Merge pull request #5574Wladimir J. van der Laan2015-11-101-3/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | fd55571 wallet: Expose GUI labels in RPC (Luke Dashjr)
| * | | | wallet: Expose GUI labels in RPCLuke Dashjr2015-10-021-3/+14
| | | | |
* | | | | Merge pull request #6163Wladimir J. van der Laan2015-11-107-45/+52
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 87cbdb8 Globals: Explicit Consensus::Params arg for main: (Jorge Timón)
| * | | | Globals: Explicit Consensus::Params arg for main:Jorge Timón2015-10-307-45/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -CheckBlockIndex -DisconnectTip -GetTransaction -InvalidateBlock -ProcessGetData -ReadBlockFromDisk
* | | | | 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