diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-27 12:45:30 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-27 12:59:37 +0100 |
| commit | e92377fa7f9a34a6e6474a1d03d6402856f90f38 (patch) | |
| tree | bddaeed46e5fcf4a79256ce05a2d80f92e93c756 /src/main.h | |
| parent | 05d591839fe1fefb0cf359083bce87cb128f75a6 (diff) | |
| parent | e30443244a7a50f2db70e593ec8a57e5086db3d9 (diff) | |
| download | bitcoin-e92377fa7f9a34a6e6474a1d03d6402856f90f38.tar.xz | |
Merge pull request #6134
e304432 Pass reference to estimateSmartFee and cleanup whitespace (Suhas Daftuar)
56106a3 Expose RPC calls for estimatesmart functions (Alex Morcos)
e93a236 add estimateSmartFee to the unit test (Alex Morcos)
6303051 EstimateSmart functions consider mempool min fee (Alex Morcos)
f22ac4a Increase success threshold for fee estimation to 95% (Alex Morcos)
4fe2823 Change wallet and GUI code to use new smart fee estimation calls. (Alex Morcos)
22eca7d Add smart fee estimation functions (Alex Morcos)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index eb61ff9570..347624c520 100644 --- a/src/main.h +++ b/src/main.h @@ -56,8 +56,6 @@ static const unsigned int DEFAULT_ANCESTOR_SIZE_LIMIT = 101; static const unsigned int DEFAULT_DESCENDANT_LIMIT = 25; /** Default for -limitdescendantsize, maximum kilobytes of in-mempool descendants */ static const unsigned int DEFAULT_DESCENDANT_SIZE_LIMIT = 101; -/** Default for -maxmempool, maximum megabytes of mempool memory usage */ -static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300; /** Default for -mempoolexpiry, expiration time for mempool transactions in hours */ static const unsigned int DEFAULT_MEMPOOL_EXPIRY = 72; /** The maximum size of a blk?????.dat file (since 0.8) */ |