diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-20 13:09:18 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-20 13:09:18 -0800 |
| commit | 781c06c0f534913321a415a4fb64a60734e43101 (patch) | |
| tree | f2d96b0c74da35b701513a629817c7e944798827 /src/main.cpp | |
| parent | 595925592d36fb5d5d34beea3c3e71fca2b6726e (diff) | |
| parent | dbbf1d4a48c8761a67a4477bef48f17c0badef7b (diff) | |
| download | bitcoin-781c06c0f534913321a415a4fb64a60734e43101.tar.xz | |
Merge pull request #677 from luke-jr/minfee_modes
API: GetMinFee modes
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index cfd6ac2c46..bef76f7374 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -503,7 +503,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi return error("AcceptToMemoryPool() : transaction with out-of-bounds SigOpCount"); // Don't accept it if it can't get into a block - if (nFees < GetMinFee(1000, true, true)) + if (nFees < GetMinFee(1000, true, GMF_RELAY)) return error("AcceptToMemoryPool() : not enough fees"); // Continuously rate-limit free transactions @@ -2959,7 +2959,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) // Transaction fee required depends on block size bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority)); - int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true); + int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK); // Connecting shouldn't fail due to dependency on other memory pool transactions // because we're already processing them in order of dependency |