dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more clear interface for CoinControl.h regarding individual feerate

Browse Source
This commit is contained in:
Jonas Schnelli
2016-05-06 11:01:50 +02:00
committed by lateminer
parent 4aab709412
commit 3674e65b54
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/rpcwallet.cpp
View File

@@ -2530,6 +2530,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
bool includeWatching = false;
bool lockUnspents = false;
CFeeRate feeRate = CFeeRate(0);
bool overrideEstimatedFeerate = false;
if (params.size() > 1) {
if (params[1].type() == UniValue::VBOOL) {
@@ -2562,7 +2563,10 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
lockUnspents = options["lockUnspents"].get_bool();
if (options.exists("feeRate"))
{
feeRate = CFeeRate(options["feeRate"].get_real());
overrideEstimatedFeerate = true;
}
}
}
@@ -2581,7 +2585,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
CAmount nFeeOut;
string strFailReason;
if(!pwalletMain->FundTransaction(tx, nFeeOut, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
UniValue result(UniValue::VOBJ);