diff --git a/x/stakeibc/keeper/icqcallbacks_callibrate_delegation.go b/x/stakeibc/keeper/icqcallbacks_callibrate_delegation.go index f258a16a29..49abb32078 100644 --- a/x/stakeibc/keeper/icqcallbacks_callibrate_delegation.go +++ b/x/stakeibc/keeper/icqcallbacks_callibrate_delegation.go @@ -54,36 +54,6 @@ func CalibrateDelegationCallback(k Keeper, ctx sdk.Context, args []byte, query i return errorsmod.Wrapf(types.ErrValidatorNotFound, "no registered validator for address (%s)", queriedDelegation.ValidatorAddress) } - // Check if the ICQ overlapped a delegation, undelegation, or detokenization ICA - // that would have modfied the number of delegated tokens - prevInternalDelegation := callbackData.InitialValidatorDelegation - currInternalDelegation := validator.Delegation - icaOverlappedIcq, err := k.CheckDelegationChangedDuringQuery(ctx, validator, prevInternalDelegation, currInternalDelegation) - if err != nil { - return err - } - - // If the ICA/ICQ overlapped, submit a new query - if icaOverlappedIcq { - // Store the updated validator delegation amount - callbackDataBz, err := proto.Marshal(&types.DelegatorSharesQueryCallback{ - InitialValidatorDelegation: currInternalDelegation, - }) - if err != nil { - return errorsmod.Wrapf(err, "unable to marshal delegator shares callback data") - } - query.CallbackData = callbackDataBz - - if err := k.InterchainQueryKeeper.RetryICQRequest(ctx, query); err != nil { - return errorsmod.Wrapf(err, "unable to resubmit delegator shares query") - } - return nil - } - - // If there was no ICA/ICQ overlap, update the validator to indicate that the query - // is no longer in progress (which will unblock LSM liquid stakes to that validator) - validator.SlashQueryInProgress = false - // Calculate the number of tokens delegated (using the internal sharesToTokensRate) // note: truncateInt per https://github.com/cosmos/cosmos-sdk/blob/cb31043d35bad90c4daa923bb109f38fd092feda/x/staking/types/validator.go#L431 delegatedTokens := queriedDelegation.Shares.Mul(validator.SharesToTokensRate).TruncateInt() diff --git a/x/stakeibc/keeper/msg_server_submit_tx.go b/x/stakeibc/keeper/msg_server_submit_tx.go index e9b2f5f12a..9c0b881296 100644 --- a/x/stakeibc/keeper/msg_server_submit_tx.go +++ b/x/stakeibc/keeper/msg_server_submit_tx.go @@ -526,11 +526,6 @@ func (k Keeper) SubmitCalibrationICQ(ctx sdk.Context, hostZone types.HostZone, v return errorsmod.Wrapf(err, "unable to marshal delegator shares callback data") } - // Update the validator to indicate that the slash query is in progress - validator.SlashQueryInProgress = true - hostZone.Validators[valIndex] = &validator - k.SetHostZone(ctx, hostZone) - // Submit delegator shares ICQ query := icqtypes.Query{ ChainId: hostZone.ChainId,