From a956684f48b163aa1f8709e03a1a934c6fe8a5d5 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Fri, 15 Oct 2021 08:38:55 -0400 Subject: [PATCH] fix: use same privKey when displaying addresses --- waku/v2/node/wakunode2.go | 2 +- waku/v2/node/wakuoptions.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go index 3771f723..cecfef35 100644 --- a/waku/v2/node/wakunode2.go +++ b/waku/v2/node/wakunode2.go @@ -88,7 +88,7 @@ func New(ctx context.Context, opts ...WakuNodeOption) (*WakuNode, error) { } if params.privKey != nil { - params.libP2POpts = append(params.libP2POpts, libp2p.Identity(*params.privKey)) + params.libP2POpts = append(params.libP2POpts, params.Identity()) } if params.addressFactory != nil { diff --git a/waku/v2/node/wakuoptions.go b/waku/v2/node/wakuoptions.go index 1342af00..8f1ff76c 100644 --- a/waku/v2/node/wakuoptions.go +++ b/waku/v2/node/wakuoptions.go @@ -10,6 +10,7 @@ import ( connmgr "github.com/libp2p/go-libp2p-connmgr" "github.com/libp2p/go-libp2p-core/crypto" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/config" basichost "github.com/libp2p/go-libp2p/p2p/host/basic" "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr" @@ -54,6 +55,10 @@ func (w WakuNodeParameters) MultiAddresses() []ma.Multiaddr { return w.multiAddr } +func (w WakuNodeParameters) Identity() config.Option { + return libp2p.Identity(*w.privKey) +} + // WithHostAddress is a WakuNodeOption that configures libp2p to listen on a list of net endpoint addresses func WithHostAddress(hostAddr []net.Addr) WakuNodeOption { return func(params *WakuNodeParameters) error {