highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

replaced MINE_ with ISMINE_

Browse Source
This commit is contained in:
JaSK
2014-07-01 11:00:22 +02:00
parent 53a2148f0c
commit a3e192a327
8 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpcmisc.cpp
View File

@@ -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());
}