Merge remote-tracking branch 'upstream/master' into wasm_contract_update_support

plugin/p2p/gossip/common.go

@@ -115,7 +115,7 @@ func (c Comm) dialPeer(addr *NetAddress, node *Node) (*Peer, error) {
 	}
 	peer, err := c.dialPeerWithAddress(addr, persistent, node)
 	if err != nil {
-		log.Error("dialPeer", "nodeListenAddr", node.nodeInfo.listenAddr.str, "peerAddr", addr.str, "err", err)
+		log.Error("dialPeer", "peerAddr", addr.str, "err", err)
 		return nil, err
 	}
 	//获取远程节点的信息 peer

plugin/p2p/gossip/netaddress.go

@@ -191,7 +191,7 @@ func (na *NetAddress) DialTimeout(version int32, creds credentials.TransportCred
 	}
 
 	if err != nil {
-		log.Debug("grpc DialCon Uncompressor", "did not connect", err)
+		log.Debug("grpc DialCon Uncompressor", "connect err", err)
 		if conn != nil {
 			errs := conn.Close()
 			if errs != nil {

plugin/p2p/gossip/p2pcli.go

@@ -267,7 +267,7 @@ func (m *Cli) SendVersion(peer *Peer, nodeinfo *NodeInfo) (string, error) {
 	resp, err := peer.mconn.gcli.Version2(context.Background(), &pb.P2PVersion{Version: nodeinfo.channelVersion, Service: int64(nodeinfo.ServiceTy()), Timestamp: pb.Now().Unix(),
 		AddrRecv: peer.Addr(), AddrFrom: addrfrom, Nonce: int64(rand.Int31n(102040)),
 		UserAgent: hex.EncodeToString(in.Sign.GetPubkey()), StartHeight: blockheight}, grpc.FailFast(true))
-	log.Debug("SendVersion", "resp", resp, "addrfrom", addrfrom, "sendto", peer.Addr())
+	log.Debug("SendVersion", "resp", resp, "from", addrfrom, "to", peer.Addr())
 	if err != nil {
 		log.Error("SendVersion", "Verson", err.Error(), "peer", peer.Addr())
 		if err == pb.ErrVersion {
@@ -278,7 +278,7 @@ func (m *Cli) SendVersion(peer *Peer, nodeinfo *NodeInfo) (string, error) {
 	}
 
 	P2pComm.CollectPeerStat(err, peer)
-	log.Debug("SHOW VERSION BACK", "VersionBack", resp, "peer", peer.Addr())
+	log.Debug("SHOW VERSION BACK", "VersionBack", resp, "remote peer", peer.Addr())
 	_, ver := utils.DecodeChannelVersion(resp.GetVersion())
 	peer.version.SetVersion(ver)
 
@@ -286,7 +286,7 @@ func (m *Cli) SendVersion(peer *Peer, nodeinfo *NodeInfo) (string, error) {
 	if err == nil {
 		if ip != nodeinfo.GetExternalAddr().IP.String() {
 
-			log.Debug("sendVersion", "externalip", ip)
+			log.Debug("sendVersion", "expect ip", ip, "pre externalip", nodeinfo.GetExternalAddr().IP.String())
 			if peer.IsPersistent() {
 				//永久加入黑名单
 				nodeinfo.blacklist.Add(ip, 0)