diff options
| author | Pieter Wuille <[email protected]> | 2011-06-02 16:17:37 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2011-06-02 16:17:37 +0200 |
| commit | 7c05877df277b10ec0517bc3ed5e71cb6e1d5faf (patch) | |
| tree | a534a210b0a0cacd5246abcb5e33d277f6e1d513 /src/main.cpp | |
| parent | loss of significance in difficulty (by lfm) (diff) | |
| parent | Merge pull request #278 from TheBlueMatt/win32ssl (diff) | |
| download | discoin-7c05877df277b10ec0517bc3ed5e71cb6e1d5faf.tar.xz discoin-7c05877df277b10ec0517bc3ed5e71cb6e1d5faf.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index f5f1ffd4a..793cf77f1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -731,7 +731,7 @@ 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, false, true)) + if (nFees < GetMinFee(1000, true, true)) return error("AcceptToMemoryPool() : not enough fees"); // Continuously rate-limit free transactions |