diff --git a/src/interfaces/node.h b/src/interfaces/node.h --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -31,7 +31,6 @@ class UniValue; namespace interfaces { - class Handler; class Wallet; @@ -154,13 +153,6 @@ //! Get network active. virtual bool getNetworkActive() = 0; - //! Get required fee. - virtual Amount getRequiredFee(unsigned int tx_bytes) = 0; - - //! Get minimum fee. - virtual Amount getMinimumFee(unsigned int tx_bytes, - const CCoinControl &coin_control) = 0; - //! Get max tx fee. virtual Amount getMaxTxFee() = 0; diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -207,16 +207,6 @@ bool getNetworkActive() override { return g_connman && g_connman->GetNetworkActive(); } - Amount getRequiredFee(unsigned int tx_bytes) override { - CHECK_WALLET(return GetRequiredFee(tx_bytes)); - } - Amount getMinimumFee(unsigned int tx_bytes, - const CCoinControl &coin_control) override { - Amount result; - CHECK_WALLET(result = - GetMinimumFee(tx_bytes, coin_control, g_mempool)); - return result; - } Amount getMaxTxFee() override { return ::maxTxFee; } CFeeRate estimateSmartFee() override { return g_mempool.estimateFee(); } CFeeRate getDustRelayFee() override { return ::dustRelayFee; } diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -211,6 +211,13 @@ virtual std::vector getCoins(const std::vector &outputs) = 0; + //! Get required fee. + virtual Amount getRequiredFee(unsigned int tx_bytes) = 0; + + //! Get minimum fee. + virtual Amount getMinimumFee(unsigned int tx_bytes, + const CCoinControl &coin_control) = 0; + // Return whether HD enabled. virtual bool hdEnabled() = 0; diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include