From 7f1b865b533256b2be14dc1ea34f2527d0a135df Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 28 Apr 2020 10:06:21 +0200 Subject: [PATCH] multi: rename server's identityPriv to identityECDH --- peer.go | 2 +- pilot.go | 2 +- rpcserver.go | 6 +++--- server.go | 30 +++++++++++++++--------------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/peer.go b/peer.go index aa4cbce9c..4b5d66435 100644 --- a/peer.go +++ b/peer.go @@ -555,7 +555,7 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) ( // particular channel. var selfPolicy *channeldb.ChannelEdgePolicy if info != nil && bytes.Equal(info.NodeKey1Bytes[:], - p.server.identityPriv.PubKey().SerializeCompressed()) { + p.server.identityECDH.PubKey().SerializeCompressed()) { selfPolicy = p1 } else { diff --git a/pilot.go b/pilot.go index 8d9bc61e9..64e5eff23 100644 --- a/pilot.go +++ b/pilot.go @@ -170,7 +170,7 @@ func initAutoPilot(svr *server, cfg *lncfg.AutoPilot, // With the heuristic itself created, we can now populate the remainder // of the items that the autopilot agent needs to perform its duties. - self := svr.identityPriv.PubKey() + self := svr.identityECDH.PubKey() pilotCfg := autopilot.Config{ Self: self, Heuristic: weightedAttachment, diff --git a/rpcserver.go b/rpcserver.go index e5ade52c7..6e0af9a9a 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -1433,7 +1433,7 @@ func (r *rpcServer) ConnectPeer(ctx context.Context, } // Connections to ourselves are disallowed for obvious reasons. - if pubKey.IsEqual(r.server.identityPriv.PubKey()) { + if pubKey.IsEqual(r.server.identityECDH.PubKey()) { return nil, fmt.Errorf("cannot make connection to self") } @@ -1781,7 +1781,7 @@ func (r *rpcServer) parseOpenChannelReq(in *lnrpc.OpenChannelRequest, // Making a channel to ourselves wouldn't be of any use, so we // explicitly disallow them. - if nodePubKey.IsEqual(r.server.identityPriv.PubKey()) { + if nodePubKey.IsEqual(r.server.identityECDH.PubKey()) { return nil, fmt.Errorf("cannot open channel to self") } @@ -2406,7 +2406,7 @@ func (r *rpcServer) GetInfo(ctx context.Context, } nPendingChannels := uint32(len(pendingChannels)) - idPub := r.server.identityPriv.PubKey().SerializeCompressed() + idPub := r.server.identityECDH.PubKey().SerializeCompressed() encodedIDPub := hex.EncodeToString(idPub) bestHash, bestHeight, err := r.server.cc.chainIO.GetBestBlock() diff --git a/server.go b/server.go index 8e84b38db..d7f409013 100644 --- a/server.go +++ b/server.go @@ -135,9 +135,9 @@ type server struct { cfg *Config - // identityPriv is the private key used to authenticate any incoming - // connections. - identityPriv *btcec.PrivateKey + // identityECDH is an ECDH capable wrapper for the private key used + // to authenticate any incoming connections. + identityECDH *btcec.PrivateKey // nodeSigner is an implementation of the MessageSigner implementation // that's backed by the identity private key of the running lnd node. @@ -425,7 +425,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, chanDB *channeldb.DB, channelNotifier: channelnotifier.New(chanDB), - identityPriv: privKey, + identityECDH: privKey, nodeSigner: netann.NewNodeSigner(privKey), listenAddrs: listenAddrs, @@ -651,7 +651,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, chanDB *channeldb.DB, // With the announcement generated, we'll sign it to properly // authenticate the message on the network. authSig, err := netann.SignAnnouncement( - s.nodeSigner, s.identityPriv.PubKey(), nodeAnn, + s.nodeSigner, s.identityECDH.PubKey(), nodeAnn, ) if err != nil { return nil, fmt.Errorf("unable to generate signature for "+ @@ -799,7 +799,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, chanDB *channeldb.DB, SubBatchDelay: time.Second * 5, IgnoreHistoricalFilters: cfg.IgnoreHistoricalGossipFilters, }, - s.identityPriv.PubKey(), + s.identityECDH.PubKey(), ) s.localChanMgr = &localchans.Manager{ @@ -1227,7 +1227,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, chanDB *channeldb.DB, OnAccept: s.InboundPeerConnected, RetryDuration: time.Second * 5, TargetOutbound: 100, - Dial: noiseDial(s.identityPriv, s.cfg.net), + Dial: noiseDial(s.identityECDH, s.cfg.net), OnConnection: s.OutboundPeerConnected, }) if err != nil { @@ -2020,7 +2020,7 @@ func (s *server) createNewHiddenService() error { Color: newNodeAnn.RGBColor, AuthSigBytes: newNodeAnn.Signature.ToSignatureBytes(), } - copy(selfNode.PubKeyBytes[:], s.identityPriv.PubKey().SerializeCompressed()) + copy(selfNode.PubKeyBytes[:], s.identityECDH.PubKey().SerializeCompressed()) if err := s.chanDB.ChannelGraph().SetSourceNode(selfNode); err != nil { return fmt.Errorf("can't set self node: %v", err) } @@ -2050,7 +2050,7 @@ func (s *server) genNodeAnnouncement(refresh bool, // Otherwise, we'll sign a new update after applying all of the passed // modifiers. err := netann.SignNodeAnnouncement( - s.nodeSigner, s.identityPriv.PubKey(), s.currentNodeAnn, + s.nodeSigner, s.identityECDH.PubKey(), s.currentNodeAnn, modifiers..., ) if err != nil { @@ -2102,7 +2102,7 @@ func (s *server) establishPersistentConnections() error { // TODO(roasbeef): instead iterate over link nodes and query graph for // each of the nodes. - selfPub := s.identityPriv.PubKey().SerializeCompressed() + selfPub := s.identityECDH.PubKey().SerializeCompressed() err = sourceNode.ForEachChannel(nil, func( tx kvdb.ReadTx, chanInfo *channeldb.ChannelEdgeInfo, @@ -2552,7 +2552,7 @@ func (s *server) InboundPeerConnected(conn net.Conn) { // not of the same type of the new connection (inbound), then // we'll close out the new connection s.t there's only a single // connection between us. - localPub := s.identityPriv.PubKey() + localPub := s.identityECDH.PubKey() if !connectedPeer.inbound && !shouldDropLocalConnection(localPub, nodePub) { @@ -2663,7 +2663,7 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn) // not of the same type of the new connection (outbound), then // we'll close out the new connection s.t there's only a single // connection between us. - localPub := s.identityPriv.PubKey() + localPub := s.identityECDH.PubKey() if connectedPeer.inbound && shouldDropLocalConnection(localPub, nodePub) { @@ -3264,7 +3264,7 @@ func (s *server) ConnectToPeer(addr *lnwire.NetAddress, perm bool) error { // notify the caller if the connection attempt has failed. Otherwise, it will be // closed. func (s *server) connectToPeer(addr *lnwire.NetAddress, errChan chan<- error) { - conn, err := brontide.Dial(s.identityPriv, addr, s.cfg.net.Dial) + conn, err := brontide.Dial(s.identityECDH, addr, s.cfg.net.Dial) if err != nil { srvrLog.Errorf("Unable to connect to %v: %v", addr, err) select { @@ -3467,7 +3467,7 @@ func (s *server) fetchNodeAdvertisedAddr(pub *btcec.PublicKey) (net.Addr, error) func (s *server) fetchLastChanUpdate() func(lnwire.ShortChannelID) ( *lnwire.ChannelUpdate, error) { - ourPubKey := s.identityPriv.PubKey().SerializeCompressed() + ourPubKey := s.identityECDH.PubKey().SerializeCompressed() return func(cid lnwire.ShortChannelID) (*lnwire.ChannelUpdate, error) { info, edge1, edge2, err := s.chanRouter.GetChannelByID(cid) if err != nil { @@ -3483,7 +3483,7 @@ func (s *server) fetchLastChanUpdate() func(lnwire.ShortChannelID) ( // applyChannelUpdate applies the channel update to the different sub-systems of // the server. func (s *server) applyChannelUpdate(update *lnwire.ChannelUpdate) error { - pubKey := s.identityPriv.PubKey() + pubKey := s.identityECDH.PubKey() errChan := s.authGossiper.ProcessLocalAnnouncement(update, pubKey) select { case err := <-errChan: