Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: disable MsgEditSideChainValidator after FirstSunsetFork and refine codes #383

Merged
merged 1 commit into from
Jan 26, 2024
Merged

fix: disable MsgEditSideChainValidator after FirstSunsetFork and refine codes #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x/stake/endblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func handleRefundStake(ctx sdk.Context, sideChainPrefix []byte, k keeper.Keeper)
}, k)
refundEvents = refundEvents.AppendEvents(result.Events)
if !result.IsOK() {
ctx.Logger().Debug("handleRefundStake failed",
ctx.Logger().Info("handleRefundStake failed",
"delegator", delegation.DelegatorAddr.String(),
"validator", delegation.ValidatorAddr.String(),
"amount", delegation.GetShares().String(),
Expand Down
3 changes: 3 additions & 0 deletions x/stake/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ func NewHandler(k keeper.Keeper, govKeeper gov.Keeper) sdk.Handler {
}
return handleMsgCreateSideChainValidator(ctx, msg, k)
case types.MsgEditSideChainValidator:
if sdk.IsUpgrade(sdk.FirstSunsetFork) {
return sdk.ErrMsgNotSupported("").Result()
}
return handleMsgEditSideChainValidator(ctx, msg, k)
case types.MsgCreateSideChainValidatorWithVoteAddr:
if sdk.IsUpgrade(sdk.FirstSunsetFork) {
Expand Down
5 changes: 3 additions & 2 deletions x/stake/keeper/delegation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,8 @@ func (k Keeper) crossDistributeUndelegated(ctx sdk.Context, delAddr sdk.AccAddre
amount := k.BankKeeper.GetCoins(ctx, delAddr).AmountOf(denom)

var relayFeeCalc fees.FeeCalculator
if sdk.IsUpgrade(sdk.SecondSunsetFork) && k.IsAutoUnDelegate(ctx, delAddr, valAddr) {
isAutoUnDelegate := k.IsAutoUnDelegate(ctx, delAddr, valAddr)
if sdk.IsUpgrade(sdk.SecondSunsetFork) && isAutoUnDelegate {
relayFeeCalc = fees.FreeFeeCalculator()
} else {
relayFeeCalc = fees.GetCalculator(types.CrossDistributeUndelegatedRelayFee)
Expand Down Expand Up @@ -910,7 +911,7 @@ func (k Keeper) crossDistributeUndelegated(ctx sdk.Context, delAddr sdk.AccAddre
Amount: bscTransferAmount,
Recipient: recipient,
Validator: valAddr,
IsAutoUnDelegate: k.IsAutoUnDelegate(ctx, delAddr, valAddr),
IsAutoUnDelegate: isAutoUnDelegate,
}
}

Expand Down
Loading