fix(x/slashing/keeper): hoist non-changing addresses parsing out of redelegation loop (#18035)
This commit is contained in:
+11
-10
@@ -287,6 +287,16 @@ func (k Keeper) SlashRedelegation(ctx context.Context, srcValidator types.Valida
|
||||
totalSlashAmount = math.ZeroInt()
|
||||
bondedBurnedAmount, notBondedBurnedAmount := math.ZeroInt(), math.ZeroInt()
|
||||
|
||||
valDstAddr, err := k.validatorAddressCodec.StringToBytes(redelegation.ValidatorDstAddress)
|
||||
if err != nil {
|
||||
return math.ZeroInt(), fmt.Errorf("SlashRedelegation: could not parse validator destination address: %w", err)
|
||||
}
|
||||
|
||||
delegatorAddress, err := k.authKeeper.AddressCodec().StringToBytes(redelegation.DelegatorAddress)
|
||||
if err != nil {
|
||||
return math.ZeroInt(), fmt.Errorf("SlashRedelegation: could not parse delegator address: %w", err)
|
||||
}
|
||||
|
||||
// perform slashing on all entries within the redelegation
|
||||
for _, entry := range redelegation.Entries {
|
||||
// If redelegation started before this height, stake didn't contribute to infraction
|
||||
@@ -310,16 +320,7 @@ func (k Keeper) SlashRedelegation(ctx context.Context, srcValidator types.Valida
|
||||
continue
|
||||
}
|
||||
|
||||
valDstAddr, err := k.validatorAddressCodec.StringToBytes(redelegation.ValidatorDstAddress)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
delegatorAddress, err := k.authKeeper.AddressCodec().StringToBytes(redelegation.DelegatorAddress)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
// Delegations can be dynamic hence need to be looked up on every redelegation entry loop.
|
||||
delegation, err := k.Delegations.Get(ctx, collections.Join(sdk.AccAddress(delegatorAddress), sdk.ValAddress(valDstAddr)))
|
||||
if err != nil {
|
||||
// If deleted, delegation has zero shares, and we can't unbond any more
|
||||
|
||||
Reference in New Issue
Block a user