Merge commit from fork (#1386)

* Merge commit from fork

* Fix ABS061

(cherry picked from commit f6f5639)

* Update changelog

* Review feedback

(cherry picked from commit c892055e7fa86db8382fb2af17bb66342d7e2eeb)

* Review feedback

* Remove unecessary code comments

* Set release date

* Make format + removed todos

* fix changelog

---------

Co-authored-by: aljo242 <alex@interchainlabs.io>

* remove new test

* revert test

---------

Co-authored-by: Alexander Peters <alpe@users.noreply.github.com>
Co-authored-by: aljo242 <alex@interchainlabs.io>

Author: 3 people

CHANGELOG.md

@@ -37,6 +37,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (x/staking) Fix a possible bypass of delagator slashing: [GHSA-86h5-xcpx-cfqc](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-86h5-xcpx-cfqc)
 * Fix [ABS-0043/ABS-0044](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-8wcc-m6j2-qxvm) Limit recursion depth for unknown field detection and unpack any
+* [GHSA-47ww-ff84-4jrg](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-47ww-ff84-4jrg) Fix x/group can halt when erroring in EndBlocker
 
 ## [v0.46.16](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.16) - 2023-11-07
 

proto/cosmos/group/v1/events.proto

@@ -92,3 +92,13 @@ message EventProposalPruned {
   // tally_result is the proposal tally result (when applicable).
   TallyResult tally_result = 3;
 }
+
+// EventTallyError is an event emitted when a proposal tally failed with an error.
+message EventTallyError {
+
+  // proposal_id is the unique ID of the proposal.
+  uint64 proposal_id = 1;
+
+  // error_message is the raw error output
+  string error_message = 2;
+}

x/group/events.pb.go

@@ -678,33 +678,40 @@ func (k Keeper) Vote(goCtx context.Context, req *group.MsgVote) (*group.MsgVoteR
 // doTallyAndUpdate performs a tally, and, if the tally result is final, then:
 // - updates the proposal's `Status` and `FinalTallyResult` fields,
 // - prune all the votes.
-func (k Keeper) doTallyAndUpdate(ctx sdk.Context, p *group.Proposal, electorate group.GroupInfo, policyInfo group.GroupPolicyInfo) error {
+func (k Keeper) doTallyAndUpdate(ctx sdk.Context, proposal *group.Proposal, electorate group.GroupInfo, policyInfo group.GroupPolicyInfo) error {
 	policy, err := policyInfo.GetDecisionPolicy()
 	if err != nil {
 		return err
 	}
 
-	tallyResult, err := k.Tally(ctx, *p, policyInfo.GroupId)
-	if err != nil {
-		return err
+	var result group.DecisionPolicyResult
+	tallyResult, err := k.Tally(ctx, *proposal, policyInfo.GroupId)
+	if err == nil {
+		result, err = policy.Allow(tallyResult, electorate.TotalWeight)
 	}
-
-	result, err := policy.Allow(tallyResult, electorate.TotalWeight)
 	if err != nil {
-		return sdkerrors.Wrap(err, "policy allow")
+		if err := k.pruneVotes(ctx, proposal.Id); err != nil {
+			return err
+		}
+		proposal.Status = group.PROPOSAL_STATUS_REJECTED
+		return ctx.EventManager().EmitTypedEvents(
+			&group.EventTallyError{
+				ProposalId:   proposal.Id,
+				ErrorMessage: err.Error(),
+			})
 	}
 
 	// If the result was final (i.e. enough votes to pass) or if the voting
 	// period ended, then we consider the proposal as final.
-	if isFinal := result.Final || ctx.BlockTime().After(p.VotingPeriodEnd); isFinal {
-		if err := k.pruneVotes(ctx, p.Id); err != nil {
+	if isFinal := result.Final || ctx.BlockTime().After(proposal.VotingPeriodEnd); isFinal {
+		if err := k.pruneVotes(ctx, proposal.Id); err != nil {
 			return err
 		}
-		p.FinalTallyResult = tallyResult
+		proposal.FinalTallyResult = tallyResult
 		if result.Allow {
-			p.Status = group.PROPOSAL_STATUS_ACCEPTED
+			proposal.Status = group.PROPOSAL_STATUS_ACCEPTED
 		} else {
-			p.Status = group.PROPOSAL_STATUS_REJECTED
+			proposal.Status = group.PROPOSAL_STATUS_REJECTED
 		}
 
 	}