mirror of
https://github.com/btcsuite/btcd.git
synced 2025-03-15 04:11:37 +01:00
Merge fedf34cc3c
into c7191d2913
This commit is contained in:
commit
de887ca89b
1 changed files with 15 additions and 5 deletions
|
@ -1171,6 +1171,11 @@ func (sm *SyncManager) handleInvMsg(imsg *invMsg) {
|
||||||
peer.UpdateLastAnnouncedBlock(&invVects[lastBlock].Hash)
|
peer.UpdateLastAnnouncedBlock(&invVects[lastBlock].Hash)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ignore inventory when we're in headers-first mode.
|
||||||
|
if sm.headersFirstMode {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Ignore invs from peers that aren't the sync if we are not current.
|
// Ignore invs from peers that aren't the sync if we are not current.
|
||||||
// Helps prevent fetching a mass of orphans.
|
// Helps prevent fetching a mass of orphans.
|
||||||
if peer != sm.syncPeer && !sm.current() {
|
if peer != sm.syncPeer && !sm.current() {
|
||||||
|
@ -1201,15 +1206,20 @@ func (sm *SyncManager) handleInvMsg(imsg *invMsg) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ignore txs when we're not current as we can't verify them
|
||||||
|
// and they'll just go in the orphan pool.
|
||||||
|
if iv.Type == wire.InvTypeWitnessTx ||
|
||||||
|
iv.Type == wire.InvTypeTx {
|
||||||
|
|
||||||
|
if !sm.current() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Add the inventory to the cache of known inventory
|
// Add the inventory to the cache of known inventory
|
||||||
// for the peer.
|
// for the peer.
|
||||||
peer.AddKnownInventory(iv)
|
peer.AddKnownInventory(iv)
|
||||||
|
|
||||||
// Ignore inventory when we're in headers-first mode.
|
|
||||||
if sm.headersFirstMode {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Request the inventory if we don't already have it.
|
// Request the inventory if we don't already have it.
|
||||||
haveInv, err := sm.haveInventory(iv)
|
haveInv, err := sm.haveInventory(iv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Add table
Reference in a new issue