From 3b4048887765fb124964acd338a73a98664887f7 Mon Sep 17 00:00:00 2001 From: Mike Zak Date: Tue, 4 Aug 2020 16:04:40 +0300 Subject: [PATCH] [NOD-1208] Allow sending Version message without an address --- .../grpcserver/protowire/message_version.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/netadapter/server/grpcserver/protowire/message_version.go b/netadapter/server/grpcserver/protowire/message_version.go index 6c11c07a2..c2840ca7b 100644 --- a/netadapter/server/grpcserver/protowire/message_version.go +++ b/netadapter/server/grpcserver/protowire/message_version.go @@ -7,9 +7,13 @@ import ( ) func (x *KaspadMessage_Version) toWireMessage() (wire.Message, error) { - address, err := x.Version.Address.toWire() - if err != nil { - return nil, err + var address *wire.NetAddress + if x.Version.Address != nil { + var err error + address, err = x.Version.Address.toWire() + if err != nil { + return nil, err + } } selectedTipHash, err := x.Version.SelectedTipHash.toWire() @@ -51,11 +55,16 @@ func (x *KaspadMessage_Version) fromWireMessage(msgVersion *wire.MsgVersion) err return err } + var address *NetAddress + if msgVersion.Address != nil { + address = wireNetAddressToProto(msgVersion.Address) + } + x.Version = &VersionMessage{ ProtocolVersion: msgVersion.ProtocolVersion, Services: uint64(msgVersion.Services), Timestamp: msgVersion.Timestamp.UnixMilliseconds(), - Address: wireNetAddressToProto(msgVersion.Address), + Address: address, Id: versionID, UserAgent: msgVersion.UserAgent, SelectedTipHash: wireHashToProto(msgVersion.SelectedTipHash),