From 5f9b01a2839111a97cfecdb9d746025f433c5276 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Thu, 15 Feb 2018 13:43:48 +0100 Subject: [PATCH] whisper: only use the node id as a p2p id, not for sending messages (#16102) This is in preparation for the switch to libp2p: the ID generated will be from a private key created with the help of libp2p's crypto library, while Whisper will still use Go's default crypto libraries for encrypting its messages. This change removes a conflict. It shouldn't have any impact as the person receiving emails is the user, not the node. --- cmd/wnode/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 68e6971da..971b1c0ab 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -265,7 +265,7 @@ func initialize() { Config: p2p.Config{ PrivateKey: nodeid, MaxPeers: maxPeers, - Name: common.MakeName("wnode", "5.0"), + Name: common.MakeName("wnode", "6.0"), Protocols: shh.Protocols(), ListenAddr: *argIP, NAT: nat.Any(), @@ -656,7 +656,7 @@ func requestExpiredMessagesLoop() { params.PoW = *argServerPoW params.Payload = data params.KeySym = key - params.Src = nodeid + params.Src = asymKey params.WorkTime = 5 msg, err := whisper.NewSentMessage(¶ms)