feat(x/gov): Emit VoterAddr (#17354)

(cherry picked from commit 85d9791)

# Conflicts:
#	x/gov/types/events.go

x/gov/keeper/vote.go

@@ -37,6 +37,7 @@ func (keeper Keeper) AddVote(ctx sdk.Context, proposalID uint64, voterAddr sdk.A
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			types.EventTypeProposalVote,
+			sdk.NewAttribute(types.AttributeKeyVoter, voterAddr.String()),
 			sdk.NewAttribute(types.AttributeKeyOption, options.String()),
 			sdk.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposalID)),
 		),

x/gov/types/events.go

@@ -9,6 +9,7 @@ const (
 	EventTypeActiveProposal   = "active_proposal"
 	EventTypeSignalProposal   = "signal_proposal"
 
+<<<<<<< HEAD
 	AttributeKeyProposalResult     = "proposal_result"
 	AttributeKeyOption             = "option"
 	AttributeKeyProposalID         = "proposal_id"
@@ -21,4 +22,23 @@ const (
 	AttributeKeyProposalType       = "proposal_type"
 	AttributeSignalTitle           = "signal_title"
 	AttributeSignalDescription     = "signal_description"
+=======
+	AttributeKeyProposalResult              = "proposal_result"
+	AttributeKeyVoter                       = "voter"
+	AttributeKeyOption                      = "option"
+	AttributeKeyProposalID                  = "proposal_id"
+	AttributeKeyProposalMessages            = "proposal_messages" // Msg type_urls in the proposal
+	AttributeKeyVotingPeriodStart           = "voting_period_start"
+	AttributeKeyProposalLog                 = "proposal_log"                // log of proposal execution
+	AttributeValueProposalDropped           = "proposal_dropped"            // didn't meet min deposit
+	AttributeValueProposalPassed            = "proposal_passed"             // met vote quorum
+	AttributeValueProposalRejected          = "proposal_rejected"           // didn't meet vote quorum
+	AttributeValueExpeditedProposalRejected = "expedited_proposal_rejected" // didn't meet expedited vote quorum
+	AttributeValueProposalFailed            = "proposal_failed"             // error on proposal handler
+	AttributeValueProposalCanceled          = "proposal_canceled"           // error on proposal handler
+
+	AttributeKeyProposalType   = "proposal_type"
+	AttributeSignalTitle       = "signal_title"
+	AttributeSignalDescription = "signal_description"
+>>>>>>> 85d9791ed (feat(x/gov): Emit VoterAddr (#17354))
 )