fix: validator.Jailed continue instead of panic

rollchains · Apr 22, 2024 · 0898425 · 0898425
1 parent bb9f451
commit 0898425
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.gitpatches/staking_poa-skip-jailed-validators.patch b/.gitpatches/staking_poa-skip-jailed-validators.patch
@@ -0,0 +1,15 @@
+diff --git a/x/staking/keeper/val_state_change.go b/x/staking/keeper/val_state_change.go
+index 444633983c..cb5d01f7eb 100644
+--- a/x/staking/keeper/val_state_change.go
++++ b/x/staking/keeper/val_state_change.go
+@@ -159,7 +159,9 @@ func (k Keeper) ApplyAndReturnValidatorSetUpdates(ctx context.Context) (updates
+ 		validator := k.mustGetValidator(ctx, valAddr)
+
+ 		if validator.Jailed {
+-			panic("should never retrieve a jailed validator from the power store")
++			// https://github.com/cosmos/cosmos-sdk/pull/20059
++			// panic("should never retrieve a jailed validator from the power store")
++			continue
+ 		}
+
+ 		// if we get to a zero-power validator (which we don't bond),
diff --git a/x/staking/keeper/val_state_change.go b/x/staking/keeper/val_state_change.go
@@ -159,7 +159,9 @@ func (k Keeper) ApplyAndReturnValidatorSetUpdates(ctx context.Context) (updates
 		validator := k.mustGetValidator(ctx, valAddr)
 
 		if validator.Jailed {
-			panic("should never retrieve a jailed validator from the power store")
+			// https://github.com/cosmos/cosmos-sdk/pull/20059
+			// panic("should never retrieve a jailed validator from the power store")
+			continue
 		}
 
 		// if we get to a zero-power validator (which we don't bond),