Merge branch 'main' into julien/val-update-stacking

cosmos · Mar 25, 2024 · b91e82f · b91e82f
2 parents a9d390b + d1c3547
commit b91e82f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/x/gov/CHANGELOG.md b/x/gov/CHANGELOG.md
@@ -34,6 +34,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#18532](https://github.com/cosmos/cosmos-sdk/pull/18532) Add proposal types to proposals.
 * [#18620](https://github.com/cosmos/cosmos-sdk/pull/18620) Add optimistic proposals.
 * [#18762](https://github.com/cosmos/cosmos-sdk/pull/18762) Add multiple choice proposals.
+* [#19853](https://github.com/cosmos/cosmos-sdk/pull/19853) Emit `depositor` in `EventTypeProposalDeposit` and `proposal_type` in `EventTypeSubmitProposal`
 
 ### Improvements
 

diff --git a/x/gov/keeper/deposit.go b/x/gov/keeper/deposit.go
@@ -179,6 +179,7 @@ func (k Keeper) AddDeposit(ctx context.Context, proposalID uint64, depositorAddr
 
 	if err := k.environment.EventService.EventManager(ctx).EmitKV(
 		types.EventTypeProposalDeposit,
+		event.NewAttribute(types.AttributeKeyDepositor, depositorAddr.String()),
 		event.NewAttribute(sdk.AttributeKeyAmount, depositAmount.String()),
 		event.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposalID)),
 	); err != nil {

diff --git a/x/gov/keeper/proposal.go b/x/gov/keeper/proposal.go
@@ -146,6 +146,7 @@ func (k Keeper) SubmitProposal(ctx context.Context, messages []sdk.Msg, metadata
 
 	if err := k.environment.EventService.EventManager(ctx).EmitKV(
 		types.EventTypeSubmitProposal,
+		event.NewAttribute(types.AttributeKeyProposalType, proposalType.String()),
 		event.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposalID)),
 		event.NewAttribute(types.AttributeKeyProposalProposer, proposer.String()),
 		event.NewAttribute(types.AttributeKeyProposalMessages, strings.Join(msgs, ",")),

diff --git a/x/gov/types/events.go b/x/gov/types/events.go
@@ -13,6 +13,7 @@ const (
 	AttributeKeyVoter                = "voter"
 	AttributeKeyOption               = "option"
 	AttributeKeyProposalID           = "proposal_id"
+	AttributeKeyDepositor            = "depositor"
 	AttributeKeyProposalMessages     = "proposal_messages" // Msg type_urls in the proposal
 	AttributeKeyVotingPeriodStart    = "voting_period_start"
 	AttributeKeyProposalLog          = "proposal_log"           // log of proposal execution