sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Better CWallet isolation in rpcevo (#4206)

Browse Source
This commit is contained in:
UdjinM6 2021-06-24 19:07:54 +03:00 committed by GitHub
parent 347985a8a3
commit 20659acbd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc/rpcevo.cpp
View File

@ -33,6 +33,8 @@
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
extern UniValue signrawtransaction(const JSONRPCRequest& request); extern UniValue signrawtransaction(const JSONRPCRequest& request);
extern UniValue sendrawtransaction(const JSONRPCRequest& request); extern UniValue sendrawtransaction(const JSONRPCRequest& request);
#else
class CWallet;
#endif//ENABLE_WALLET #endif//ENABLE_WALLET
static std::string GetHelpString(int nParamNum, std::string strParamName) static std::string GetHelpString(int nParamNum, std::string strParamName)
@ -889,21 +891,15 @@ static void protx_list_help()
); );
} }
#ifdef ENABLE_WALLET
static bool CheckWalletOwnsKey(CWallet* pwallet, const CKeyID& keyID) { static bool CheckWalletOwnsKey(CWallet* pwallet, const CKeyID& keyID) {
#ifndef ENABLE_WALLET
return false;
#else
if (!pwallet) { if (!pwallet) {
return false; return false;
} }
return pwallet->HaveKey(keyID); return pwallet->HaveKey(keyID);
#endif
} }
static bool CheckWalletOwnsScript(CWallet* pwallet, const CScript& script) { static bool CheckWalletOwnsScript(CWallet* pwallet, const CScript& script) {
#ifndef ENABLE_WALLET
return false;
#else
if (!pwallet) { if (!pwallet) {
return false; return false;
} }
@ -915,8 +911,8 @@ static bool CheckWalletOwnsScript(CWallet* pwallet, const CScript& script) {
} }
} }
return false; return false;
#endif
} }
#endif
static UniValue BuildDMNListEntry(CWallet* pwallet, const CDeterministicMNCPtr& dmn, bool detailed) static UniValue BuildDMNListEntry(CWallet* pwallet, const CDeterministicMNCPtr& dmn, bool detailed)
{ {
@ -931,6 +927,7 @@ static UniValue BuildDMNListEntry(CWallet* pwallet, const CDeterministicMNCPtr&
int confirmations = GetUTXOConfirmations(dmn->collateralOutpoint); int confirmations = GetUTXOConfirmations(dmn->collateralOutpoint);
o.pushKV("confirmations", confirmations); o.pushKV("confirmations", confirmations);
#ifdef ENABLE_WALLET
bool hasOwnerKey = CheckWalletOwnsKey(pwallet, dmn->pdmnState->keyIDOwner); bool hasOwnerKey = CheckWalletOwnsKey(pwallet, dmn->pdmnState->keyIDOwner);
bool hasOperatorKey = false; //CheckWalletOwnsKey(dmn->pdmnState->keyIDOperator); bool hasOperatorKey = false; //CheckWalletOwnsKey(dmn->pdmnState->keyIDOperator);
bool hasVotingKey = CheckWalletOwnsKey(pwallet, dmn->pdmnState->keyIDVoting); bool hasVotingKey = CheckWalletOwnsKey(pwallet, dmn->pdmnState->keyIDVoting);
@ -942,7 +939,6 @@ static UniValue BuildDMNListEntry(CWallet* pwallet, const CDeterministicMNCPtr&
ownsCollateral = CheckWalletOwnsScript(pwallet, collateralTx->vout[dmn->collateralOutpoint.n].scriptPubKey); ownsCollateral = CheckWalletOwnsScript(pwallet, collateralTx->vout[dmn->collateralOutpoint.n].scriptPubKey);
} }
#ifdef ENABLE_WALLET
if (pwallet) { if (pwallet) {
UniValue walletObj(UniValue::VOBJ); UniValue walletObj(UniValue::VOBJ);
walletObj.pushKV("hasOwnerKey", hasOwnerKey); walletObj.pushKV("hasOwnerKey", hasOwnerKey);