aboutsummaryrefslogtreecommitdiff
path: root/src/rpcmisc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/rpcmisc.cpp')
-rw-r--r--src/rpcmisc.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 56accc1b3a..f51be2db2c 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -104,7 +104,7 @@ public:
Object obj;
CPubKey vchPubKey;
obj.push_back(Pair("isscript", false));
- if (mine == MINE_SPENDABLE) {
+ if (mine == ISMINE_SPENDABLE) {
pwalletMain->GetPubKey(keyID, vchPubKey);
obj.push_back(Pair("pubkey", HexStr(vchPubKey)));
obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
@@ -115,7 +115,7 @@ public:
Object operator()(const CScriptID &scriptID) const {
Object obj;
obj.push_back(Pair("isscript", true));
- if (mine != MINE_NO) {
+ if (mine != ISMINE_NO) {
CScript subscript;
pwalletMain->GetCScript(scriptID, subscript);
std::vector<CTxDestination> addresses;
@@ -170,10 +170,10 @@ Value validateaddress(const Array& params, bool fHelp)
string currentAddress = address.ToString();
ret.push_back(Pair("address", currentAddress));
#ifdef ENABLE_WALLET
- isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : MINE_NO;
- ret.push_back(Pair("ismine", (mine & MINE_SPENDABLE) ? true : false));
- if (mine != MINE_NO) {
- ret.push_back(Pair("iswatchonly", (mine & MINE_WATCH_ONLY) ? true: false));
+ isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
+ ret.push_back(Pair("ismine", (mine & ISMINE_SPENDABLE) ? true : false));
+ if (mine != ISMINE_NO) {
+ ret.push_back(Pair("iswatchonly", (mine & ISMINE_WATCH_ONLY) ? true: false));
Object detail = boost::apply_visitor(DescribeAddressVisitor(mine), dest);
ret.insert(ret.end(), detail.begin(), detail.end());
}