RPC: fix wallet lock check in privatesend start (dashpay#2102)

UdjinM6 · Yoyae · commit 6d8b594bfac1 · 2018-06-12T13:03:17.000+02:00
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
@@ -54,7 +54,8 @@ UniValue privatesend(const JSONRPCRequest& request)
     if(request.params[0].get_str() == "start") {
         {
             LOCK(pwalletMain->cs_wallet);
-            EnsureWalletIsUnlocked();
+            if (pwalletMain->IsLocked(true))
+                throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please unlock wallet for mixing with walletpassphrase first.");
         }
 
         privateSendClient.fEnablePrivateSend = true;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ UniValue privatesend(const JSONRPCRequest& request)`
`54`	`54`	`if(request.params[0].get_str() == "start") {`
`55`	`55`	`{`
`56`	`56`	`LOCK(pwalletMain->cs_wallet);`
`57`		`- EnsureWalletIsUnlocked();`
	`57`	`+ if (pwalletMain->IsLocked(true))`
	`58`	`+ throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please unlock wallet for mixing with walletpassphrase first.");`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`privateSendClient.fEnablePrivateSend = true;`