aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
Commit message (Expand)AuthorAgeFilesLines
* Merge #7070: Move maxTxFee out of mempoolWladimir J. van der Laan2016-02-041-1/+1
|\
| * Move maxTxFee out of mempoolMarcoFalke2016-02-021-1/+1
* | Merge #7444: Improve block validity/ConnectBlock() commentsWladimir J. van der Laan2016-02-031-10/+14
|\ \
| * | Improve block validity/ConnectBlock() commentsPeter Todd2016-01-311-10/+14
* | | Merge #7431: Rename permitrbf to mempoolreplacement and provide minimal strin...Wladimir J. van der Laan2016-02-031-3/+3
|\ \ \ | |_|/ |/| |
| * | Rename replacebyfee=opt-in to mempoolreplacement=feeLuke Dashjr2016-02-011-1/+1
| * | Rename permitrbf to replacebyfeeLuke Dashjr2016-01-281-3/+3
| |/
* | Merge #7084: mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFeeWladimir J. van der Laan2016-02-021-0/+10
|\ \
| * | [doxygen] Actually display commentMarcoFalke2016-02-021-1/+1
| * | mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFeeMarcoFalke2016-01-301-0/+10
| |/
* / Add whitelistforcerelay to control forced relaying.Gregory Maxwell2016-01-281-2/+4
|/
* Add option `-permitrbf` to set transaction replacement policyWladimir J. van der Laan2016-01-211-0/+3
* Merge pull request #7208Wladimir J. van der Laan2016-01-181-0/+2
|\
| * Make max tip age an option instead of chainparamWladimir J. van der Laan2015-12-141-0/+2
* | Merge pull request #7081Wladimir J. van der Laan2016-01-091-0/+2
|\ \
| * \ Merge branch bytespersigopLuke Dashjr2016-01-091-0/+2
| |\ \
| | * | -bytespersigop option to additionally limit sigops in transactions we relay a...Luke Dashjr2015-12-011-0/+2
| | |/
* | | Merge pull request #7205Wladimir J. van der Laan2016-01-051-1/+1
|\ \ \
| * | | Bump copyright headers to 2015MarcoFalke2015-12-131-1/+1
| | |/ | |/|
* | | Merge pull request #7062Wladimir J. van der Laan2015-12-211-2/+0
|\ \ \ | | |/ | |/|
| * | Remove GetMinRelayFeeSuhas Daftuar2015-12-021-2/+0
| |/
* / Replace trickle nodes with per-node/message Poisson delaysPieter Wuille2015-12-111-2/+9
|/
* Expose FormatStateMessageAlex Morcos2015-12-011-0/+2
* Merge pull request #7141Wladimir J. van der Laan2015-12-011-1/+7
|\
| * rpc: Don't translate warning messagesWladimir J. van der Laan2015-12-011-1/+7
* | removeForReorg calls once-per-disconnect-> once-per-reorgMatt Corallo2015-11-301-1/+1
|/
* Merge pull request #7116Wladimir J. van der Laan2015-11-301-1/+1
|\
| * Trivial: Fix warning introduced by #7053 by casting to uint64_tJorge Timón2015-11-291-1/+1
* | Allow block announcements with headersSuhas Daftuar2015-11-291-0/+3
* | [trivial] Reuse translation and cleanup DEFAULT_* valuesMarcoFalke2015-11-281-0/+4
* | Constrain constant values to a single location in codeLuke Dashjr2015-11-281-0/+7
|/
* Merge pull request #7053Wladimir J. van der Laan2015-11-271-8/+5
|\
| * Globals: Remove a bunch of Params() calls from main.cpp:Jorge Timón2015-11-231-8/+5
* | Merge pull request #6134Wladimir J. van der Laan2015-11-271-2/+0
|\ \ | |/ |/|
| * EstimateSmart functions consider mempool min feeAlex Morcos2015-11-161-2/+0
* | Merge pull request #6986Gregory Maxwell2015-11-161-2/+3
|\ \ | |/ |/|
| * Chainparams: Explicit CChainParams arg for main (pre miner):Jorge Timón2015-11-111-2/+3
* | Add whitelistalwaysrelay optionPatick Strateman2015-11-141-0/+2
* | Merge #6771 from branch 'lowerLimits' of git://github.com/morcos/bitcoinJeff Garzik2015-11-121-4/+4
|\ \ | |/ |/|
| * Lower default policy limitsAlex Morcos2015-10-271-4/+4
* | Merge pull request #6982Wladimir J. van der Laan2015-11-111-1/+0
|\ \
| * | Globals: Make AcceptBlockHeader static (Fix #6163)Jorge Timón2015-11-111-1/+0
* | | Merge pull request #6822Wladimir J. van der Laan2015-11-101-0/+2
|\ \ \ | |/ / |/| |
| * | [trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000MarcoFalke2015-11-091-0/+2
* | | Merge pull request #6163Wladimir J. van der Laan2015-11-101-7/+5
|\ \ \ | |/ / |/| |
| * | Globals: Explicit Consensus::Params arg for main:Jorge Timón2015-10-301-7/+5
| |/
* | Merge pull request #6934Wladimir J. van der Laan2015-11-051-1/+3
|\ \
| * | Restore MedianTimePast for locktime.Gregory Maxwell2015-11-031-1/+3
* | | Merge pull request #6905Wladimir J. van der Laan2015-11-041-0/+3
|\ \ \ | |/ / |/| |
| * | Bugfix: RPC: blockchain: Display correct defaults in help for verifychain methodLuke Dashjr2015-10-011-0/+3