update 04/04

vendor/github.com/33cn/chain33/p2p/monitor.go

@@ -345,6 +345,8 @@ func (n *Node) nodeReBalance() {
 			if localBlockHeight-peerBlockHeight < 2048 {
 				log.Info("noReBalance", "Repalce node new node", MinCacheInBoundPeer.Addr(), "old node", MaxInBoundPeer.Addr())
 				n.addPeer(MinCacheInBoundPeer)
+				n.nodeInfo.addrBook.AddAddress(MinCacheInBoundPeer.peerAddr, nil)
+
 				n.remove(MaxInBoundPeer.Addr())
 				n.RemoveCachePeer(MinCacheInBoundPeer.Addr())
 			}

vendor/github.com/33cn/chain33/p2p/peer.go

@@ -414,7 +414,7 @@ func (p *Peer) readStream() {
 					msg := p.node.nodeInfo.client.NewMessage("mempool", pb.EventTx, tx.GetTx())
 					errs := p.node.nodeInfo.client.Send(msg, false)
 					if errs != nil {
-						log.Error("send", "to mempool EventTx msg Error", err.Error())
+						log.Error("send", "to mempool EventTx msg Error", errs.Error())
 					}
 					//Filter.RegRecvData(txhash) //登记
 				}

vendor/github.com/33cn/chain33/rpc/server.go

@@ -19,6 +19,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	_ "google.golang.org/grpc/encoding/gzip" // register gzip
+	"google.golang.org/grpc/keepalive"
 )
 
 var (
@@ -168,6 +169,13 @@ func NewGRpcServer(c queue.Client, api client.QueueProtocolAPI) *Grpcserver {
 		credsOps := grpc.Creds(creds)
 		opts = append(opts, credsOps)
 	}
+
+	kp := keepalive.EnforcementPolicy{
+		MinTime:             10 * time.Second,
+		PermitWithoutStream: true,
+	}
+	opts = append(opts, grpc.KeepaliveEnforcementPolicy(kp))
+
 	server := grpc.NewServer(opts...)
 	s.s = server
 	types.RegisterChain33Server(server, s.grpc)

vendor/github.com/33cn/chain33/util/cli/chain33.go

@@ -136,7 +136,7 @@ func RunChain33(name string) {
 	version.SetLocalDBVersion(cfg.Store.LocalDBVersion)
 	version.SetStoreDBVersion(cfg.Store.StoreDBVersion)
 	version.SetAppVersion(cfg.Version)
-	log.Info(cfg.Title + "-app:" + version.GetAppVersion() + " chain33:" + version.GetVersion() + " localdb:" + version.GetLocalDBVersion() + " storedb:" + version.GetStoreDBVersion())
+	log.Info(cfg.Title + "-app:" + version.GetAppVersion() + " chain33:" + version.GetVersion() + " localdb:" + version.GetLocalDBVersion() + " statedb:" + version.GetStoreDBVersion())
 	log.Info("loading queue")
 	q := queue.New("channel")