diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-04-27 09:28:51 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-27 09:28:54 -0400 |
| commit | 3356799ee3f5441b8d6e68b9172eb641011354f8 (patch) | |
| tree | c7d9cfc35fb92eb7f9cc60f006b01955e5ab809c /src/validation.cpp | |
| parent | b025aa3b9e1dd02369ee0a016b8349536290fa7f (diff) | |
| parent | 5c759c73b2602c7fde1c50dbafe5525904c1b64c (diff) | |
| download | bitcoin-3356799ee3f5441b8d6e68b9172eb641011354f8.tar.xz | |
Merge #15778: [wallet] Move maxtxfee from node to wallet
5c759c73b2 [wallet] Move maxTxFee to wallet (John Newbery)
Pull request description:
Closes #15355
Moves the `-maxtxfee` from the node to the wallet. See discussion in issue for details.
This is a cleanup. There is no change in behaviour.
Completes #15620
ACKs for commit 5c759c:
MarcoFalke:
utACK 5c759c73b2602c7fde1c50dbafe5525904c1b64c
ryanofsky:
utACK 5c759c73b2602c7fde1c50dbafe5525904c1b64c. Changes since last review: updated commit message and an error message and method name.
meshcollider:
utACK https://github.com/bitcoin/bitcoin/pull/15778/commits/5c759c73b2602c7fde1c50dbafe5525904c1b64c
Tree-SHA512: 2f9b2729da3940a5cda994d3f3bc11ee1a52fcc1c5e9842ea0ea63e4eb0300e8416853046776311298bc449ba07554aa46f0f245ce28598a5b0bd7347c12e752
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 6bbce9d99a..c0b3243c8d 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -252,7 +252,6 @@ uint256 hashAssumeValid; arith_uint256 nMinimumChainWork; CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); -CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE; CBlockPolicyEstimator feeEstimator; CTxMemPool mempool(&feeEstimator); |