Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only fall through to backend on legacy protocols #1412

Merged
merged 1 commit into from
May 20, 2022
Merged

Only fall through to backend on legacy protocols #1412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions eth/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ func (h *handler) makeQuorumConsensusProtocol(protoName string, version uint, le
// add the rw protocol for the quorum subprotocol to the eth peer.
ethPeer.AddConsensusProtoRW(rw)
peer := eth.NewPeer(version, p, rw, h.txpool)
return h.handleConsensusLoop(peer, rw, backend)
return h.handleConsensusLoop(peer, rw, nil)
}
p.Log().Error("consensus subprotocol retrieved nil eth peer from peerset", "ethPeer.id", p2pPeerId)
return errEthPeerNil
Expand All @@ -741,18 +741,18 @@ func (h *handler) makeQuorumConsensusProtocol(protoName string, version uint, le
}
}

func (h *handler) handleConsensusLoop(p *eth.Peer, protoRW p2p.MsgReadWriter, backend eth.Backend) error {
func (h *handler) handleConsensusLoop(p *eth.Peer, protoRW p2p.MsgReadWriter, fallThroughBackend eth.Backend) error {
// Handle incoming messages until the connection is torn down
for {
if err := h.handleConsensus(p, protoRW, backend); err != nil {
if err := h.handleConsensus(p, protoRW, fallThroughBackend); err != nil {
p.Log().Debug("Ethereum quorum message handling failed", "err", err)
return err
}
}
}

// This is a no-op because the eth handleMsg main loop handle ibf message as well.
func (h *handler) handleConsensus(p *eth.Peer, protoRW p2p.MsgReadWriter, backend eth.Backend) error {
func (h *handler) handleConsensus(p *eth.Peer, protoRW p2p.MsgReadWriter, fallThroughBackend eth.Backend) error {
// Read the next message from the remote peer (in protoRW), and ensure it's fully consumed
msg, err := protoRW.ReadMsg()
if err != nil {
Expand All @@ -772,13 +772,15 @@ func (h *handler) handleConsensus(p *eth.Peer, protoRW p2p.MsgReadWriter, backen
return err
}

var handlers = eth.ETH_65_FULL_SYNC
if fallThroughBackend != nil {
var handlers = eth.ETH_65_FULL_SYNC

p.Log().Trace("Message not handled by sub-protocol", "msg", msg.Code)
p.Log().Trace("Message not handled by legacy sub-protocol", "msg", msg.Code)

if handler := handlers[msg.Code]; handler != nil {
p.Log().Debug("Found eth handler for msg", "msg", msg.Code)
return handler(backend, msg, p)
if handler := handlers[msg.Code]; handler != nil {
p.Log().Debug("Found eth handler for msg", "msg", msg.Code)
return handler(fallThroughBackend, msg, p)
}
}

return nil
Expand Down Expand Up @@ -807,6 +809,7 @@ func (h *handler) makeLegacyProtocol(protoName string, version uint, length uint
Run: func(p *p2p.Peer, rw p2p.MsgReadWriter) error {
peer := eth.NewPeer(version, p, rw, h.txpool)
return h.runEthPeer(peer, func(peer *eth.Peer) error {
// We pass through the backend so that we can 'handle' messages that we can't handle
return h.handleConsensusLoop(peer, rw, backend)
})
},
Expand Down