Make orphan parent fetching ask for witnesses.

gmaxwell · laanwj · commit ca1fd7521e86 · 2016-12-02T08:38:02.000+01:00
In 0.13 orphan transactions began being treated as implicit INVs for their parents. But the resulting getdata were not getting the witness flag. This fixes issue bitcoin#9182 reported by chjj and roasbeef on IRC. Github-Pull: bitcoin#9188 Rebased-From: 5b0150a
diff --git a/src/main.cpp b/src/main.cpp
@@ -5586,10 +5586,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
             if (!fRejectedParents) {
+                uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-                    CInv inv(MSG_TX, txin.prevout.hash);
-                    pfrom->AddInventoryKnown(inv);
-                    if (!AlreadyHave(inv)) pfrom->AskFor(inv);
+                    CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
+                    pfrom->AddInventoryKnown(_inv);
+                    if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
                 }
                 AddOrphanTx(tx, pfrom->GetId());
 

Original file line number	Diff line number	Diff line change
`@@ -5586,10 +5586,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5586`	`5586`	`}`
`5587`	`5587`	`}`
`5588`	`5588`	`if (!fRejectedParents) {`
	`5589`	`+ uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());`
`5589`	`5590`	`BOOST_FOREACH(const CTxIn& txin, tx.vin) {`
`5590`		`- CInv inv(MSG_TX, txin.prevout.hash);`
`5591`		`- pfrom->AddInventoryKnown(inv);`
`5592`		`- if (!AlreadyHave(inv)) pfrom->AskFor(inv);`
	`5591`	`+ CInv _inv(MSG_TX \| nFetchFlags, txin.prevout.hash);`
	`5592`	`+ pfrom->AddInventoryKnown(_inv);`
	`5593`	`+ if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);`
`5593`	`5594`	`}`
`5594`	`5595`	`AddOrphanTx(tx, pfrom->GetId());`
`5595`	`5596`