diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-01-25 22:20:02 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-01-25 22:24:40 -0500 |
| commit | ae9719ab87a05ca4c3293b2f8675f17b16ed5872 (patch) | |
| tree | 264da44e84591767467c1ed2e1d2c620523b27ad /src/wallet | |
| parent | fe8e8efcf91fa92db68aabeb0a1709b032e60dd6 (diff) | |
| download | bitcoin-ae9719ab87a05ca4c3293b2f8675f17b16ed5872.tar.xz | |
Refactor GetMinimumFee to give option of providing targetFee
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 9 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 6251998099..c46d5ed780 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2790,8 +2790,13 @@ CAmount CWallet::GetRequiredFee(unsigned int nTxBytes) CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool) { - // payTxFee is user-set "I want to pay this much" - CAmount nFeeNeeded = payTxFee.GetFee(nTxBytes); + // payTxFee is the user-set global for desired feerate + return GetMinimumFee(nTxBytes, nConfirmTarget, pool, payTxFee.GetFee(nTxBytes)); +} + +CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, CAmount targetFee) +{ + CAmount nFeeNeeded = targetFee; // User didn't set: use -txconfirmtarget to estimate... if (nFeeNeeded == 0) { int estimateFoundTarget = nConfirmTarget; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index ecc63a9a13..f95c0589d6 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -803,6 +803,11 @@ public: */ static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool); /** + * Estimate the minimum fee considering required fee and targetFee or if 0 + * then fee estimation for nConfirmTarget + */ + static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, CAmount targetFee); + /** * Return the minimum required fee taking into account the * floating relay fee and user set minimum transaction fee */ |