Add IsMyAddressSpendable function and use it for send dialogs

zathras-crypto · zathras-crypto · commit c7b2618d8703 · 2015-06-11T15:34:44.000+10:00
diff --git a/src/omnicore/omnicore.cpp b/src/omnicore/omnicore.cpp
@@ -2101,17 +2101,29 @@ int mastercore_handler_tx(const CTransaction &tx, int nBlock, unsigned int idx,
 }
 
 // IsMine wrapper to determine whether the address is in our local wallet
-bool IsMyAddress(const std::string &address) 
+bool IsMyAddress(const std::string &address)
 {
   if (!pwalletMain) return false;
 
   const CBitcoinAddress& mscaddress = address;
-
-  CTxDestination lookupaddress = mscaddress.Get(); 
+  CTxDestination lookupaddress = mscaddress.Get();
 
   return (IsMine(*pwalletMain, lookupaddress));
 }
 
+// IsMine wrapper to determine whether the address is spendable
+bool IsMyAddressSpendable(const std::string &address)
+{
+   if (!pwalletMain) return false;
+
+   const CBitcoinAddress& mscaddress = address;
+   CTxDestination destination = mscaddress.Get();
+   isminetype mineType = pwalletMain ? IsMine(*pwalletMain, destination) : ISMINE_NO;
+   if (mineType & ISMINE_SPENDABLE) return true;
+
+   return false; // eg (mineType & ISMINE_NO)  (mineType & ISMINE_WATCH_ONLY)  and so on, not considered spendable
+}
+
 // gets a label for a Bitcoin address from the wallet, mainly to the UI (used in demo)
 string getLabel(const string &address)
 {
diff --git a/src/omnicore/omnicore.h b/src/omnicore/omnicore.h
@@ -394,6 +394,7 @@ extern std::map<uint32_t, int64_t> global_balance_reserved_testeco;
 int64_t getMPbalance(const string &Address, unsigned int property, TallyType ttype);
 int64_t getUserAvailableMPbalance(const string &Address, unsigned int property);
 bool IsMyAddress(const std::string &address);
+bool IsMyAddressSpendable(const std::string &address);
 
 string getLabel(const string &address);
 
diff --git a/src/qt/metadexdialog.cpp b/src/qt/metadexdialog.cpp
@@ -402,10 +402,10 @@ void MetaDExDialog::FullRefresh()
         (my_it->second).init();
         while (0 != (id = (my_it->second).next())) {
             if(id==propertyId) {
-                if (IsMyAddress(address)) ui->sellAddressCombo->addItem((my_it->first).c_str()); // only include wallet addresses
+                if (IsMyAddressSpendable(address)) ui->sellAddressCombo->addItem((my_it->first).c_str()); // only include wallet addresses
             }
             if (((id==OMNI_PROPERTY_MSC) && (!testeco)) || ((id==OMNI_PROPERTY_TMSC) && (testeco))) {
-                if (IsMyAddress(address)) ui->buyAddressCombo->addItem((my_it->first).c_str());
+                if (IsMyAddressSpendable(address)) ui->buyAddressCombo->addItem((my_it->first).c_str());
             }
         }
     }
diff --git a/src/qt/sendmpdialog.cpp b/src/qt/sendmpdialog.cpp
@@ -178,7 +178,7 @@ void SendMPDialog::updateProperty()
             if(id == propertyId) { includeAddress=true; break; }
         }
         if (!includeAddress) continue; //ignore this address, has never transacted in this propertyId
-        if (!IsMyAddress(address)) continue; //ignore this address, it's not ours
+        if (!IsMyAddressSpendable(address)) continue; //ignore this address, it's not ours
         if ((address.substr(0,1)=="2") || (address.substr(0,3)=="3")) continue; //quick hack to not show P2SH addresses in from selector (can't be sent from UI)
         ui->sendFromComboBox->addItem(QString::fromStdString(address + " \t" + FormatMP(propertyId, getUserAvailableMPbalance(address, propertyId)) + getTokenLabel(propertyId)));
     }

Original file line number	Diff line number	Diff line change
`@@ -402,10 +402,10 @@ void MetaDExDialog::FullRefresh()`
`402`	`402`	`(my_it->second).init();`
`403`	`403`	`while (0 != (id = (my_it->second).next())) {`
`404`	`404`	`if(id==propertyId) {`
`405`		`- if (IsMyAddress(address)) ui->sellAddressCombo->addItem((my_it->first).c_str()); // only include wallet addresses`
	`405`	`+ if (IsMyAddressSpendable(address)) ui->sellAddressCombo->addItem((my_it->first).c_str()); // only include wallet addresses`
`406`	`406`	`}`
`407`	`407`	`if (((id==OMNI_PROPERTY_MSC) && (!testeco)) \|\| ((id==OMNI_PROPERTY_TMSC) && (testeco))) {`
`408`		`- if (IsMyAddress(address)) ui->buyAddressCombo->addItem((my_it->first).c_str());`
	`408`	`+ if (IsMyAddressSpendable(address)) ui->buyAddressCombo->addItem((my_it->first).c_str());`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ void SendMPDialog::updateProperty()`
`178`	`178`	`if(id == propertyId) { includeAddress=true; break; }`
`179`	`179`	`}`
`180`	`180`	`if (!includeAddress) continue; //ignore this address, has never transacted in this propertyId`
`181`		`- if (!IsMyAddress(address)) continue; //ignore this address, it's not ours`
	`181`	`+ if (!IsMyAddressSpendable(address)) continue; //ignore this address, it's not ours`
`182`	`182`	`if ((address.substr(0,1)=="2") \|\| (address.substr(0,3)=="3")) continue; //quick hack to not show P2SH addresses in from selector (can't be sent from UI)`
`183`	`183`	`ui->sendFromComboBox->addItem(QString::fromStdString(address + " \t" + FormatMP(propertyId, getUserAvailableMPbalance(address, propertyId)) + getTokenLabel(propertyId)));`
`184`	`184`	`}`