Fix AutoNAT service for private network

License: MIT
Signed-off-by: Roman Khafizianov <requilence@gmail.com>

core/node/libp2p.go

@@ -523,16 +523,19 @@ func P2PPubsubRouter(mctx MetricsCtx, lc fx.Lifecycle, in p2pPSRoutingIn) (p2pRo
 	}, psRouter
 }
 
-func AutoNATService(mctx MetricsCtx, lc fx.Lifecycle, cfg *config.Config, host host.Host) error {
+func AutoNATService(repo repo.Repo, mctx MetricsCtx, lc fx.Lifecycle, cfg *config.Config, host host.Host) error {
 	if !cfg.Swarm.EnableAutoNATService {
 		return nil
 	}
-	var opts []libp2p.Option
+
+	// collect private net option in case swarm.key is presented
+	opts, _, _ := P2PPNet(repo)
+
 	if cfg.Experimental.QUIC {
-		opts = append(opts, libp2p.DefaultTransports, libp2p.Transport(libp2pquic.NewTransport))
+		opts.Opts = append(opts.Opts, libp2p.DefaultTransports, libp2p.Transport(libp2pquic.NewTransport))
 	}
 
-	_, err := autonat.NewAutoNATService(lifecycleCtx(mctx, lc), host, opts...)
+	_, err := autonat.NewAutoNATService(lifecycleCtx(mctx, lc), host, opts.Opts...)
 	return err
 }