diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-06-22 10:08:57 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-06-22 10:08:57 -0700 |
| commit | b4a8a326c067a350b5a5ff0e565555b57ffb3a2e (patch) | |
| tree | 74143027afbf9170257c5928832df67c387cd19a /src/main.h | |
| parent | 48628fd98c587a557c9b3dc9eefed1bd5d20725e (diff) | |
| parent | 87cce04c171800d29df1f13ecf9b36c933262b08 (diff) | |
| download | bitcoin-b4a8a326c067a350b5a5ff0e565555b57ffb3a2e.tar.xz | |
Merge pull request #2660 from TheBlueMatt/gmfrefactor
Refactor fee rules to make them actually readable.
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 ec89d8bdd3..2fbf3e8026 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 @@ -260,12 +262,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 |