Merge PR: optimize precommit long time consuming (#1945)

* broadcast vote at once * update msg format * add debug info * remove log * add debug info * add debug info * remove log * reuse Broadcast Co-authored-by: xiangjianmeng <[email protected]>
okx · Apr 28, 2022 · 4926092 · 4926092
1 parent b16c5f0
commit 4926092
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/libs/tendermint/consensus/consensus.go b/libs/tendermint/consensus/consensus.go
@@ -2075,6 +2075,8 @@ func (cs *State) signAddVote(msgType types.SignedMsgType, hash []byte, header ty
 	// TODO: pass pubKey to signVote
 	vote, err := cs.signVote(msgType, hash, header)
 	if err == nil {
+		//broadcast vote immediately
+		cs.evsw.FireEvent(types.EventSignVote, vote)
 		cs.sendInternalMessage(msgInfo{&VoteMessage{vote}, ""})
 		cs.Logger.Info("Signed and pushed vote", "height", cs.Height, "round", cs.Round, "vote", vote, "err", err)
 		return vote

diff --git a/libs/tendermint/consensus/reactor.go b/libs/tendermint/consensus/reactor.go
@@ -476,6 +476,11 @@ func (conR *Reactor) subscribeToBroadcastEvents() {
 		func(data tmevents.EventData) {
 			conR.broadcastHasVoteMessage(data.(*types.Vote))
 		})
+
+	conR.conS.evsw.AddListenerForEvent(subscriber, types.EventSignVote,
+		func(data tmevents.EventData) {
+			conR.broadcastSignVoteMessage(data.(*types.Vote))
+		})
 }
 
 func (conR *Reactor) unsubscribeFromBroadcastEvents() {
@@ -527,7 +532,10 @@ func (conR *Reactor) broadcastHasVoteMessage(vote *types.Vote) {
 		}
 	*/
 }
-
+func (conR *Reactor) broadcastSignVoteMessage(vote *types.Vote) {
+	msg := &VoteMessage{vote}
+	conR.Switch.Broadcast(VoteChannel, cdc.MustMarshalBinaryBare(msg))
+}
 func makeRoundStepMessage(rs *cstypes.RoundState) (nrsMsg *NewRoundStepMessage) {
 	nrsMsg = &NewRoundStepMessage{
 		Height:                rs.Height,

diff --git a/libs/tendermint/types/events.go b/libs/tendermint/types/events.go
@@ -37,6 +37,7 @@ const (
 	EventUnlock           = "Unlock"
 	EventValidBlock       = "ValidBlock"
 	EventVote             = "Vote"
+	EventSignVote         = "SignVote"
 )
 
 ///////////////////////////////////////////////////////////////////////////////