From 3d363eccd436df49bcdfccf01bcd5148ba3cfb87 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Wed, 10 Jan 2018 08:43:05 +0000 Subject: Bring 1.14 fees in line with 1.10 (#1425) * Disable free transactions * Updating remaining fee calculation constants * Round up to the nearest 1k, not up 1k so the UI fee estimator is correct --- src/wallet/wallet.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/wallet/wallet.cpp') diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b34cbae3a..c61272c8b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2808,18 +2808,14 @@ bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB *pwa CAmount CWallet::GetRequiredFee(const CMutableTransaction& tx, unsigned int nTxBytes) { - // Dogecoin: Round TX bytes up to the next 1,000 bytes - nTxBytes += 1000 - (nTxBytes % 1000); - + nTxBytes = GetDogecoinTxSize(nTxBytes); // Dogecoin: Add an increased fee for each dust output return std::max(minTxFee.GetFee(nTxBytes) + GetDogecoinDustFee(tx.vout, minTxFee), ::minRelayTxFee.GetFee(nTxBytes)); } CAmount CWallet::GetRequiredFee(unsigned int nTxBytes) { - // Dogecoin: Round TX bytes up to the next 1,000 bytes - nTxBytes += 1000 - (nTxBytes % 1000); - + nTxBytes = GetDogecoinTxSize(nTxBytes); return std::max(minTxFee.GetFee(nTxBytes), ::minRelayTxFee.GetFee(nTxBytes)); } -- cgit v1.2.3