aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-06-03 15:31:49 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-06-03 15:47:48 +0200
commit8c1e49ba13a88917e133c28d35b665967d4c90b0 (patch)
tree52d67112a6dcc8079da634dbf5ee0ca7af3c8a90 /src/wallet/wallet.h
parentc141c14c9f5f204b137e42cd8d211d231e090df9 (diff)
parent04eaa9095813b854c4299027c595fb9ebaf6f934 (diff)
Merge #7967: [RPC] add feerate option to fundrawtransaction
04eaa90 Add more clear interface for CoinControl.h regarding individual feerate (Jonas Schnelli) 3b35e48 [RPC] add feerate option to fundrawtransaction (Jonas Schnelli)
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r--src/wallet/wallet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b2180a5a26..1ed8a0b37c 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -738,7 +738,7 @@ public:
* Insert additional inputs into the transaction by
* calling CreateTransaction();
*/
- bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
+ bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
/**
* Create a new transaction paying the recipients with a set of coins