progress

x/gov/abci.go

@@ -12,20 +12,30 @@ import (
 )
 
 // EndBlocker called every block, process inflation, update validator set.
-func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
+func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) error {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
 
 	logger := ctx.Logger().With("module", "x/"+types.ModuleName)
 	// delete dead proposals from store and returns theirs deposits.
 	// A proposal is dead when it's inactive and didn't get enough deposit on time to get into voting phase.
-	keeper.IterateInactiveProposalsQueue(ctx, ctx.BlockHeader().Time, func(proposal v1.Proposal) bool {
-		keeper.DeleteProposal(ctx, proposal.Id)
+	err := keeper.IterateInactiveProposalsQueue(ctx, ctx.BlockHeader().Time, func(proposal v1.Proposal) error {
+		err := keeper.DeleteProposal(ctx, proposal.Id)
+		if err != nil {
+			return err
+		}
 
-		params := keeper.GetParams(ctx)
+		params, err := keeper.GetParams(ctx)
+		if err != nil {
+			return err
+		}
 		if !params.BurnProposalDepositPrevote {
-			keeper.RefundAndDeleteDeposits(ctx, proposal.Id) // refund deposit if proposal got removed without getting 100% of the proposal
+			err = keeper.RefundAndDeleteDeposits(ctx, proposal.Id) // refund deposit if proposal got removed without getting 100% of the proposal
 		} else {
-			keeper.DeleteAndBurnDeposits(ctx, proposal.Id) // burn the deposit if proposal got removed without getting 100% of the proposal
+			err = keeper.DeleteAndBurnDeposits(ctx, proposal.Id) // burn the deposit if proposal got removed without getting 100% of the proposal
+		}
+
+		if err != nil {
+			return err
 		}
 
 		// called when proposal become inactive
@@ -48,28 +58,41 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 			"total_deposit", sdk.NewCoins(proposal.TotalDeposit...).String(),
 		)
 
-		return false
+		return nil
 	})
+	if err != nil {
+		return err
+	}
 
 	// fetch active proposals whose voting periods have ended (are passed the block time)
-	keeper.IterateActiveProposalsQueue(ctx, ctx.BlockHeader().Time, func(proposal v1.Proposal) bool {
+	return keeper.IterateActiveProposalsQueue(ctx, ctx.BlockHeader().Time, func(proposal v1.Proposal) error {
 		var tagValue, logMsg string
 
-		passes, burnDeposits, tallyResults := keeper.Tally(ctx, proposal)
+		passes, burnDeposits, tallyResults, err := keeper.Tally(ctx, proposal)
+		if err != nil {
+			return err
+		}
 
 		// If an expedited proposal fails, we do not want to update
 		// the deposit at this point since the proposal is converted to regular.
 		// As a result, the deposits are either deleted or refunded in all cases
 		// EXCEPT when an expedited proposal fails.
 		if !(proposal.Expedited && !passes) {
 			if burnDeposits {
-				keeper.DeleteAndBurnDeposits(ctx, proposal.Id)
+				err = keeper.DeleteAndBurnDeposits(ctx, proposal.Id)
 			} else {
-				keeper.RefundAndDeleteDeposits(ctx, proposal.Id)
+				err = keeper.RefundAndDeleteDeposits(ctx, proposal.Id)
+			}
+
+			if err != nil {
+				return err
 			}
 		}
 
-		keeper.RemoveFromActiveProposalQueue(ctx, proposal.Id, *proposal.VotingEndTime)
+		err = keeper.RemoveFromActiveProposalQueue(ctx, proposal.Id, *proposal.VotingEndTime)
+		if err != nil {
+			return err
+		}
 
 		switch {
 		case passes:
@@ -129,11 +152,17 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 			// once the regular voting period expires again, the tally is repeated
 			// according to the regular proposal rules.
 			proposal.Expedited = false
-			params := keeper.GetParams(ctx)
+			params, err := keeper.GetParams(ctx)
+			if err != nil {
+				return err
+			}
 			endTime := proposal.VotingStartTime.Add(*params.VotingPeriod)
 			proposal.VotingEndTime = &endTime
 
-			keeper.InsertActiveProposalQueue(ctx, proposal.Id, *proposal.VotingEndTime)
+			err = keeper.InsertActiveProposalQueue(ctx, proposal.Id, *proposal.VotingEndTime)
+			if err != nil {
+				return err
+			}
 
 			tagValue = types.AttributeValueExpeditedProposalRejected
 			logMsg = "expedited proposal converted to regular"
@@ -145,7 +174,10 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 
 		proposal.FinalTallyResult = &tallyResults
 
-		keeper.SetProposal(ctx, proposal)
+		err = keeper.SetProposal(ctx, proposal)
+		if err != nil {
+			return err
+		}
 
 		// when proposal become active
 		keeper.Hooks().AfterProposalVotingPeriodEnded(ctx, proposal.Id)
@@ -168,6 +200,6 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 			),
 		)
 
-		return false
+		return nil
 	})
 }