LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Merge pull request #1625 from yyforyongyu/fix-notfound-message

Browse source 
btcd+netsync: support witness tx and block in notfound msg
This commit is contained in:
Olaoluwa Osuntokun 2020-09-08 16:58:19 -07:00 committed by GitHub
commit 9ef973c282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
netsync/manager.go
View file

@ -1031,11 +1031,16 @@ func (sm *SyncManager) handleNotFoundMsg(nfmsg *notFoundMsg) {
// verify the hash was actually announced by the peer // verify the hash was actually announced by the peer
// before deleting from the global requested maps. // before deleting from the global requested maps.
switch inv.Type { switch inv.Type {
case wire.InvTypeWitnessBlock:
fallthrough
case wire.InvTypeBlock: case wire.InvTypeBlock:
if _, exists := state.requestedBlocks[inv.Hash]; exists { if _, exists := state.requestedBlocks[inv.Hash]; exists {
delete(state.requestedBlocks, inv.Hash) delete(state.requestedBlocks, inv.Hash)
delete(sm.requestedBlocks, inv.Hash) delete(sm.requestedBlocks, inv.Hash)
} }
case wire.InvTypeWitnessTx:
fallthrough
case wire.InvTypeTx: case wire.InvTypeTx:
if _, exists := state.requestedTxns[inv.Hash]; exists { if _, exists := state.requestedTxns[inv.Hash]; exists {
delete(state.requestedTxns, inv.Hash) delete(state.requestedTxns, inv.Hash)

4
server.go
View file

@ -1321,8 +1321,12 @@ func (sp *serverPeer) OnNotFound(p *peer.Peer, msg *wire.MsgNotFound) {
switch inv.Type { switch inv.Type {
case wire.InvTypeBlock: case wire.InvTypeBlock:
numBlocks++ numBlocks++
case wire.InvTypeWitnessBlock:
numBlocks++
case wire.InvTypeTx: case wire.InvTypeTx:
numTxns++ numTxns++
case wire.InvTypeWitnessTx:
numTxns++
default: default:
peerLog.Debugf("Invalid inv type '%d' in notfound message from %s", peerLog.Debugf("Invalid inv type '%d' in notfound message from %s",
inv.Type, sp) inv.Type, sp)