set pi.maddrs from peerstore addresses

guillaumemichel · dennis-tra · commit 090de44ca648 · 2024-02-01T10:09:00.000+01:00
diff --git a/discv5/crawler.go b/discv5/crawler.go
@@ -13,7 +13,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/libp2p/go-libp2p/p2p/host/basic"
+	basichost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	ma "github.com/multiformats/go-multiaddr"
 	log "github.com/sirupsen/logrus"
 	"go.uber.org/atomic"
@@ -220,8 +220,9 @@ func (c *Crawler) crawlLibp2p(ctx context.Context, pi PeerInfo) chan Libp2pResul
 				}
 			}
 
-			// Extract listen addresses
-			result.ListenAddrs = ps.Addrs(pi.ID())
+			// Update pi maddrs to include all listen addresses
+			pi.maddrs = ps.Addrs(pi.ID())
+			result.ListenAddrs = pi.maddrs
 		}
 
 		// if there was a connection error, parse it to a known one

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"github.com/ethereum/go-ethereum/p2p/enode"`
`14`	`14`	`"github.com/libp2p/go-libp2p/core/network"`
`15`	`15`	`"github.com/libp2p/go-libp2p/core/peer"`
`16`		`- "github.com/libp2p/go-libp2p/p2p/host/basic"`
	`16`	`+ basichost "github.com/libp2p/go-libp2p/p2p/host/basic"`
`17`	`17`	`ma "github.com/multiformats/go-multiaddr"`
`18`	`18`	`log "github.com/sirupsen/logrus"`
`19`	`19`	`"go.uber.org/atomic"`
`@@ -220,8 +220,9 @@ func (c *Crawler) crawlLibp2p(ctx context.Context, pi PeerInfo) chan Libp2pResul`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`- // Extract listen addresses`
`224`		`- result.ListenAddrs = ps.Addrs(pi.ID())`
	`223`	`+ // Update pi maddrs to include all listen addresses`
	`224`	`+ pi.maddrs = ps.Addrs(pi.ID())`
	`225`	`+ result.ListenAddrs = pi.maddrs`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`// if there was a connection error, parse it to a known one`