call EpochEnd event before increasing (#1043) (#1111)

(cherry picked from commit fb9cb2e0 ) Co-authored-by: Adam Tucker <adamleetucker@outlook.com>

call EpochEnd event before increasing (#1043) (#1111)
(cherry picked from commit fb9cb2e0 ) Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
18d70da2 · mergify[bot] · GitHub · 63633b87 · 18d70da2
Unverified Commit 18d70da2 authored 3 years ago by mergify[bot] Committed by GitHub 3 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/x/epochs/abci.go
+++ b/x/epochs/abci.go
@@ -31,9 +31,6 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 				epochInfo.CurrentEpochStartTime = epochInfo.StartTime
 				logger.Info(fmt.Sprintf("Starting new epoch with identifier %s epoch number %d", epochInfo.Identifier, epochInfo.CurrentEpoch))
 			} else {
-				epochInfo.CurrentEpoch += 1
-				epochInfo.CurrentEpochStartTime = epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration)
-				logger.Info(fmt.Sprintf("Starting epoch with identifier %s epoch number %d", epochInfo.Identifier, epochInfo.CurrentEpoch))
 				ctx.EventManager().EmitEvent(
 					sdk.NewEvent(
 						types.EventTypeEpochEnd,
@@ -41,6 +38,9 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 					),
 				)
 				k.AfterEpochEnd(ctx, epochInfo.Identifier, epochInfo.CurrentEpoch)
+				epochInfo.CurrentEpoch += 1
+				epochInfo.CurrentEpochStartTime = epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration)
+				logger.Info(fmt.Sprintf("Starting epoch with identifier %s epoch number %d", epochInfo.Identifier, epochInfo.CurrentEpoch))
 			}
 			k.SetEpochInfo(ctx, epochInfo)
 			ctx.EventManager().EmitEvent(