aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2016-12-01 13:25:43 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2016-12-01 13:34:49 -0800
commitad826b3df9f763b49f1e3e3d50c4efdd438c7547 (patch)
tree9c4323abee8e3a42c4cbdb7deb4ed0b62163678f
parentc1a52276848d8caa9a9789dff176408c1aa6b1ed (diff)
parent5b0150a060208faf436c09b0ca9463407a869c72 (diff)
downloadbitcoin-ad826b3df9f763b49f1e3e3d50c4efdd438c7547.tar.xz
Merge #9188: Make orphan parent fetching ask for witnesses.
5b0150a Make orphan parent fetching ask for witnesses. (Gregory Maxwell)
-rw-r--r--src/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 274bf6fdda..faf643b3c5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5690,8 +5690,9 @@ 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);
+ CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
pfrom->AddInventoryKnown(_inv);
if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
}