cleanup & touches

Author: Reecepbcups

keys.go

@@ -21,6 +21,7 @@ var (
 	// UpdatedValidatorsCacheKey tracks recently updated validators from SetPower.
 	UpdatedValidatorsCacheKey = collections.NewPrefix(4)
 
+	// BeforeJailedValidatorsKey tracks validators that are about to be jailed (from staking hooks).
 	BeforeJailedValidatorsKey = collections.NewPrefix(5)
 )
 

module/abci.go

@@ -11,13 +11,6 @@ import (
 )
 
 func (am AppModule) EndBlocker(ctx context.Context) error {
-	sk := am.keeper.GetStakingKeeper()
-
-	// Front running x/staking maturity ?
-	if err := sk.UnbondAllMatureValidators(ctx); err != nil {
-		return err
-	}
-
 	if err := am.handleBeforeJailedValidators(ctx); err != nil {
 		return err
 	}

simapp/app.go

@@ -329,7 +329,7 @@ func NewSimApp(
 		stakingtypes.NewMultiStakingHooks(
 			app.DistrKeeper.Hooks(),
 			app.SlashingKeeper.Hooks(),
-			app.POAKeeper.Hooks(),
+			app.POAKeeper.Hooks(), // must impl for jailing functionality
 		),
 	)
 
@@ -454,15 +454,15 @@ func NewSimApp(
 		distrtypes.ModuleName,
 		slashingtypes.ModuleName,
 		evidencetypes.ModuleName,
-		poa.ModuleName, // TODO: has to be first
+		poa.ModuleName, // before staking
 		stakingtypes.ModuleName,
 		genutiltypes.ModuleName,
 		authz.ModuleName,
 	)
 	app.ModuleManager.SetOrderEndBlockers(
 		crisistypes.ModuleName,
 		govtypes.ModuleName,
-		poa.ModuleName, // TODO: pretty sure this has to go first so we can remove jailed before BlockValidatorUpdates
+		poa.ModuleName, // before staking
 		stakingtypes.ModuleName,
 		genutiltypes.ModuleName,
 		feegrant.ModuleName,