eth/protocols/eth: stop advertising eth/66 for pathdb nodes (ethereum…

…#28006)

eth/protocols/eth/handler.go

@@ -23,6 +23,7 @@ import (
 
  "github.com/ethereum/go-ethereum/common"
  "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/rawdb"
  "github.com/ethereum/go-ethereum/core/txpool"
  "github.com/ethereum/go-ethereum/metrics"
  "github.com/ethereum/go-ethereum/p2p"
@@ -95,11 +96,15 @@ type TxPool interface {
 
 // MakeProtocols constructs the P2P protocol definitions for `eth`.
 func MakeProtocols(backend Backend, network uint64, dnsdisc enode.Iterator) []p2p.Protocol {
- protocols := make([]p2p.Protocol, len(ProtocolVersions))
- for i, version := range ProtocolVersions {
+ protocols := make([]p2p.Protocol, 0, len(ProtocolVersions))
+ for _, version := range ProtocolVersions {
  version := version // Closure
 
- protocols[i] = p2p.Protocol{
+ // Path scheme does not support GetNodeData, don't advertise eth66 on it
+ if version <= ETH66 && backend.Chain().TrieDB().Scheme() == rawdb.PathScheme {
+ continue
+ }
+ protocols = append(protocols, p2p.Protocol{
  Name: ProtocolName,
  Version: version,
  Length: protocolLengths[version],
@@ -119,7 +124,7 @@ func MakeProtocols(backend Backend, network uint64, dnsdisc enode.Iterator) []p2
  },
  Attributes: []enr.Entry{currentENREntry(backend.Chain())},
  DialCandidates: dnsdisc,
- }
+ })
  }
  return protocols
 }