Auto merge of #3566 - bitcartel:3546_prohibit_sapling_map_orphans, r=bitcartel

For #3546. Shielded tx with missing inputs are not treated as orphans.
2018-10-05 17:09:29 -07:00 · 2018-10-05 17:09:29 -07:00 · a513798710
parent aede10d3c2 c94f4477e8
commit a513798710
1 changed files with 5 additions and 2 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -5483,8 +5483,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());