diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2011-05-26 13:33:51 -0700 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2011-05-26 13:33:51 -0700 |
commit | 3d962315f24961e9bc9bc198a6773ba41d92a90d (patch) | |
tree | 4f0e8f39e4a65db2f2e95ff4464d1056839e0a49 /src/main.cpp | |
parent | 20d28e60316af2ee8763d942cba6b7d63bb70b05 (diff) | |
parent | 2bfda1be11a079f7b468c79d79a91ddb30369557 (diff) | |
download | bitcoin-3d962315f24961e9bc9bc198a6773ba41d92a90d.tar.xz |
Merge pull request #267 from sipa/mintxrelay
Separate required fee for relaying and creation
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 68b6b4ee1b..f5f1ffd4ac 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -731,13 +731,13 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi } // Don't accept it if it can't get into a block - if (nFees < GetMinFee(1000)) + if (nFees < GetMinFee(1000, false, true)) return error("AcceptToMemoryPool() : not enough fees"); // Continuously rate-limit free transactions // This mitigates 'penny-flooding' -- sending thousands of free transactions just to // be annoying or make other's transactions take longer to confirm. - if (nFees < MIN_TX_FEE) + if (nFees < MIN_RELAY_TX_FEE) { static CCriticalSection cs; static double dFreeCount; @@ -3329,7 +3329,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); + int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true); // Connecting shouldn't fail due to dependency on other memory pool transactions // because we're already processing them in order of dependency |