feat: dynamically set host addresses in handshake protocol

Author: janos

pkg/p2p/libp2p/internal/handshake/handshake.go

@@ -61,6 +61,10 @@ type AdvertisableAddressResolver interface {
 	Resolve(observedAddress ma.Multiaddr) (ma.Multiaddr, error)
 }
 
+type Addresser interface {
+	AdvertizableAddrs() ([]ma.Multiaddr, error)
+}
+
 type Option struct {
 	bee260compatibility bool
 }
@@ -85,7 +89,7 @@ type Service struct {
 	libp2pID              libp2ppeer.ID
 	metrics               metrics
 	picker                p2p.Picker
-	hostAddrs             []ma.Multiaddr
+	hostAddresser         Addresser
 }
 
 // Info contains the information received from the handshake.
@@ -103,7 +107,7 @@ func (i *Info) LightString() string {
 }
 
 // New creates a new handshake Service.
-func New(signer crypto.Signer, advertisableAddresser AdvertisableAddressResolver, overlay swarm.Address, networkID uint64, fullNode bool, nonce []byte, hostAddrs []ma.Multiaddr, welcomeMessage string, validateOverlay bool, ownPeerID libp2ppeer.ID, logger log.Logger) (*Service, error) {
+func New(signer crypto.Signer, advertisableAddresser AdvertisableAddressResolver, overlay swarm.Address, networkID uint64, fullNode bool, nonce []byte, hostAddresser Addresser, welcomeMessage string, validateOverlay bool, ownPeerID libp2ppeer.ID, logger log.Logger) (*Service, error) {
 	if len(welcomeMessage) > MaxWelcomeMessageLength {
 		return nil, ErrWelcomeMessageLength
 	}
@@ -119,7 +123,7 @@ func New(signer crypto.Signer, advertisableAddresser AdvertisableAddressResolver
 		libp2pID:              ownPeerID,
 		logger:                logger.WithName(loggerName).Register(),
 		metrics:               newMetrics(),
-		hostAddrs:             hostAddrs,
+		hostAddresser:         hostAddresser,
 	}
 	svc.welcomeMessage.Store(welcomeMessage)
 
@@ -181,7 +185,14 @@ func (s *Service) Handshake(ctx context.Context, stream p2p.Stream, peerMultiadd
 		advertisableUnderlays[i] = advertisableUnderlay
 	}
 
-	advertisableUnderlays = append(advertisableUnderlays, s.hostAddrs...)
+	if s.hostAddresser != nil {
+		hostAddrs, err := s.hostAddresser.AdvertizableAddrs()
+		if err != nil {
+			return nil, fmt.Errorf("get host advertizable addresses: %w", err)
+		}
+
+		advertisableUnderlays = append(advertisableUnderlays, hostAddrs...)
+	}
 
 	// sort to remove potential duplicates
 	slices.SortFunc(advertisableUnderlays, func(a, b ma.Multiaddr) int {
@@ -280,7 +291,14 @@ func (s *Service) Handle(ctx context.Context, stream p2p.Stream, peerMultiaddrs
 		advertisableUnderlays[i] = advertisableUnderlay
 	}
 
-	advertisableUnderlays = append(advertisableUnderlays, s.hostAddrs...)
+	if s.hostAddresser != nil {
+		hostAddrs, err := s.hostAddresser.AdvertizableAddrs()
+		if err != nil {
+			return nil, fmt.Errorf("get host advertizable addresses: %w", err)
+		}
+
+		advertisableUnderlays = append(advertisableUnderlays, hostAddrs...)
+	}
 
 	// sort to remove potential duplicates
 	slices.SortFunc(advertisableUnderlays, func(a, b ma.Multiaddr) int {

pkg/p2p/libp2p/libp2p.go

@@ -306,19 +306,7 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
 		advertisableAddresser = natAddrResolver
 	}
 
-	advertizableAddresses := make([]ma.Multiaddr, 0)
-	for _, a := range h.Addrs() {
-		if manet.IsIPLoopback(a) {
-			continue
-		}
-		a, err := buildFullMA(a, h.ID())
-		if err != nil {
-			return nil, fmt.Errorf("build full node multiaddr: %w", err)
-		}
-		advertizableAddresses = append(advertizableAddresses, a)
-	}
-
-	handshakeService, err := handshake.New(signer, advertisableAddresser, overlay, networkID, o.FullNode, o.Nonce, advertizableAddresses, o.WelcomeMessage, o.ValidateOverlay, h.ID(), logger)
+	handshakeService, err := handshake.New(signer, advertisableAddresser, overlay, networkID, o.FullNode, o.Nonce, newHostAddresser(h), o.WelcomeMessage, o.ValidateOverlay, h.ID(), logger)
 	if err != nil {
 		return nil, fmt.Errorf("handshake service: %w", err)
 	}
@@ -1292,6 +1280,27 @@ func isNetworkOrHostUnreachableError(err error) bool {
 	return false
 }
 
+type hostAddresser struct {
+	host host.Host
+}
+
+func newHostAddresser(host host.Host) *hostAddresser {
+	return &hostAddresser{
+		host: host,
+	}
+}
+
+func (h *hostAddresser) AdvertizableAddrs() ([]ma.Multiaddr, error) {
+	addrs := make([]ma.Multiaddr, 0)
+	for _, a := range h.host.Addrs() {
+		if manet.IsIPLoopback(a) {
+			continue
+		}
+		addrs = append(addrs, a)
+	}
+	return buildFullMAs(addrs, h.host.ID())
+}
+
 func buildFullMAs(addrs []ma.Multiaddr, peerID libp2ppeer.ID) ([]ma.Multiaddr, error) {
 	fullMAs := make([]ma.Multiaddr, 0)
 	for _, addr := range addrs {