Merge branch 'master' into x2eth_200507

go.mod

@@ -3,7 +3,7 @@ module github.com/33cn/plugin
 go 1.12
 
 require (
-	github.com/33cn/chain33 v0.0.0-20200426082803-69abea8a78b2
+	github.com/33cn/chain33 v0.0.0-20200527072033-e43d8da29c46
 	github.com/BurntSushi/toml v0.3.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/beorn7/perks v1.0.1 // indirect

go.sum

 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/33cn/chain33 v0.0.0-20200426082803-69abea8a78b2 h1:k/fZUlQxIThRfO30MOgT5YdkdMV3/0kE5kM8qoKCDLw=
-github.com/33cn/chain33 v0.0.0-20200426082803-69abea8a78b2/go.mod h1:RJsUKcMdXtCgpqp1W1ga6jTCieuJm6n7qd3XmnPXwa4=
+github.com/33cn/chain33 v0.0.0-20200527072033-e43d8da29c46 h1:i1O/BN5IvAkc0Jy3qfXyhlqI+v9N5+1j6McAgm///Mk=
+github.com/33cn/chain33 v0.0.0-20200527072033-e43d8da29c46/go.mod h1:RJsUKcMdXtCgpqp1W1ga6jTCieuJm6n7qd3XmnPXwa4=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7 h1:PqzgE6kAMi81xWQA2QIVxjWkFHptGgC547vchpUbtFo=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4=

plugin/dapp/ticket/wallet/ticket.go

@@ -97,6 +97,12 @@ func (policy *ticketPolicy) IsTicketLocked() bool {
 	return atomic.LoadInt32(&policy.isTicketLocked) != 0
 }
 
+// PolicyName Policy Name
+func (policy *ticketPolicy) PolicyName() string {
+
+	return ty.TicketX
+}
+
 // Init initial
 func (policy *ticketPolicy) Init(walletBiz wcom.WalletOperate, sub []byte) {
 	policy.setWalletOperate(walletBiz)

plugin/p2p/gossip/peer.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 // Start peer start
@@ -265,7 +266,7 @@ func (p *Peer) sendStream() {
 				P2pComm.CollectPeerStat(err, p)
 				if err != nil {
 					log.Error("sendStream", "send", err)
-					if grpc.Code(err) == codes.Unimplemented { //maybe order peers delete peer to BlackList
+					if status.Code(err) == codes.Unimplemented { //maybe order peers delete peer to BlackList
 						p.node.nodeInfo.blacklist.Add(p.Addr(), 3600)
 					}
 					time.Sleep(time.Second) //have a rest
@@ -335,9 +336,13 @@ func (p *Peer) readStream() {
 					log.Error("CloseSend", "err", errs)
 				}
 
+				if status.Code(err) == codes.Unavailable {
+					break //重新创建新的流
+				}
+
 				log.Error("readStream", "recv,err:", err.Error(), "peerIp", p.Addr())
 
-				if grpc.Code(err) == codes.Unimplemented { //maybe order peers delete peer to BlackList
+				if status.Code(err) == codes.Unimplemented { //maybe order peers delete peer to BlackList
 					p.node.nodeInfo.blacklist.Add(p.Addr(), 3600)
 					return
 				}