[BDAP] Add IsBDAP and IsData methods to tx output

AmirAbrams · AmirAbrams · commit 7004b9009c0d · 2019-07-21T16:01:43.000-05:00
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -58,6 +58,36 @@ CTxOut::CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, int nRoundsIn)
     nRounds = nRoundsIn;
 }
 
+bool CTxOut::IsBDAP() const
+{
+    opcodetype opcode;
+    CScript::const_iterator pc = scriptPubKey.begin();
+    if (!scriptPubKey.GetOp(pc, opcode))
+        return false;
+    if (opcode < OP_1 || opcode > OP_16)
+        return false;
+
+    int op = CScript::DecodeOP_N(opcode);
+    if (op == OP_BDAP_NEW || op == OP_BDAP_DELETE || op == OP_BDAP_EXPIRE || op == OP_BDAP_MODIFY || op == OP_BDAP_MOVE)
+        return true;
+
+    return false;
+}
+
+bool CTxOut::IsData() const
+{
+    opcodetype opcode;
+    CScript::const_iterator pc = scriptPubKey.begin();
+    if (!scriptPubKey.GetOp(pc, opcode))
+        return false;
+
+    int op = CScript::DecodeOP_N(opcode);
+    if (op == OP_RETURN)
+        return true;
+
+    return false;
+}
+
 std::string CTxOut::ToString() const
 {
     return strprintf("CTxOut(nValue=%d.%08d, scriptPubKey=%s)", nValue / COIN, nValue % COIN, HexStr(scriptPubKey).substr(0, 30));
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -218,6 +218,9 @@ class CTxOut
         return !(a == b);
     }
 
+    bool IsBDAP() const;
+    bool IsData() const;
+
     std::string ToString() const;
 };
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2908,6 +2908,9 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed,
                 if (!found)
                     continue;
 
+                if (pcoin->tx->vout[i].IsBDAP())
+                    continue;
+
                 isminetype mine = IsMine(pcoin->tx->vout[i]);
                 if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&
                     (!IsLockedCoin((*it).first, i) || nCoinType == ONLY_1000) &&

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,9 @@ class CTxOut`
`218`	`218`	`return !(a == b);`
`219`	`219`	`}`
`220`	`220`
	`221`	`+ bool IsBDAP() const;`
	`222`	`+ bool IsData() const;`
	`223`	`+`
`221`	`224`	`std::string ToString() const;`
`222`	`225`	`};`
`223`	`226`