aboutsummaryrefslogtreecommitdiff
path: root/src/rpcserver.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-01-13 15:47:38 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-01-13 15:47:45 +0100
commitbe6d5a617d297bbbabcc56730976f9f025892e56 (patch)
treeb0557d6266bbdc2b9f7352fff55a29a17ee73269 /src/rpcserver.cpp
parent2cd004b1232abb23c66547f955200131354fc05d (diff)
parentd11fc1695c0453ef22a633e516726f82717dd1d9 (diff)
Merge pull request #7312
d11fc16 [Wallet] Call notification signal when a transaction is abandoned (Jonas Schnelli) df0e222 Add RPC test for abandoned and conflicted transactions. (Alex Morcos) 01e06d1 Add new rpc call: abandontransaction (Alex Morcos) 9e69717 Make wallet descendant searching more efficient (Alex Morcos)
Diffstat (limited to 'src/rpcserver.cpp')
-rw-r--r--src/rpcserver.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 78d6898bc3..53c368b271 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -346,6 +346,7 @@ static const CRPCCommand vRPCCommands[] =
{ "wallet", "getreceivedbyaccount", &getreceivedbyaccount, false },
{ "wallet", "getreceivedbyaddress", &getreceivedbyaddress, false },
{ "wallet", "gettransaction", &gettransaction, false },
+ { "wallet", "abandontransaction", &abandontransaction, false },
{ "wallet", "getunconfirmedbalance", &getunconfirmedbalance, false },
{ "wallet", "getwalletinfo", &getwalletinfo, false },
{ "wallet", "importprivkey", &importprivkey, true },