abci: Vote Extension 2

abci/types/result.go

@@ -41,6 +41,16 @@ func (r ResponseQuery) IsErr() bool {
 	return r.Code != CodeTypeOK
 }
 
+// IsOK returns true if Code is OK
+func (r ResponseVerifyVoteExtension) IsOK() bool {
+	return r.Code == CodeTypeOK
+}
+
+// IsErr returns true if Code is something other than OK.
+func (r ResponseVerifyVoteExtension) IsErr() bool {
+	return r.Code != CodeTypeOK
+}
+
 //---------------------------------------------------------------------------
 // override JSON marshaling so we emit defaults (ie. disable omitempty)
 

internal/consensus/state.go

@@ -1424,7 +1424,6 @@ func (cs *State) enterPrecommit(height int64, round int32) {
 			logger.Error("failed publishing event relock", "err", err)
 		}
 
-		// XXX: need to add vote extension here
 		cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader)
 		return
 	}
@@ -1446,7 +1445,6 @@ func (cs *State) enterPrecommit(height int64, round int32) {
 			logger.Error("failed publishing event lock", "err", err)
 		}
 
-		// XXX: need to add vote extension here
 		cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader)
 		return
 	}
@@ -1530,7 +1528,6 @@ func (cs *State) enterCommit(height int64, commitRound int32) {
 		cs.tryFinalizeCommit(height)
 	}()
 
-	// XXX: SelfAuthenticating AppData VoteExtension should be excluded here
 	blockID, ok := cs.Votes.Precommits(commitRound).TwoThirdsMajority()
 	if !ok {
 		panic("RunActionCommit() expects +2/3 precommits")
@@ -2042,6 +2039,13 @@ func (cs *State) addVote(vote *types.Vote, peerID types.NodeID) (added bool, err
 		return
 	}
 
+	// Verify VoteExtension if precommit
+	if vote.Type == tmproto.PrecommitType {
+		if err = cs.blockExec.VerifyVoteExtension(vote.VoteExtension); err != nil {
+			return
+		}
+	}
+
 	height := cs.Height
 	added, err = cs.Votes.AddVote(vote, peerID)
 	if !added {
@@ -2213,6 +2217,27 @@ func (cs *State) signVote(
 		timeout = time.Second
 	}
 
+	// If the signedMessage type is for precommit, add VoteExtension
+	switch msgType {
+	case tmproto.PrecommitType:
+		ext, err := cs.blockExec.ExtendVote(cs.Height, cs.Round)
+		if err != nil {
+			return nil, err
+		}
+		vote.VoteExtension = ext
+	default:
+	}
+	// If the signedMessage type is for precommit, add VoteExtension
+	switch msgType {
+	case tmproto.PrecommitType:
+		ext, err := cs.blockExec.ExtendVote(cs.Height, cs.Round)
+		if err != nil {
+			return nil, err
+		}
+		vote.VoteExtension = ext
+	default:
+	}
+
 	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
 	defer cancel()
 
@@ -2247,7 +2272,8 @@ func (cs *State) voteTime() time.Time {
 }
 
 // sign the vote and publish on internalMsgQueue
-func (cs *State) signAddVote(msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote {
+func (cs *State) signAddVote(
+	msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote {
 	if cs.privValidator == nil { // the node does not have a key
 		return nil
 	}

proto/tendermint/abci/types.proto

@@ -127,7 +127,7 @@ message RequestExtendVote {
 
 // Verify the vote extension
 message RequestVerifyVoteExtension {
-  tendermint.types.VoteExtension extension = 1 [(gogoproto.nullable) = false];
+  tendermint.types.VoteExtension vote_extension = 1 [(gogoproto.nullable) = false];
 }
 
 //----------------------------------------