aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-13 16:06:32 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-13 16:06:32 +0100
commita943bde6f067567e47c6e12b16c541bb1fea575a (patch)
tree1b553547b8c2b02bbde4f5fafb47a5d6e15a6233
parent16bc9aaf8a62e1905052ac2acd2470e5b18e209f (diff)
Move `settxfee` from rpcblockchain to rpcwallet
`settxfee` only affects the wallet, not the block chain.
-rw-r--r--src/rpcblockchain.cpp24
-rw-r--r--src/rpcserver.cpp2
-rw-r--r--src/rpcwallet.cpp25
3 files changed, 26 insertions, 25 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 34ae6e0543..661deffb19 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -127,30 +127,6 @@ Value getdifficulty(const Array& params, bool fHelp)
}
-Value settxfee(const Array& params, bool fHelp)
-{
- if (fHelp || params.size() < 1 || params.size() > 1)
- throw runtime_error(
- "settxfee amount\n"
- "\nSet the transaction fee. 'amount' is a real and is rounded to the nearest 0.00000001\n"
- "\nArguments:\n"
- "1. amount (numeric, required) The transaction fee in btc rounded to the nearest 0.00000001\n"
- "\nResult\n"
- "true|false (boolean) Returns true if successful\n"
- "\nExamples:\n"
- + HelpExampleCli("settxfee", "0.00001")
- + HelpExampleRpc("settxfee", "0.00001")
- );
-
- // Amount
- int64_t nAmount = 0;
- if (params[0].get_real() != 0.0)
- nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
-
- nTransactionFee = nAmount;
- return true;
-}
-
Value getrawmempool(const Array& params, bool fHelp)
{
if (fHelp || params.size() > 1)
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index c95f450c82..49a61d10d2 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -237,7 +237,6 @@ static const CRPCCommand vRPCCommands[] =
{ "getrawmempool", &getrawmempool, true, false, false },
{ "getblock", &getblock, false, false, false },
{ "getblockhash", &getblockhash, false, false, false },
- { "settxfee", &settxfee, false, false, true },
{ "getrawtransaction", &getrawtransaction, false, false, false },
{ "createrawtransaction", &createrawtransaction, false, false, false },
{ "decoderawtransaction", &decoderawtransaction, false, false, false },
@@ -294,6 +293,7 @@ static const CRPCCommand vRPCCommands[] =
{ "listunspent", &listunspent, false, false, true },
{ "lockunspent", &lockunspent, false, false, true },
{ "listlockunspent", &listlockunspent, false, false, true },
+ { "settxfee", &settxfee, false, false, true },
/* Wallet-enabled mining */
{ "getgenerate", &getgenerate, true, false, false },
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 82fa9d88c5..a2a12c8243 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -2066,3 +2066,28 @@ Value listlockunspent(const Array& params, bool fHelp)
return ret;
}
+Value settxfee(const Array& params, bool fHelp)
+{
+ if (fHelp || params.size() < 1 || params.size() > 1)
+ throw runtime_error(
+ "settxfee amount\n"
+ "\nSet the transaction fee. 'amount' is a real and is rounded to the nearest 0.00000001\n"
+ "\nArguments:\n"
+ "1. amount (numeric, required) The transaction fee in btc rounded to the nearest 0.00000001\n"
+ "\nResult\n"
+ "true|false (boolean) Returns true if successful\n"
+ "\nExamples:\n"
+ + HelpExampleCli("settxfee", "0.00001")
+ + HelpExampleRpc("settxfee", "0.00001")
+ );
+
+ // Amount
+ int64_t nAmount = 0;
+ if (params[0].get_real() != 0.0)
+ nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
+
+ nTransactionFee = nAmount;
+ return true;
+}
+
+