Sapling support for z_shieldcoinbase and more

2018-10-08 16:17:24 -07:00
parent ca4a5f2692 72f6925de1
commit 8682e17a7d
19 changed files with 297 additions and 78 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6796,8 +6796,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
            BOOST_FOREACH(uint256 hash, vEraseQueue)
            EraseOrphanTx(hash);
        }
-        // TODO: currently, prohibit joinsplits from entering mapOrphans
-        else if (fMissingInputs && tx.vjoinsplit.size() == 0)
+        // TODO: currently, prohibit joinsplits and shielded spends/outputs from entering mapOrphans
+        else if (fMissingInputs &&
+                 tx.vjoinsplit.empty() &&
+                 tx.vShieldedSpend.empty() &&
+                 tx.vShieldedOutput.empty())
        {
            AddOrphanTx(tx, pfrom->GetId());