diff options
| author | Ross Nicoll <[email protected]> | 2018-01-10 08:43:05 +0000 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2018-09-19 21:09:16 +0100 |
| commit | 3d363eccd436df49bcdfccf01bcd5148ba3cfb87 (patch) | |
| tree | 1f045afcb027093b6261f5e2ddd179664fd13d64 /src/wallet | |
| parent | Always use parameters at block 0 to get genesis block hash (#1416) (diff) | |
| download | discoin-3d363eccd436df49bcdfccf01bcd5148ba3cfb87.tar.xz discoin-3d363eccd436df49bcdfccf01bcd5148ba3cfb87.zip | |
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
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 8 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 4 |
2 files changed, 4 insertions, 8 deletions
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)); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 16588721c..5f77a31ea 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -47,7 +47,7 @@ static const unsigned int DEFAULT_KEYPOOL_SIZE = 100; //! -paytxfee default static const CAmount DEFAULT_TRANSACTION_FEE = 0; //! -fallbackfee default -static const CAmount DEFAULT_FALLBACK_FEE = COIN * 20; +static const CAmount DEFAULT_FALLBACK_FEE = COIN; //! -mintxfee default static const CAmount DEFAULT_TRANSACTION_MINFEE = COIN; //! minimum recommended increment for BIP 125 replacement txs @@ -67,7 +67,7 @@ static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6; //! -walletrbf default static const bool DEFAULT_WALLET_RBF = false; //! Largest (in bytes) free transaction we're willing to create -static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000; +static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 0; static const bool DEFAULT_WALLETBROADCAST = true; static const bool DEFAULT_DISABLE_WALLET = false; //! if set, all keys will be derived by using BIP32 |