p2p: add enode URL to PeerInfo (#17838)

This commit is contained in:
Felix Lange 2018-10-04 17:13:21 +02:00 committed by Péter Szilágyi
parent 127553253e
commit 1895059119

@ -425,9 +425,10 @@ func (rw *protoRW) ReadMsg() (Msg, error) {
// peer. Sub-protocol independent fields are contained and initialized here, with // peer. Sub-protocol independent fields are contained and initialized here, with
// protocol specifics delegated to all connected sub-protocols. // protocol specifics delegated to all connected sub-protocols.
type PeerInfo struct { type PeerInfo struct {
ID string `json:"id"` // Unique node identifier (also the encryption key) Enode string `json:"enode"` // Node URL
ID string `json:"id"` // Unique node identifier
Name string `json:"name"` // Name of the node, including client type, version, OS, custom data Name string `json:"name"` // Name of the node, including client type, version, OS, custom data
Caps []string `json:"caps"` // Sum-protocols advertised by this particular peer Caps []string `json:"caps"` // Protocols advertised by this peer
Network struct { Network struct {
LocalAddress string `json:"localAddress"` // Local endpoint of the TCP data connection LocalAddress string `json:"localAddress"` // Local endpoint of the TCP data connection
RemoteAddress string `json:"remoteAddress"` // Remote endpoint of the TCP data connection RemoteAddress string `json:"remoteAddress"` // Remote endpoint of the TCP data connection
@ -447,6 +448,7 @@ func (p *Peer) Info() *PeerInfo {
} }
// Assemble the generic peer metadata // Assemble the generic peer metadata
info := &PeerInfo{ info := &PeerInfo{
Enode: p.Node().String(),
ID: p.ID().String(), ID: p.ID().String(),
Name: p.Name(), Name: p.Name(),
Caps: caps, Caps: caps,