diff options
| author | Fabian Jahr <fjahr@protonmail.com> | 2020-03-30 21:59:04 +0200 |
|---|---|---|
| committer | Fabian Jahr <fjahr@protonmail.com> | 2020-04-14 15:52:42 +0200 |
| commit | 38677274f931088218eeb1f258077d3387f39c89 (patch) | |
| tree | 677fe43a398920f65b935fb20666140b15164689 /src | |
| parent | bda84a08a0ac92dff6cadc99cf9bb8c3fadd7e13 (diff) | |
| download | bitcoin-38677274f931088218eeb1f258077d3387f39c89.tar.xz | |
rpc: settxfee respects -maxtxfee wallet setting
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 3b8c0e8362..9a0dd1c574 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2337,12 +2337,15 @@ static UniValue settxfee(const JSONRPCRequest& request) CAmount nAmount = AmountFromValue(request.params[0]); CFeeRate tx_fee_rate(nAmount, 1000); + CFeeRate max_tx_fee_rate(pwallet->m_default_max_tx_fee, 1000); if (tx_fee_rate == CFeeRate(0)) { // automatic selection } else if (tx_fee_rate < pwallet->chain().relayMinFee()) { throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("txfee cannot be less than min relay tx fee (%s)", pwallet->chain().relayMinFee().ToString())); } else if (tx_fee_rate < pwallet->m_min_fee) { throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("txfee cannot be less than wallet min fee (%s)", pwallet->m_min_fee.ToString())); + } else if (tx_fee_rate > max_tx_fee_rate) { + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("txfee cannot be more than wallet max tx fee (%s)", max_tx_fee_rate.ToString())); } pwallet->m_pay_tx_fee = tx_fee_rate; |