aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge pull request #6780Wladimir J. van der Laan2015-11-274-67/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Initialize logging before we do parameter interactionJonas Schnelli2015-11-274-7/+16
| * | | | | | | | | | | | | | | | | Move -blocksonly parameter interaction to the new ParameterInteraction() func...Jonas Schnelli2015-11-271-0/+10
| * | | | | | | | | | | | | | | | | [QT] Call inits parameter interaction before we create the options modelJonas Schnelli2015-11-271-0/+9
| * | | | | | | | | | | | | | | | | Refactor parameter interaction, call it before AppInit2()Jonas Schnelli2015-11-273-60/+67
* | | | | | | | | | | | | | | | | | Merge pull request #7053Wladimir J. van der Laan2015-11-275-49/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Globals: Remove a bunch of Params() calls from main.cpp:Jorge Timón2015-11-235-49/+44
* | | | | | | | | | | | | | | | | | | Merge pull request #6871Wladimir J. van der Laan2015-11-272-9/+202
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix incorrect locking of mempool during RBF replacementPeter Todd2015-11-101-2/+5
| * | | | | | | | | | | | | | | | | | | Improve RBF replacement criteriaSuhas Daftuar2015-11-102-16/+52
| * | | | | | | | | | | | | | | | | | | Reject replacements that add new unconfirmed inputsPeter Todd2015-11-101-0/+24
| * | | | | | | | | | | | | | | | | | | Prevent low feerate txs from (directly) replacing high feerate txsPeter Todd2015-11-101-24/+38
| * | | | | | | | | | | | | | | | | | | Add opt-in full-RBF to mempoolPeter Todd2015-11-101-5/+121
* | | | | | | | | | | | | | | | | | | | Merge pull request #6134Wladimir J. van der Laan2015-11-2715-44/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Pass reference to estimateSmartFee and cleanup whitespaceSuhas Daftuar2015-11-244-10/+9
| * | | | | | | | | | | | | | | | | | | Expose RPC calls for estimatesmart functionsAlex Morcos2015-11-164-0/+78
| * | | | | | | | | | | | | | | | | | | add estimateSmartFee to the unit testAlex Morcos2015-11-161-0/+20
| * | | | | | | | | | | | | | | | | | | EstimateSmart functions consider mempool min feeAlex Morcos2015-11-166-8/+22
| * | | | | | | | | | | | | | | | | | | Increase success threshold for fee estimation to 95%Alex Morcos2015-11-162-19/+22
| * | | | | | | | | | | | | | | | | | | Change wallet and GUI code to use new smart fee estimation calls.Alex Morcos2015-11-163-24/+22
| * | | | | | | | | | | | | | | | | | | Add smart fee estimation functionsAlex Morcos2015-11-164-0/+75
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5967Wladimir J. van der Laan2015-11-272-7/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Alter assumptions in CCoinsViewCache::BatchWriteAlex Morcos2015-11-182-7/+28
* | | | | | | | | | | | | | | | | | | Merge pull request #7058Wladimir J. van der Laan2015-11-273-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | zmq: prepend zmq to debug messagesDaniel Cousens2015-11-192-8/+8
| * | | | | | | | | | | | | | | | | | init: add zmq to debug categoriesDaniel Cousens2015-11-191-1/+1
| * | | | | | | | | | | | | | | | | | init: amend ZMQ flag namesDaniel Cousens2015-11-191-3/+3
* | | | | | | | | | | | | | | | | | | Merge pull request #7069Wladimir J. van der Laan2015-11-261-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [trivial] Fix -maxmempool InitErrorMarcoFalke2015-11-241-5/+5
* | | | | | | | | | | | | | | | | | | | Merge pull request #7087Wladimir J. van der Laan2015-11-262-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Document both the peerbloomfilters and enforcenodebloom options.Patick Strateman2015-11-241-0/+3
| * | | | | | | | | | | | | | | | | | | Add enforcenodebloom option.Patick Strateman2015-11-241-5/+3
| * | | | | | | | | | | | | | | | | | | Move bloom filter filtering logic outside of command "switch" (giant if/else).Patick Strateman2015-11-241-15/+15
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7088Wladimir J. van der Laan2015-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge commit '5ad54630935d1f340666de7bc9ffef9b8a1df296' into HEADMarcoFalke2015-11-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7006Jonas Schnelli2015-11-254-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add UI help for -resetguisettingsJonas Schnelli2015-11-181-0/+1
| * | | | | | | | | | | | | | | | | [Qt] add startup option to reset Qt settingsJonas Schnelli2015-11-133-9/+12
* | | | | | | | | | | | | | | | | | Merge pull request #7075Wladimir J. van der Laan2015-11-241-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Move time data log print to 'net' category to reduce log noisetulip2015-11-221-7/+7
* | | | | | | | | | | | | | | | | | | Merge pull request #7066Wladimir J. van der Laan2015-11-241-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add missing "blocktime" description to listtransactions help, fix formatting.Pavel Janík2015-11-201-2/+3
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7045Wladimir J. van der Laan2015-11-241-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Bugfix: Use unique autostart filenames on Linux for testnet/regtestLuke Dashjr2015-11-171-1/+4
* | | | | | | | | | | | | | | | | | | | Merge pull request #7065Wladimir J. van der Laan2015-11-241-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | http: add Boost 1.49 compatibilityWladimir J. van der Laan2015-11-201-0/+4
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7046Gregory Maxwell2015-11-224-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Improve log messages for blocks only violations.Patick Strateman2015-11-211-2/+2
| * | | | | | | | | | | | | | | | | | Add relaytxes status to getpeerinfoPeter Todd2015-11-203-0/+4
| * | | | | | | | | | | | | | | | | | Bail early in processing transactions in blocks only mode.Patick Strateman2015-11-201-0/+8