diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2014-07-03 15:50:24 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-07-03 15:50:24 -0400 |
commit | 21876d38310f07befd5d7967fd68adf923eef6ba (patch) | |
tree | 69710bd1c5634c859c9888faa2cae8a8c10cff07 /src/main.h | |
parent | 07b6c2b90168a91964f096b83f1278c312321771 (diff) | |
parent | 13fc83c77bb9108c00dd7709ce17719edb763273 (diff) | |
download | bitcoin-21876d38310f07befd5d7967fd68adf923eef6ba.tar.xz |
Merge branch 'smartfee_wallet'
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/main.h b/src/main.h index 19f4469008..961f2e78af 100644 --- a/src/main.h +++ b/src/main.h @@ -93,6 +93,7 @@ extern bool fBenchmark; extern int nScriptCheckThreads; extern bool fTxIndex; extern unsigned int nCoinCacheSize; +extern CFeeRate minRelayTxFee; // Minimum disk space required - used in CheckDiskSpace() static const uint64_t nMinDiskSpace = 52428800; @@ -245,14 +246,7 @@ struct CDiskTxPos : public CDiskBlockPos }; - -enum GetMinFee_mode -{ - GMF_RELAY, - GMF_SEND, -}; - -int64_t GetMinFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree, enum GetMinFee_mode mode); +int64_t GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree); // // Check transaction inputs, and make sure any @@ -459,7 +453,7 @@ public: int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); } bool IsInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChainINTERNAL(pindexRet) > 0; } int GetBlocksToMaturity() const; - bool AcceptToMemoryPool(bool fLimitFree=true); + bool AcceptToMemoryPool(bool fLimitFree=true, bool fRejectInsaneFee=true); }; |