diff options
| author | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-08-23 01:46:59 +0100 |
|---|---|---|
| committer | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-08-23 01:46:59 +0100 |
| commit | 00f58f8c48db05dce9dceed73a0028482e037f0f (patch) | |
| tree | 687820f04f1b6115a92144d6449a0498d936beb5 /src | |
| parent | 1b04b55f2d22078ca79cd38fc1078e15fa9cbe94 (diff) | |
| download | bitcoin-00f58f8c48db05dce9dceed73a0028482e037f0f.tar.xz | |
rpc: Avoid locking cs_main in some wallet RPC
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 608a1b5da2..637c9f73ab 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -562,7 +562,6 @@ static UniValue decoderawtransaction(const JSONRPCRequest& request) + HelpExampleRpc("decoderawtransaction", "\"hexstring\"") ); - LOCK(cs_main); RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VBOOL}); CMutableTransaction mtx; diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 4e539a85de..c0c59da7bd 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -165,7 +165,7 @@ static UniValue getnewaddress(const JSONRPCRequest& request) throw JSONRPCError(RPC_WALLET_ERROR, "Error: Private keys are disabled for this wallet"); } - LOCK2(cs_main, pwallet->cs_wallet); + LOCK(pwallet->cs_wallet); // Parse the label first so we don't generate a key if there's an error std::string label; @@ -276,7 +276,7 @@ static UniValue getrawchangeaddress(const JSONRPCRequest& request) throw JSONRPCError(RPC_WALLET_ERROR, "Error: Private keys are disabled for this wallet"); } - LOCK2(cs_main, pwallet->cs_wallet); + LOCK(pwallet->cs_wallet); if (!pwallet->IsLocked()) { pwallet->TopUpKeyPool(); @@ -331,7 +331,7 @@ static UniValue setlabel(const JSONRPCRequest& request) + HelpExampleRpc("setlabel", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"tabby\"") ); - LOCK2(cs_main, pwallet->cs_wallet); + LOCK(pwallet->cs_wallet); CTxDestination dest = DecodeDestination(request.params[0].get_str()); if (!IsValidDestination(dest)) { |