aboutsummaryrefslogtreecommitdiff
path: root/src/node
diff options
context:
space:
mode:
authorMacroFake <falke.marco@gmail.com>2022-07-21 11:40:22 +0200
committerMacroFake <falke.marco@gmail.com>2022-08-02 15:23:36 +0200
commitfa9cba7afb73c01bd2c8fefd662dfc80dd98c5e8 (patch)
tree6783bc418a352986a77e9e2b37b844523ddf9e02 /src/node
parentfa148602e67fe035b1b21eff6c0b656919ac2d45 (diff)
downloadbitcoin-fa9cba7afb73c01bd2c8fefd662dfc80dd98c5e8.tar.xz
Remove ::incrementalRelayFee and ::minRelayTxFee globals
Diffstat (limited to 'src/node')
-rw-r--r--src/node/interfaces.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 699dca0a73..597b473d4f 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -676,8 +676,16 @@ public:
if (!m_node.mempool) return {};
return m_node.mempool->GetMinFee();
}
- CFeeRate relayMinFee() override { return ::minRelayTxFee; }
- CFeeRate relayIncrementalFee() override { return ::incrementalRelayFee; }
+ CFeeRate relayMinFee() override
+ {
+ if (!m_node.mempool) return CFeeRate{DEFAULT_MIN_RELAY_TX_FEE};
+ return m_node.mempool->m_min_relay_feerate;
+ }
+ CFeeRate relayIncrementalFee() override
+ {
+ if (!m_node.mempool) return CFeeRate{DEFAULT_INCREMENTAL_RELAY_FEE};
+ return m_node.mempool->m_incremental_relay_feerate;
+ }
CFeeRate relayDustFee() override { return ::dustRelayFee; }
bool havePruned() override
{