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

revert: unnecessary changes in connection handshake for localhost #3161

Merged
merged 2 commits into from
Feb 20, 2023
Merged

revert: unnecessary changes in connection handshake for localhost #3161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a79756
imp: change validateHeight function name to validateConsensusHeight a…
colin-axner Feb 16, 2023
4b8c640
revert: change code back to how it is on main
colin-axner Feb 20, 2023
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
40 changes: 16 additions & 24 deletions modules/core/03-connection/keeper/handshake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,14 @@ func (k Keeper) ConnOpenTry(
// generate a new connection
connectionID := k.GenerateConnectionIdentifier(ctx)

if err := k.validateHeight(ctx, clientState.ClientType(), consensusHeight); err != nil {
colin-axner marked this conversation as resolved.
Show resolved Hide resolved
return "", err
// check that the consensus height the counterparty chain is using to store a representation
// of this chain's consensus state is at a height in the past
selfHeight := clienttypes.GetSelfHeight(ctx)
if consensusHeight.GTE(selfHeight) {
return "", sdkerrors.Wrapf(
sdkerrors.ErrInvalidHeight,
"consensus height is greater than or equal to the current block height (%s >= %s)", consensusHeight, selfHeight,
)
}

// validate client parameters of a chainB client stored on chainA
Expand Down Expand Up @@ -159,9 +165,14 @@ func (k Keeper) ConnOpenAck(
proofHeight exported.Height, // height that relayer constructed proofTry
consensusHeight exported.Height, // latest height of chainA that chainB has stored on its chainA client
) error {
// Check that chainB client hasn't stored invalid height
if err := k.validateHeight(ctx, clientState.ClientType(), consensusHeight); err != nil {
return err
// check that the consensus height the counterparty chain is using to store a representation
// of this chain's consensus state is at a height in the past
selfHeight := clienttypes.GetSelfHeight(ctx)
if consensusHeight.GTE(selfHeight) {
return sdkerrors.Wrapf(
sdkerrors.ErrInvalidHeight,
"consensus height is greater than or equal to the current block height (%s >= %s)", consensusHeight, selfHeight,
)
}

// Retrieve connection
Expand Down Expand Up @@ -287,22 +298,3 @@ func (k Keeper) ConnOpenConfirm(

return nil
}

func (k Keeper) validateHeight(
ctx sdk.Context,
clientType string,
consensusHeight exported.Height,
) error {
if clientType == exported.Localhost {
return nil
}

selfHeight := clienttypes.GetSelfHeight(ctx)
if consensusHeight.GTE(selfHeight) {
return sdkerrors.Wrapf(
sdkerrors.ErrInvalidHeight,
"consensus height is greater than or equal to the current block height (%s >= %s)", consensusHeight, selfHeight,
)
}
return nil
}