status-im/go-waku
2
0
Fork 0
mirror of https://github.com/status-im/go-waku.git synced 2025-02-04 18:03:33 +00:00
Code Issues Projects Releases Wiki Activity

feat: discv5 filter out nodes that have empty waku capabilities (#865)

Browse Source
This commit is contained in:
Prem Chaitanya Prathi 2023-11-07 17:59:02 +05:30 committed by GitHub
parent 25eb4d60a3
commit 9315de8d8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
waku/v2/discv5/discover.go
View File

@ -21,6 +21,7 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/p2p/nat"
) )
@ -250,23 +251,21 @@ func (d *DiscoveryV5) Stop() {
}) })
} }
/*
func isWakuNode(node *enode.Node) bool { func isWakuNode(node *enode.Node) bool {
enrField := new(utils.WakuEnrBitfield) enrField := new(wenr.WakuEnrBitfield)
if err := node.Record().Load(enr.WithEntry(utils.WakuENRField, &enrField)); err != nil { if err := node.Record().Load(enr.WithEntry(wenr.WakuENRField, &enrField)); err != nil {
if !enr.IsNotFound(err) { if !enr.IsNotFound(err) {
utils.Logger().Named("discv5").Error("could not retrieve port for enr ", zap.Any("node", node)) utils.Logger().Named("discv5").Error("could not retrieve waku2 ENR field for enr ", zap.Any("node", node))
} }
return false return false
} }
if enrField != nil { if enrField != nil {
return *enrField != uint8(0) return *enrField != uint8(0) // #RFC 31 requirement
} }
return false return false
} }
*/
func (d *DiscoveryV5) evaluateNode() func(node *enode.Node) bool { func (d *DiscoveryV5) evaluateNode() func(node *enode.Node) bool {
return func(node *enode.Node) bool { return func(node *enode.Node) bool {
@ -274,10 +273,10 @@ func (d *DiscoveryV5) evaluateNode() func(node *enode.Node) bool {
return false return false
} }
// TODO: consider node filtering based on ENR; we do not filter based on ENR in the first waku discv5 beta stage // node filtering based on ENR; we do not filter based on ENR in the first waku discv5 beta stage
/*if !isWakuNode(node) { if !isWakuNode(node) {
return false return false
}*/ }
_, err := wenr.EnodeToPeerInfo(node) _, err := wenr.EnodeToPeerInfo(node)

20
waku/v2/discv5/discover_test.go
View File

@ -101,6 +101,7 @@ func extractIP(addr multiaddr.Multiaddr) (*net.TCPAddr, error) {
func TestDiscV5(t *testing.T) { func TestDiscV5(t *testing.T) {
// Host1 <-> Host2 <-> Host3 // Host1 <-> Host2 <-> Host3
// Host4(No waku capabilities) <-> Host2
// H1 // H1
host1, _, prvKey1 := createHost(t) host1, _, prvKey1 := createHost(t)
@ -138,9 +139,22 @@ func TestDiscV5(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
d3.SetHost(host3) d3.SetHost(host3)
// H4 doesn't have any Waku capabilities
host4, _, prvKey4 := createHost(t)
ip4, _ := extractIP(host2.Addrs()[0])
udpPort4, err := tests.FindFreeUDPPort(t, "127.0.0.1", 3)
require.NoError(t, err)
l4, err := newLocalnode(prvKey4, ip4, udpPort4, 0, nil, utils.Logger())
require.NoError(t, err)
peerconn4 := peermanager.NewTestPeerDiscoverer()
d4, err := NewDiscoveryV5(prvKey4, l4, peerconn4, prometheus.DefaultRegisterer, utils.Logger(), WithUDPPort(uint(udpPort4)), WithBootnodes([]*enode.Node{d2.localnode.Node()}))
require.NoError(t, err)
d2.SetHost(host2)
defer d1.Stop() defer d1.Stop()
defer d2.Stop() defer d2.Stop()
defer d3.Stop() defer d3.Stop()
defer d4.Stop()
err = d1.Start(context.Background()) err = d1.Start(context.Background())
require.NoError(t, err) require.NoError(t, err)
@ -151,9 +165,13 @@ func TestDiscV5(t *testing.T) {
err = d3.Start(context.Background()) err = d3.Start(context.Background())
require.NoError(t, err) require.NoError(t, err)
err = d4.Start(context.Background())
require.NoError(t, err)
time.Sleep(2 * time.Second) // Wait for nodes to be discovered time.Sleep(2 * time.Second) // Wait for nodes to be discovered
require.True(t, peerconn3.HasPeer(host1.ID()) && peerconn3.HasPeer(host2.ID())) require.True(t, peerconn3.HasPeer(host1.ID()) && peerconn3.HasPeer(host2.ID()))
require.False(t, peerconn3.HasPeer(host4.ID())) //host4 should not be discoverable, rather filtered out.
d3.Stop() d3.Stop()
peerconn3.Clear() peerconn3.Clear()
@ -165,4 +183,6 @@ func TestDiscV5(t *testing.T) {
time.Sleep(2 * time.Second) // Wait for nodes to be discovered time.Sleep(2 * time.Second) // Wait for nodes to be discovered
require.True(t, peerconn3.HasPeer(host1.ID()) && peerconn3.HasPeer(host2.ID())) require.True(t, peerconn3.HasPeer(host1.ID()) && peerconn3.HasPeer(host2.ID()))
require.False(t, peerconn3.HasPeer(host4.ID())) //host4 should not be discoverable, rather filtered out.
} }