diff options
| author | Matt Corallo <git@bluematt.me> | 2013-05-17 12:07:02 +0200 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2013-06-14 13:37:43 +0200 |
| commit | 87cce04c171800d29df1f13ecf9b36c933262b08 (patch) | |
| tree | 763dc008f7a63eab53b26bc3f82c0833adb7240e /src/main.h | |
| parent | d1020b780a1493c6a709f70756b2af54a7126f40 (diff) | |
| download | bitcoin-87cce04c171800d29df1f13ecf9b36c933262b08.tar.xz | |
Refactor fee rules to make them actually readable.
This (nearly) doesn't change fee rules at all:
* To make it into the fee transaction area, the dPriority comparison
changed from < to <=
* We now just ignore transactions > MAX_BLOCK_SIZE/4 instead of
doing some calculations to require increasingly large fees as
size increases.
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index f20fad98a4..c0c7ba8d89 100644 --- a/src/main.h +++ b/src/main.h @@ -52,6 +52,8 @@ static const int COINBASE_MATURITY = 100; static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC /** Maximum number of script-checking threads allowed */ static const int MAX_SCRIPTCHECK_THREADS = 16; +/** Default amount of block size reserved for high-priority transactions (in bytes) */ +static const int DEFAULT_BLOCK_PRIORITY_SIZE = 27000; #ifdef USE_UPNP static const int fHaveUPnP = true; #else @@ -262,12 +264,11 @@ struct CDiskTxPos : public CDiskBlockPos enum GetMinFee_mode { - GMF_BLOCK, GMF_RELAY, GMF_SEND, }; -int64 GetMinFee(const CTransaction& tx, unsigned int nBlockSize = 1, bool fAllowFree = true, enum GetMinFee_mode mode = GMF_BLOCK); +int64 GetMinFee(const CTransaction& tx, bool fAllowFree, enum GetMinFee_mode mode); // // Check transaction inputs, and make sure any |