aboutsummaryrefslogtreecommitdiff
path: root/src/node
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2019-04-12 16:22:12 -0400
committergzhao408 <gzhao408@berkeley.edu>2020-10-05 04:55:01 -0700
commitb048b275d9711f70847afaea5450f17a0f7e673a (patch)
tree210b8fe86fc894c175d06885ece5c978fd8df1f4 /src/node
parent932564b9cfda8446a957649c2316a52e868ad5d4 (diff)
downloadbitcoin-b048b275d9711f70847afaea5450f17a0f7e673a.tar.xz
[validation] Remove absurdfee from accepttomempool
Mempool behavior should not be user-specific. Checking that txfee is acceptable should be the responsibility of the wallet or client, not the mempool.
Diffstat (limited to 'src/node')
-rw-r--r--src/node/transaction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp
index 8162b79a0b..b72f7b70e9 100644
--- a/src/node/transaction.cpp
+++ b/src/node/transaction.cpp
@@ -55,7 +55,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t
// First, call ATMP with test_accept and check the fee. If ATMP
// fails here, return error immediately.
if (!AcceptToMemoryPool(*node.mempool, state, tx,
- nullptr /* plTxnReplaced */, false /* bypass_limits */, /* absurdfee*/ 0, /* test_accept */ true, &fee)) {
+ nullptr /* plTxnReplaced */, false /* bypass_limits */, /* test_accept */ true, &fee)) {
return HandleATMPError(state, err_string);
} else if (fee > max_tx_fee) {
return TransactionError::MAX_FEE_EXCEEDED;
@@ -63,7 +63,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t
}
// Try to submit the transaction to the mempool.
if (!AcceptToMemoryPool(*node.mempool, state, tx,
- nullptr /* plTxnReplaced */, false /* bypass_limits */, max_tx_fee)) {
+ nullptr /* plTxnReplaced */, false /* bypass_limits */)) {
return HandleATMPError(state, err_string);
}