diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-12 12:27:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-12 12:27:01 +0200 |
| commit | 18cf214528d14692941311be154214cab1772ed5 (patch) | |
| tree | f3525c858aadbff78832fb9a4198077fbbc27b1f /src/main.h | |
| parent | 0424613ba24de94b58f6fa7bf1627fd4e2807208 (diff) | |
| download | bitcoin-18cf214528d14692941311be154214cab1772ed5.tar.xz | |
update bitcoin core to git ce148944c776ae8e91cc058f44ddce356c7cebc9
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index 8d9b39f718..436ffbecbd 100644 --- a/src/main.h +++ b/src/main.h @@ -29,8 +29,8 @@ static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; static const int64 COIN = 100000000; static const int64 CENT = 1000000; -static const int64 MIN_TX_FEE = CENT; -static const int64 MIN_RELAY_TX_FEE = 50000; +static const int64 MIN_TX_FEE = 50000; +static const int64 MIN_RELAY_TX_FEE = 10000; static const int64 MAX_MONEY = 21000000 * COIN; inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } static const int COINBASE_MATURITY = 100; @@ -79,7 +79,6 @@ extern int fUseUPnP; - bool CheckDiskSpace(uint64 nAdditionalBytes=0); FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb"); FILE* AppendBlockFile(unsigned int& nFileRet); |