fix: do not charge relayerFee for auto cross undelegate after SecondS…

…unsetFork (#379)

* fix: do not charge relayerFee for auto cross undelegate after SecondSunsetFork

* fix: FeeCalculator

x/stake/keeper/delegation.go

@@ -871,14 +871,21 @@ func (k Keeper) ValidateUnbondAmount(
 func (k Keeper) crossDistributeUndelegated(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) (sdk.Events, sdk.Error) {
 	denom := k.BondDenom(ctx)
 	amount := k.BankKeeper.GetCoins(ctx, delAddr).AmountOf(denom)
-	relayFeeCalc := fees.GetCalculator(types.CrossDistributeUndelegatedRelayFee)
+
+	var relayFeeCalc fees.FeeCalculator
+	if sdk.IsUpgrade(sdk.SecondSunsetFork) && k.IsAutoUnDelegate(ctx, delAddr, valAddr) {
+		relayFeeCalc = fees.FreeFeeCalculator()
+	} else {
+		relayFeeCalc = fees.GetCalculator(types.CrossDistributeUndelegatedRelayFee)
+	}
 	if relayFeeCalc == nil {
 		return sdk.Events{}, ErrNoFeeCalculator
 	}
 	relayFee := relayFeeCalc(nil)
 	if relayFee.Tokens.AmountOf(denom) >= amount {
 		return sdk.Events{}, ErrNotEnoughRelayerFeeForCrossPkg
 	}
+
 	bscRelayFee := bsc.ConvertBCAmountToBSCAmount(relayFee.Tokens.AmountOf(denom))
 	bscTransferAmount := new(big.Int).Sub(bsc.ConvertBCAmountToBSCAmount(amount), bscRelayFee)