From 2d336d256d699fca5fe917bb1745d8d550f9da8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20Axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:09:02 +0200
Subject: [PATCH 1/4] refactor: remove client/consensus state validation from
 connection handshake

---
 .../core/03-connection/keeper/handshake.go    |  82 +--------
 .../03-connection/keeper/handshake_test.go    | 157 +-----------------
 modules/core/03-connection/types/msgs.go      |  42 +----
 modules/core/03-connection/types/msgs_test.go |  33 ----
 testing/solomachine.go                        |   7 +-
 5 files changed, 12 insertions(+), 309 deletions(-)

diff --git a/modules/core/03-connection/keeper/handshake.go b/modules/core/03-connection/keeper/handshake.go
index 95e9947ae31..f6acaaca3c6 100644
--- a/modules/core/03-connection/keeper/handshake.go
+++ b/modules/core/03-connection/keeper/handshake.go
@@ -9,7 +9,6 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	"github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types"
-	ibcerrors "github.com/cosmos/ibc-go/v8/modules/core/errors"
 	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
@@ -72,37 +71,17 @@ func (k Keeper) ConnOpenTry(
 	counterparty types.Counterparty, // counterpartyConnectionIdentifier, counterpartyPrefix and counterpartyClientIdentifier
 	delayPeriod uint64,
 	clientID string, // clientID of chainA
-	clientState exported.ClientState, // clientState that chainA has for chainB
+	_ exported.ClientState, // clientState that chainA has for chainB
 	counterpartyVersions []*types.Version, // supported versions of chain A
 	initProof []byte, // proof that chainA stored connectionEnd in state (on ConnOpenInit)
-	clientProof []byte, // proof that chainA stored a light client of chainB
-	consensusProof []byte, // proof that chainA stored chainB's consensus state at consensus height
+	_ []byte, // proof that chainA stored a light client of chainB
+	_ []byte, // proof that chainA stored chainB's consensus state at consensus height
 	proofHeight exported.Height, // height at which relayer constructs proof of A storing connectionEnd in state
-	consensusHeight exported.Height, // latest height of chain B which chain A has stored in its chain B client
+	_ exported.Height, // latest height of chain B which chain A has stored in its chain B client
 ) (string, error) {
 	// generate a new connection
 	connectionID := k.GenerateConnectionIdentifier(ctx)
 
-	// 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 "", errorsmod.Wrapf(
-			ibcerrors.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
-	if err := k.consensusHost.ValidateSelfClient(ctx, clientState); err != nil {
-		return "", err
-	}
-
-	expectedConsensusState, err := k.consensusHost.GetSelfConsensusState(ctx, consensusHeight)
-	if err != nil {
-		return "", errorsmod.Wrapf(err, "self consensus state not found for height %s", consensusHeight.String())
-	}
-
 	// expectedConnection defines Chain A's ConnectionEnd
 	// NOTE: chain A's counterparty is chain B (i.e where this code is executed)
 	// NOTE: chainA and chainB must have the same delay period
@@ -129,18 +108,6 @@ func (k Keeper) ConnOpenTry(
 		return "", err
 	}
 
-	// Check that ChainA stored the clientState provided in the msg
-	if err := k.VerifyClientState(ctx, connection, proofHeight, clientProof, clientState); err != nil {
-		return "", err
-	}
-
-	// Check that ChainA stored the correct ConsensusState of chainB at the given consensusHeight
-	if err := k.VerifyClientConsensusState(
-		ctx, connection, proofHeight, consensusHeight, consensusProof, expectedConsensusState,
-	); err != nil {
-		return "", err
-	}
-
 	// store connection in chainB state
 	if err := k.addConnectionToClient(ctx, clientID, connectionID); err != nil {
 		return "", errorsmod.Wrapf(err, "failed to add connection with ID %s to client with ID %s", connectionID, clientID)
@@ -163,25 +130,15 @@ func (k Keeper) ConnOpenTry(
 func (k Keeper) ConnOpenAck(
 	ctx sdk.Context,
 	connectionID string,
-	clientState exported.ClientState, // client state for chainA on chainB
+	_ exported.ClientState, // client state for chainA on chainB
 	version *types.Version, // version that ChainB chose in ConnOpenTry
 	counterpartyConnectionID string,
 	tryProof []byte, // proof that connectionEnd was added to ChainB state in ConnOpenTry
-	clientProof []byte, // proof of client state on chainB for chainA
-	consensusProof []byte, // proof that chainB has stored ConsensusState of chainA on its client
+	_ []byte, // proof of client state on chainB for chainA
+	_ []byte, // proof that chainB has stored ConsensusState of chainA on its client
 	proofHeight exported.Height, // height that relayer constructed proofTry
-	consensusHeight exported.Height, // latest height of chainA that chainB has stored on its chainA client
+	_ exported.Height, // latest height of chainA that chainB has stored on its chainA client
 ) error {
-	// 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 errorsmod.Wrapf(
-			ibcerrors.ErrInvalidHeight,
-			"consensus height is greater than or equal to the current block height (%s >= %s)", consensusHeight, selfHeight,
-		)
-	}
-
 	// Retrieve connection
 	connection, found := k.GetConnection(ctx, connectionID)
 	if !found {
@@ -204,17 +161,6 @@ func (k Keeper) ConnOpenAck(
 		)
 	}
 
-	// validate client parameters of a chainA client stored on chainB
-	if err := k.consensusHost.ValidateSelfClient(ctx, clientState); err != nil {
-		return err
-	}
-
-	// Retrieve chainA's consensus state at consensusheight
-	expectedConsensusState, err := k.consensusHost.GetSelfConsensusState(ctx, consensusHeight)
-	if err != nil {
-		return errorsmod.Wrapf(err, "self consensus state not found for height %s", consensusHeight.String())
-	}
-
 	prefix := k.GetCommitmentPrefix()
 	expectedCounterparty := types.NewCounterparty(connection.ClientId, connectionID, commitmenttypes.NewMerklePrefix(prefix.Bytes()))
 	expectedConnection := types.NewConnectionEnd(types.TRYOPEN, connection.Counterparty.ClientId, expectedCounterparty, []*types.Version{version}, connection.DelayPeriod)
@@ -227,18 +173,6 @@ func (k Keeper) ConnOpenAck(
 		return err
 	}
 
-	// Check that ChainB stored the clientState provided in the msg
-	if err := k.VerifyClientState(ctx, connection, proofHeight, clientProof, clientState); err != nil {
-		return err
-	}
-
-	// Ensure that ChainB has stored the correct ConsensusState for chainA at the consensusHeight
-	if err := k.VerifyClientConsensusState(
-		ctx, connection, proofHeight, consensusHeight, consensusProof, expectedConsensusState,
-	); err != nil {
-		return err
-	}
-
 	k.Logger(ctx).Info("connection state updated", "connection-id", connectionID, "previous-state", types.INIT.String(), "new-state", types.OPEN.String())
 
 	defer telemetry.IncrCounter(1, "ibc", "connection", "open-ack")
diff --git a/modules/core/03-connection/keeper/handshake_test.go b/modules/core/03-connection/keeper/handshake_test.go
index dba6f03e448..4d3d5675796 100644
--- a/modules/core/03-connection/keeper/handshake_test.go
+++ b/modules/core/03-connection/keeper/handshake_test.go
@@ -3,15 +3,11 @@ package keeper_test
 import (
 	"time"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	"github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
 	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
 	"github.com/cosmos/ibc-go/v8/modules/core/exported"
-	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 	ibctesting "github.com/cosmos/ibc-go/v8/testing"
-	"github.com/cosmos/ibc-go/v8/testing/mock"
 )
 
 // TestConnOpenInit - chainA initializes (INIT state) a connection with
@@ -135,38 +131,6 @@ func (suite *KeeperTestSuite) TestConnOpenTry() {
 			// retrieve client state of chainA to pass as counterpartyClient
 			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
 		}, true},
-		{"invalid counterparty client", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainB to pass as counterpartyClient
-			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
-
-			// Set an invalid client of chainA on chainB
-			tmClient, ok := counterpartyClient.(*ibctm.ClientState)
-			suite.Require().True(ok)
-			tmClient.ChainId = "wrongchainid"
-
-			suite.chainA.App.GetIBCKeeper().ClientKeeper.SetClientState(suite.chainA.GetContext(), path.EndpointA.ClientID, tmClient)
-		}, false},
-		{"consensus height >= latest height", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainA to pass as counterpartyClient
-			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
-
-			consensusHeight = clienttypes.GetSelfHeight(suite.chainB.GetContext())
-		}, false},
-		{"self consensus state not found", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainA to pass as counterpartyClient
-			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
-
-			consensusHeight = clienttypes.NewHeight(0, 1)
-		}, false},
 		{"counterparty versions is empty", func() {
 			err := path.EndpointA.ConnOpenInit()
 			suite.Require().NoError(err)
@@ -192,50 +156,6 @@ func (suite *KeeperTestSuite) TestConnOpenTry() {
 			// retrieve client state of chainA to pass as counterpartyClient
 			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
 		}, false},
-		{"client state verification failed", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainA to pass as counterpartyClient
-			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
-
-			// modify counterparty client without setting in store so it still passes validate but fails proof verification
-			tmClient, ok := counterpartyClient.(*ibctm.ClientState)
-			suite.Require().True(ok)
-			tmClient.LatestHeight = tmClient.LatestHeight.Increment().(clienttypes.Height)
-		}, false},
-		{"consensus state verification failed", func() {
-			// retrieve client state of chainA to pass as counterpartyClient
-			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
-
-			// give chainA wrong consensus state for chainB
-			consState, found := suite.chainA.App.GetIBCKeeper().ClientKeeper.GetLatestClientConsensusState(suite.chainA.GetContext(), path.EndpointA.ClientID)
-			suite.Require().True(found)
-
-			tmConsState, ok := consState.(*ibctm.ConsensusState)
-			suite.Require().True(ok)
-
-			tmConsState.Timestamp = time.Now()
-			suite.chainA.App.GetIBCKeeper().ClientKeeper.SetClientConsensusState(suite.chainA.GetContext(), path.EndpointA.ClientID, counterpartyClient.GetLatestHeight(), tmConsState)
-
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-		}, false},
-		{"override self consensus host", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainA to pass as counterpartyClient
-			counterpartyClient = suite.chainA.GetClientState(path.EndpointA.ClientID)
-
-			mockValidator := mock.ConsensusHost{
-				ValidateSelfClientFn: func(ctx sdk.Context, clientState exported.ClientState) error {
-					return mock.MockApplicationCallbackError
-				},
-			}
-
-			suite.chainB.App.GetIBCKeeper().SetConsensusHost(&mockValidator)
-		}, false},
 	}
 
 	for _, tc := range testCases {
@@ -313,35 +233,6 @@ func (suite *KeeperTestSuite) TestConnOpenAck() {
 			// retrieve client state of chainB to pass as counterpartyClient
 			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
 		}, true},
-		{"invalid counterparty client", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			err = path.EndpointB.ConnOpenTry()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainB to pass as counterpartyClient
-			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
-
-			// Set an invalid client of chainA on chainB
-			tmClient, ok := counterpartyClient.(*ibctm.ClientState)
-			suite.Require().True(ok)
-			tmClient.ChainId = "wrongchainid"
-
-			suite.chainB.App.GetIBCKeeper().ClientKeeper.SetClientState(suite.chainB.GetContext(), path.EndpointB.ClientID, tmClient)
-		}, false},
-		{"consensus height >= latest height", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainB to pass as counterpartyClient
-			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
-
-			err = path.EndpointB.ConnOpenTry()
-			suite.Require().NoError(err)
-
-			consensusHeight = clienttypes.GetSelfHeight(suite.chainA.GetContext())
-		}, false},
 		{"connection not found", func() {
 			// connections are never created
 
@@ -363,6 +254,7 @@ func (suite *KeeperTestSuite) TestConnOpenAck() {
 			suite.Require().True(found)
 
 			connection.Counterparty.ConnectionId = "badconnectionid"
+			path.EndpointB.ConnectionID = "badconnectionid"
 
 			suite.chainA.App.GetIBCKeeper().ConnectionKeeper.SetConnection(suite.chainA.GetContext(), path.EndpointA.ConnectionID, connection)
 
@@ -436,18 +328,6 @@ func (suite *KeeperTestSuite) TestConnOpenAck() {
 
 			version = types.NewVersion(types.DefaultIBCVersionIdentifier, []string{"ORDER_ORDERED", "ORDER_UNORDERED", "ORDER_DAG"})
 		}, false},
-		{"self consensus state not found", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainB to pass as counterpartyClient
-			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
-
-			err = path.EndpointB.ConnOpenTry()
-			suite.Require().NoError(err)
-
-			consensusHeight = clienttypes.NewHeight(0, 1)
-		}, false},
 		{"connection state verification failed", func() {
 			// chainB connection is not in INIT
 			err := path.EndpointA.ConnOpenInit()
@@ -456,41 +336,6 @@ func (suite *KeeperTestSuite) TestConnOpenAck() {
 			// retrieve client state of chainB to pass as counterpartyClient
 			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
 		}, false},
-		{"client state verification failed", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainB to pass as counterpartyClient
-			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
-
-			// modify counterparty client without setting in store so it still passes validate but fails proof verification
-			tmClient, ok := counterpartyClient.(*ibctm.ClientState)
-			suite.Require().True(ok)
-			tmClient.LatestHeight = tmClient.LatestHeight.Increment().(clienttypes.Height)
-
-			err = path.EndpointB.ConnOpenTry()
-			suite.Require().NoError(err)
-		}, false},
-		{"consensus state verification failed", func() {
-			err := path.EndpointA.ConnOpenInit()
-			suite.Require().NoError(err)
-
-			// retrieve client state of chainB to pass as counterpartyClient
-			counterpartyClient = suite.chainB.GetClientState(path.EndpointB.ClientID)
-
-			// give chainB wrong consensus state for chainA
-			consState, found := suite.chainB.App.GetIBCKeeper().ClientKeeper.GetLatestClientConsensusState(suite.chainB.GetContext(), path.EndpointB.ClientID)
-			suite.Require().True(found)
-
-			tmConsState, ok := consState.(*ibctm.ConsensusState)
-			suite.Require().True(ok)
-
-			tmConsState.Timestamp = tmConsState.Timestamp.Add(time.Second)
-			suite.chainB.App.GetIBCKeeper().ClientKeeper.SetClientConsensusState(suite.chainB.GetContext(), path.EndpointB.ClientID, counterpartyClient.GetLatestHeight(), tmConsState)
-
-			err = path.EndpointB.ConnOpenTry()
-			suite.Require().NoError(err)
-		}, false},
 	}
 
 	for _, tc := range testCases {
diff --git a/modules/core/03-connection/types/msgs.go b/modules/core/03-connection/types/msgs.go
index 9d8db1fb548..9f8d9c67dd7 100644
--- a/modules/core/03-connection/types/msgs.go
+++ b/modules/core/03-connection/types/msgs.go
@@ -125,16 +125,6 @@ func (msg MsgConnectionOpenTry) ValidateBasic() error {
 	if err := host.ConnectionIdentifierValidator(msg.Counterparty.ConnectionId); err != nil {
 		return errorsmod.Wrap(err, "invalid counterparty connection ID")
 	}
-	if msg.ClientState == nil {
-		return errorsmod.Wrap(clienttypes.ErrInvalidClient, "counterparty client is nil")
-	}
-	clientState, err := clienttypes.UnpackClientState(msg.ClientState)
-	if err != nil {
-		return errorsmod.Wrapf(clienttypes.ErrInvalidClient, "unpack err: %v", err)
-	}
-	if err := clientState.Validate(); err != nil {
-		return errorsmod.Wrap(err, "counterparty client is invalid")
-	}
 	if len(msg.CounterpartyVersions) == 0 {
 		return errorsmod.Wrap(ibcerrors.ErrInvalidVersion, "empty counterparty versions")
 	}
@@ -146,16 +136,7 @@ func (msg MsgConnectionOpenTry) ValidateBasic() error {
 	if len(msg.ProofInit) == 0 {
 		return errorsmod.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof init")
 	}
-	if len(msg.ProofClient) == 0 {
-		return errorsmod.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit empty proof client")
-	}
-	if len(msg.ProofConsensus) == 0 {
-		return errorsmod.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof of consensus state")
-	}
-	if msg.ConsensusHeight.IsZero() {
-		return errorsmod.Wrap(ibcerrors.ErrInvalidHeight, "consensus height must be non-zero")
-	}
-	_, err = sdk.AccAddressFromBech32(msg.Signer)
+	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err)
 	}
@@ -215,29 +196,10 @@ func (msg MsgConnectionOpenAck) ValidateBasic() error {
 	if err := ValidateVersion(msg.Version); err != nil {
 		return err
 	}
-	if msg.ClientState == nil {
-		return errorsmod.Wrap(clienttypes.ErrInvalidClient, "counterparty client is nil")
-	}
-	clientState, err := clienttypes.UnpackClientState(msg.ClientState)
-	if err != nil {
-		return errorsmod.Wrapf(clienttypes.ErrInvalidClient, "unpack err: %v", err)
-	}
-	if err := clientState.Validate(); err != nil {
-		return errorsmod.Wrap(err, "counterparty client is invalid")
-	}
 	if len(msg.ProofTry) == 0 {
 		return errorsmod.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof try")
 	}
-	if len(msg.ProofClient) == 0 {
-		return errorsmod.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit empty proof client")
-	}
-	if len(msg.ProofConsensus) == 0 {
-		return errorsmod.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof of consensus state")
-	}
-	if msg.ConsensusHeight.IsZero() {
-		return errorsmod.Wrap(ibcerrors.ErrInvalidHeight, "consensus height must be non-zero")
-	}
-	_, err = sdk.AccAddressFromBech32(msg.Signer)
+	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err)
 	}
diff --git a/modules/core/03-connection/types/msgs_test.go b/modules/core/03-connection/types/msgs_test.go
index ba26c117c0e..1ea67f33db6 100644
--- a/modules/core/03-connection/types/msgs_test.go
+++ b/modules/core/03-connection/types/msgs_test.go
@@ -3,7 +3,6 @@ package types_test
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/stretchr/testify/require"
@@ -124,18 +123,8 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenTry() {
 	protoAny, err := clienttypes.PackClientState(clientState)
 	suite.Require().NoError(err)
 
-	// Pack consensus state into any to test unpacking error
-	consState := ibctm.NewConsensusState(
-		time.Now(), commitmenttypes.NewMerkleRoot([]byte("root")), []byte("nextValsHash"),
-	)
-	invalidAny := clienttypes.MustPackConsensusState(consState)
 	counterparty := types.NewCounterparty("connectiontotest", "clienttotest", prefix)
 
-	// invalidClientState fails validateBasic
-	invalidClient := ibctm.NewClientState(
-		chainID, ibctm.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath,
-	)
-
 	testCases := []struct {
 		name    string
 		msg     *types.MsgConnectionOpenTry
@@ -146,15 +135,9 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenTry() {
 		{"invalid client ID", types.NewMsgConnectionOpenTry("test/iris", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
 		{"invalid counterparty connection ID", types.NewMsgConnectionOpenTry("clienttotesta", "ibc/test", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
 		{"invalid counterparty client ID", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "test/conn1", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
-		{"invalid nil counterparty client", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", nil, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
-		{"invalid client unpacking", &types.MsgConnectionOpenTry{"", "clienttotesta", invalidAny, counterparty, 500, []*types.Version{ibctesting.ConnectionVersion}, clientHeight, suite.proof, suite.proof, suite.proof, clientHeight, signer, nil}, false},
-		{"counterparty failed validate", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", invalidClient, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
 		{"empty counterparty prefix", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, emptyPrefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
 		{"empty counterpartyVersions", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
 		{"empty proofInit", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, emptyProof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
-		{"empty proofClient", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, emptyProof, suite.proof, clientHeight, clientHeight, signer), false},
-		{"empty proofConsensus", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, emptyProof, clientHeight, clientHeight, signer), false},
-		{"invalid consensusHeight", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clienttypes.ZeroHeight(), signer), false},
 		{"empty singer", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ""), false},
 		{"success", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{ibctesting.ConnectionVersion}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), true},
 		{"invalid version", types.NewMsgConnectionOpenTry("clienttotesta", "connectiontotest", "clienttotest", clientState, prefix, []*types.Version{{}}, 500, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, signer), false},
@@ -177,16 +160,6 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenAck() {
 		chainID, ibctm.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath,
 	)
 
-	// Pack consensus state into any to test unpacking error
-	consState := ibctm.NewConsensusState(
-		time.Now(), commitmenttypes.NewMerkleRoot([]byte("root")), []byte("nextValsHash"),
-	)
-	invalidAny := clienttypes.MustPackConsensusState(consState)
-
-	// invalidClientState fails validateBasic
-	invalidClient := ibctm.NewClientState(
-		chainID, ibctm.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath,
-	)
 	connectionID := "connection-0"
 
 	testCases := []struct {
@@ -196,13 +169,7 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenAck() {
 	}{
 		{"invalid connection ID", types.NewMsgConnectionOpenAck("test/conn1", connectionID, clientState, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
 		{"invalid counterparty connection ID", types.NewMsgConnectionOpenAck(connectionID, "test/conn1", clientState, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
-		{"invalid nil counterparty client", types.NewMsgConnectionOpenAck(connectionID, connectionID, nil, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
-		{"invalid unpacking counterparty client", &types.MsgConnectionOpenAck{connectionID, connectionID, ibctesting.ConnectionVersion, invalidAny, clientHeight, suite.proof, suite.proof, suite.proof, clientHeight, signer, nil}, false},
-		{"counterparty client failed validate", types.NewMsgConnectionOpenAck(connectionID, connectionID, invalidClient, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
 		{"empty proofTry", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, emptyProof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
-		{"empty proofClient", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, suite.proof, emptyProof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
-		{"empty proofConsensus", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, suite.proof, suite.proof, emptyProof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), false},
-		{"invalid consensusHeight", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, suite.proof, suite.proof, suite.proof, clientHeight, clienttypes.ZeroHeight(), ibctesting.ConnectionVersion, signer), false},
 		{"invalid version", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, &types.Version{}, signer), false},
 		{"empty signer", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, ""), false},
 		{"success", types.NewMsgConnectionOpenAck(connectionID, connectionID, clientState, suite.proof, suite.proof, suite.proof, clientHeight, clientHeight, ibctesting.ConnectionVersion, signer), true},
diff --git a/testing/solomachine.go b/testing/solomachine.go
index 72b05f7c407..b64c12df026 100644
--- a/testing/solomachine.go
+++ b/testing/solomachine.go
@@ -289,15 +289,10 @@ func (solo *Solomachine) ConnOpenAck(chain *TestChain, clientID, connectionID st
 	tryProof := solo.GenerateConnOpenTryProof(clientID, connectionID)
 
 	clientState := ibctm.NewClientState(chain.ChainID, DefaultTrustLevel, TrustingPeriod, UnbondingPeriod, MaxClockDrift, chain.LastHeader.GetHeight().(clienttypes.Height), commitmenttypes.GetSDKSpecs(), UpgradePath)
-	clientProof := solo.GenerateClientStateProof(clientState)
-
-	consensusState := chain.LastHeader.ConsensusState()
-	consensusHeight := chain.LastHeader.GetHeight()
-	consensusProof := solo.GenerateConsensusStateProof(consensusState, consensusHeight)
 
 	msgConnOpenAck := connectiontypes.NewMsgConnectionOpenAck(
 		connectionID, connectionIDSolomachine, clientState,
-		tryProof, clientProof, consensusProof,
+		tryProof, nil, nil,
 		clienttypes.ZeroHeight(), clientState.GetLatestHeight().(clienttypes.Height),
 		ConnectionVersion,
 		chain.SenderAccount.GetAddress().String(),

From 45751f96ed1a55b259ebab3a29bb67b21300b71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20Axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:31:46 +0200
Subject: [PATCH 2/4] chore: generate proto deprecation notice

---
 go.mod                                    |  12 +-
 modules/core/03-connection/types/tx.pb.go | 139 +++++++++++-----------
 proto/ibc/core/connection/v1/tx.proto     |  22 ++--
 3 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/go.mod b/go.mod
index 19cf654cd2d..f982ef3b52d 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@ go 1.21
 module github.com/cosmos/ibc-go/v8
 
 retract (
-		// contain bug in channel upgradability that can result 
-		// in a channel upgrade succeeding but with channel ends
-		// in incompatible state
-    [v8.2.0, v8.3.2]
-		// contain ASA-2024-007 vulnerability
-    [v8.0.0, v8.1.1]
+	// contain bug in channel upgradability that can result
+	// in a channel upgrade succeeding but with channel ends
+	// in incompatible state
+	[v8.2.0, v8.3.2]
+	// contain ASA-2024-007 vulnerability
+	[v8.0.0, v8.1.1]
 )
 
 require (
diff --git a/modules/core/03-connection/types/tx.pb.go b/modules/core/03-connection/types/tx.pb.go
index afe87287690..6abfa21d06d 100644
--- a/modules/core/03-connection/types/tx.pb.go
+++ b/modules/core/03-connection/types/tx.pb.go
@@ -118,7 +118,7 @@ type MsgConnectionOpenTry struct {
 	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC.
 	PreviousConnectionId string        `protobuf:"bytes,2,opt,name=previous_connection_id,json=previousConnectionId,proto3" json:"previous_connection_id,omitempty"` // Deprecated: Do not use.
-	ClientState          *types.Any    `protobuf:"bytes,3,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
+	ClientState          *types.Any    `protobuf:"bytes,3,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`                              // Deprecated: Do not use.
 	Counterparty         Counterparty  `protobuf:"bytes,4,opt,name=counterparty,proto3" json:"counterparty"`
 	DelayPeriod          uint64        `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"`
 	CounterpartyVersions []*Version    `protobuf:"bytes,6,rep,name=counterparty_versions,json=counterpartyVersions,proto3" json:"counterparty_versions,omitempty"`
@@ -127,13 +127,13 @@ type MsgConnectionOpenTry struct {
 	// INIT`
 	ProofInit []byte `protobuf:"bytes,8,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"`
 	// proof of client state included in message
-	ProofClient []byte `protobuf:"bytes,9,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"`
+	ProofClient []byte `protobuf:"bytes,9,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"` // Deprecated: Do not use.
 	// proof of client consensus state
-	ProofConsensus  []byte        `protobuf:"bytes,10,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"`
-	ConsensusHeight types1.Height `protobuf:"bytes,11,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"`
+	ProofConsensus  []byte        `protobuf:"bytes,10,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"` // Deprecated: Do not use.
+	ConsensusHeight types1.Height `protobuf:"bytes,11,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"`        // Deprecated: Do not use.
 	Signer          string        `protobuf:"bytes,12,opt,name=signer,proto3" json:"signer,omitempty"`
 	// optional proof data for host state machines that are unable to introspect their own consensus state
-	HostConsensusStateProof []byte `protobuf:"bytes,13,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"`
+	HostConsensusStateProof []byte `protobuf:"bytes,13,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"` // Deprecated: Do not use.
 }
 
 func (m *MsgConnectionOpenTry) Reset()         { *m = MsgConnectionOpenTry{} }
@@ -212,19 +212,19 @@ type MsgConnectionOpenAck struct {
 	ConnectionId             string        `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 	CounterpartyConnectionId string        `protobuf:"bytes,2,opt,name=counterparty_connection_id,json=counterpartyConnectionId,proto3" json:"counterparty_connection_id,omitempty"`
 	Version                  *Version      `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
-	ClientState              *types.Any    `protobuf:"bytes,4,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
+	ClientState              *types.Any    `protobuf:"bytes,4,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` // Deprecated: Do not use.
 	ProofHeight              types1.Height `protobuf:"bytes,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	// proof of the initialization the connection on Chain B: `UNITIALIZED ->
 	// TRYOPEN`
 	ProofTry []byte `protobuf:"bytes,6,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty"`
 	// proof of client state included in message
-	ProofClient []byte `protobuf:"bytes,7,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"`
+	ProofClient []byte `protobuf:"bytes,7,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"` // Deprecated: Do not use.
 	// proof of client consensus state
-	ProofConsensus  []byte        `protobuf:"bytes,8,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"`
-	ConsensusHeight types1.Height `protobuf:"bytes,9,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"`
+	ProofConsensus  []byte        `protobuf:"bytes,8,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"` // Deprecated: Do not use.
+	ConsensusHeight types1.Height `protobuf:"bytes,9,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"`        // Deprecated: Do not use.
 	Signer          string        `protobuf:"bytes,10,opt,name=signer,proto3" json:"signer,omitempty"`
 	// optional proof data for host state machines that are unable to introspect their own consensus state
-	HostConsensusStateProof []byte `protobuf:"bytes,11,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"`
+	HostConsensusStateProof []byte `protobuf:"bytes,11,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"` // Deprecated: Do not use.
 }
 
 func (m *MsgConnectionOpenAck) Reset()         { *m = MsgConnectionOpenAck{} }
@@ -474,65 +474,66 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/connection/v1/tx.proto", fileDescriptor_5d00fde5fc97399e) }
 
 var fileDescriptor_5d00fde5fc97399e = []byte{
-	// 927 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x41, 0x6f, 0xe3, 0x44,
-	0x14, 0xc7, 0xe3, 0xd6, 0x49, 0x9b, 0x97, 0x2c, 0x85, 0x51, 0xda, 0x7a, 0xbd, 0xac, 0x93, 0x2d,
-	0x48, 0xad, 0x56, 0xd4, 0xde, 0xee, 0x82, 0x28, 0xd0, 0x4b, 0x9b, 0x0b, 0x15, 0x2a, 0xac, 0x4c,
-	0xd9, 0x03, 0x97, 0x28, 0x71, 0xa6, 0xee, 0xa8, 0x8d, 0xc7, 0xf2, 0x38, 0x61, 0xcd, 0x09, 0xc1,
-	0x05, 0x89, 0x0b, 0x1f, 0x81, 0x8f, 0xb0, 0x1f, 0x63, 0xc5, 0x01, 0xad, 0x38, 0x71, 0x42, 0xa8,
-	0x3d, 0xec, 0x17, 0xe0, 0x03, 0x20, 0xcf, 0x8c, 0x1d, 0x27, 0x71, 0x2a, 0x67, 0xcb, 0x2d, 0x79,
-	0xfe, 0xbf, 0x37, 0xff, 0x79, 0xef, 0x37, 0xf6, 0x40, 0x93, 0xf4, 0x1c, 0xcb, 0xa1, 0x01, 0xb6,
-	0x1c, 0xea, 0x79, 0xd8, 0x09, 0x09, 0xf5, 0xac, 0xd1, 0x9e, 0x15, 0x3e, 0x37, 0xfd, 0x80, 0x86,
-	0x14, 0x6d, 0x90, 0x9e, 0x63, 0xc6, 0x02, 0x73, 0x2c, 0x30, 0x47, 0x7b, 0x7a, 0xc3, 0xa5, 0x2e,
-	0xe5, 0x12, 0x2b, 0xfe, 0x25, 0xd4, 0xfa, 0xa6, 0x43, 0xd9, 0x80, 0x32, 0x6b, 0xc0, 0xdc, 0xb8,
-	0xca, 0x80, 0xb9, 0xf2, 0xc1, 0x5d, 0x97, 0x52, 0xf7, 0x12, 0x5b, 0xfc, 0x5f, 0x6f, 0x78, 0x66,
-	0x75, 0xbd, 0x48, 0x3e, 0xca, 0x58, 0xb8, 0x24, 0xd8, 0x0b, 0xe3, 0x44, 0xf1, 0x4b, 0x0a, 0xb6,
-	0xe7, 0x78, 0xcc, 0x18, 0xe2, 0xc2, 0xad, 0x5f, 0x96, 0x60, 0xfd, 0x84, 0xb9, 0xed, 0x34, 0xfe,
-	0x95, 0x8f, 0xbd, 0x63, 0x8f, 0x84, 0xe8, 0x1e, 0x54, 0x45, 0xc9, 0x0e, 0xe9, 0x6b, 0x4a, 0x4b,
-	0xd9, 0xa9, 0xda, 0xab, 0x22, 0x70, 0xdc, 0x47, 0x5f, 0x42, 0xdd, 0xa1, 0x43, 0x2f, 0xc4, 0x81,
-	0xdf, 0x0d, 0xc2, 0x48, 0x5b, 0x6a, 0x29, 0x3b, 0xb5, 0xc7, 0xef, 0x9b, 0xf9, 0x3b, 0x37, 0xdb,
-	0x19, 0xed, 0x91, 0xfa, 0xf2, 0xef, 0x66, 0xc9, 0x9e, 0xc8, 0x47, 0x9f, 0xc0, 0xca, 0x08, 0x07,
-	0x8c, 0x50, 0x4f, 0x5b, 0xe6, 0xa5, 0x9a, 0xf3, 0x4a, 0x3d, 0x13, 0x32, 0x3b, 0xd1, 0xa3, 0x07,
-	0x50, 0xef, 0xe3, 0xcb, 0x6e, 0xd4, 0xf1, 0x71, 0x40, 0x68, 0x5f, 0x53, 0x5b, 0xca, 0x8e, 0x6a,
-	0xd7, 0x78, 0xec, 0x29, 0x0f, 0xa1, 0x0d, 0xa8, 0x30, 0xe2, 0x7a, 0x38, 0xd0, 0xca, 0x7c, 0x1f,
-	0xf2, 0xdf, 0xa7, 0x6b, 0x3f, 0xff, 0xd6, 0x2c, 0xfd, 0xf8, 0xfa, 0xc5, 0x43, 0x19, 0xd8, 0x6a,
-	0xc2, 0xfd, 0xdc, 0x66, 0xd8, 0x98, 0xf9, 0xd4, 0x63, 0x78, 0xeb, 0xcf, 0x32, 0x34, 0x66, 0x14,
-	0xa7, 0x41, 0x74, 0x73, 0xb7, 0xf6, 0x61, 0xc3, 0x0f, 0xf0, 0x88, 0xd0, 0x21, 0xeb, 0x8c, 0x77,
-	0x13, 0x2b, 0xe3, 0xbe, 0x55, 0x8f, 0x96, 0x34, 0xc5, 0x6e, 0x24, 0x8a, 0x71, 0xed, 0xe3, 0x3e,
-	0xfa, 0x18, 0xea, 0xb2, 0x2c, 0x0b, 0xbb, 0x21, 0x96, 0xcd, 0x69, 0x98, 0x02, 0x0d, 0x33, 0x41,
-	0xc3, 0x3c, 0xf4, 0x22, 0xbb, 0x26, 0x94, 0x5f, 0xc7, 0xc2, 0x99, 0x01, 0xa9, 0xb7, 0x1c, 0xd0,
-	0x74, 0x97, 0xcb, 0xb3, 0x5d, 0x3e, 0x85, 0xf5, 0x6c, 0x4a, 0x47, 0x0e, 0x88, 0x69, 0x95, 0xd6,
-	0x72, 0x91, 0x89, 0x36, 0xb2, 0xd9, 0x32, 0xc8, 0x50, 0x1b, 0xea, 0x7e, 0x40, 0xe9, 0x59, 0xe7,
-	0x1c, 0x13, 0xf7, 0x3c, 0xd4, 0x56, 0xf8, 0x46, 0xf4, 0x4c, 0x31, 0xc1, 0xfd, 0x68, 0xcf, 0xfc,
-	0x9c, 0x2b, 0xa4, 0xfd, 0x1a, 0xcf, 0x12, 0x21, 0x74, 0x1f, 0x40, 0x14, 0x21, 0x1e, 0x09, 0xb5,
-	0xd5, 0x96, 0xb2, 0x53, 0xb7, 0xab, 0x3c, 0xc2, 0x51, 0x7f, 0x90, 0xac, 0x21, 0x6a, 0x69, 0x55,
-	0x2e, 0x10, 0x15, 0xda, 0x3c, 0x84, 0xb6, 0x61, 0x4d, 0x4a, 0x62, 0x0e, 0x3c, 0x36, 0x64, 0x1a,
-	0x70, 0xd5, 0x5b, 0x42, 0x95, 0x44, 0xd1, 0x17, 0xf0, 0x76, 0x2a, 0x49, 0x3c, 0xd7, 0x0a, 0x7a,
-	0x5e, 0x4b, 0x33, 0xa5, 0xef, 0x31, 0xb8, 0xf5, 0x2c, 0xb8, 0xe8, 0x33, 0xd0, 0xcf, 0x29, 0x0b,
-	0xc7, 0x66, 0x04, 0x1e, 0x1d, 0xee, 0x45, 0xbb, 0xc3, 0x8d, 0x6d, 0xc6, 0x8a, 0xd4, 0x17, 0xa7,
-	0xe2, 0x69, 0xfc, 0x78, 0x96, 0x7a, 0x03, 0xde, 0xcd, 0x63, 0x3a, 0x85, 0xfe, 0x0f, 0x35, 0x07,
-	0xfa, 0x43, 0xe7, 0x02, 0xbd, 0x07, 0x77, 0x26, 0x71, 0x16, 0xe0, 0xd7, 0x9d, 0x2c, 0xc2, 0x07,
-	0xa0, 0x4f, 0x60, 0x91, 0x73, 0x00, 0x6c, 0x2d, 0xab, 0x98, 0x38, 0x00, 0xb7, 0x78, 0x31, 0x4c,
-	0x9f, 0x1d, 0xb5, 0xe8, 0xd9, 0x99, 0x46, 0xae, 0xfc, 0x26, 0xc8, 0xdd, 0x03, 0x01, 0x58, 0x27,
-	0x0c, 0x22, 0xad, 0xc2, 0x27, 0xb2, 0xca, 0x03, 0xf1, 0xdb, 0x62, 0x1a, 0xb8, 0x95, 0x42, 0xc0,
-	0xad, 0x16, 0x06, 0xae, 0x7a, 0x7b, 0xe0, 0x60, 0x01, 0xe0, 0x6a, 0xff, 0x03, 0x70, 0x87, 0xce,
-	0x45, 0x0a, 0xdc, 0xef, 0x0a, 0x68, 0x33, 0x82, 0x36, 0xf5, 0xce, 0x48, 0x30, 0x28, 0x06, 0x5d,
-	0xda, 0xfd, 0xae, 0x73, 0xc1, 0x19, 0x4b, 0xba, 0x1f, 0x63, 0x3b, 0x3d, 0xdf, 0xe5, 0x37, 0x99,
-	0xef, 0xb8, 0x53, 0xea, 0xcd, 0xdf, 0x94, 0x2d, 0x68, 0xcd, 0xdb, 0x4b, 0xba, 0xe1, 0xe7, 0xb0,
-	0x76, 0xc2, 0xdc, 0x6f, 0xfc, 0x7e, 0xdc, 0xb3, 0x6e, 0xd0, 0x1d, 0xb0, 0x4c, 0x7d, 0x65, 0x62,
-	0x12, 0x07, 0x50, 0xf1, 0xb9, 0x42, 0x7e, 0x73, 0x8d, 0x79, 0xe7, 0x41, 0xd4, 0x91, 0xd6, 0x65,
-	0xce, 0xac, 0xbb, 0xbb, 0xb0, 0x39, 0xb5, 0x72, 0x62, 0xea, 0xf1, 0xbf, 0x2a, 0x2c, 0x9f, 0x30,
-	0x17, 0x7d, 0x0f, 0x28, 0xe7, 0x7a, 0xb0, 0x3b, 0x6f, 0xdd, 0xdc, 0x0f, 0xa8, 0xfe, 0xd1, 0x42,
-	0xf2, 0xc4, 0x03, 0xfa, 0x0e, 0xde, 0x99, 0xfd, 0xd6, 0x7e, 0x50, 0xb8, 0xd6, 0x69, 0x10, 0xe9,
-	0x1f, 0x2e, 0xa2, 0x9e, 0xbf, 0x70, 0x0c, 0x4e, 0xf1, 0x85, 0x0f, 0x9d, 0x8b, 0x05, 0x16, 0xce,
-	0xb0, 0x8f, 0x7e, 0x52, 0x60, 0x3d, 0x1f, 0xfc, 0x47, 0x85, 0xeb, 0xc9, 0x0c, 0x7d, 0x7f, 0xd1,
-	0x8c, 0xd4, 0x45, 0x00, 0x1b, 0x82, 0x89, 0xb1, 0x4c, 0x72, 0xb9, 0x7d, 0x43, 0xcd, 0x2c, 0x46,
-	0xba, 0x55, 0x50, 0x98, 0xac, 0xa9, 0x97, 0x7f, 0x78, 0xfd, 0xe2, 0xa1, 0x72, 0xf4, 0xec, 0xe5,
-	0x95, 0xa1, 0xbc, 0xba, 0x32, 0x94, 0x7f, 0xae, 0x0c, 0xe5, 0xd7, 0x6b, 0xa3, 0xf4, 0xea, 0xda,
-	0x28, 0xfd, 0x75, 0x6d, 0x94, 0xbe, 0x3d, 0x70, 0x49, 0x78, 0x3e, 0xec, 0x99, 0x0e, 0x1d, 0x58,
-	0xf2, 0xd2, 0x4c, 0x7a, 0xce, 0xae, 0x4b, 0xad, 0xd1, 0xbe, 0x35, 0xa0, 0xfd, 0xe1, 0x25, 0x66,
-	0xe2, 0xd2, 0xfb, 0xe8, 0xc9, 0x6e, 0xe6, 0xde, 0x1b, 0x46, 0x3e, 0x66, 0xbd, 0x0a, 0x7f, 0xe1,
-	0x3f, 0xf9, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x92, 0xe1, 0xc5, 0x47, 0xbf, 0x0b, 0x00, 0x00,
+	// 938 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x6f, 0x1b, 0x45,
+	0x14, 0xc7, 0xbd, 0x89, 0xed, 0xc4, 0xcf, 0x2e, 0x81, 0x91, 0x93, 0x4c, 0xb7, 0xd4, 0x36, 0x01,
+	0xd4, 0xa8, 0x90, 0xdd, 0xa6, 0x05, 0x29, 0x40, 0x24, 0x94, 0xf8, 0x42, 0x0e, 0x81, 0x6a, 0x09,
+	0x3d, 0x70, 0xb1, 0xec, 0xf5, 0x64, 0x33, 0x4a, 0xbc, 0xb3, 0xda, 0x59, 0x9b, 0x9a, 0x13, 0x82,
+	0x0b, 0x12, 0x17, 0xfe, 0x04, 0xfe, 0x84, 0xfe, 0x19, 0x15, 0xa7, 0x1e, 0x39, 0xa1, 0x2a, 0x41,
+	0xea, 0x3f, 0xc0, 0x1f, 0x80, 0xe6, 0xc7, 0xae, 0xd7, 0xf6, 0x3a, 0xd8, 0x6d, 0x6e, 0xbb, 0x6f,
+	0xbf, 0xef, 0xcd, 0x9b, 0xf7, 0x3e, 0x6f, 0x67, 0xa0, 0x4e, 0x3b, 0xae, 0xed, 0xb2, 0x90, 0xd8,
+	0x2e, 0xf3, 0x7d, 0xe2, 0x46, 0x94, 0xf9, 0xf6, 0x60, 0xd7, 0x8e, 0x9e, 0x5a, 0x41, 0xc8, 0x22,
+	0x86, 0x36, 0x68, 0xc7, 0xb5, 0x84, 0xc0, 0x1a, 0x09, 0xac, 0xc1, 0xae, 0x59, 0xf5, 0x98, 0xc7,
+	0xa4, 0xc4, 0x16, 0x4f, 0x4a, 0x6d, 0x6e, 0xba, 0x8c, 0xf7, 0x18, 0xb7, 0x7b, 0xdc, 0x13, 0x51,
+	0x7a, 0xdc, 0xd3, 0x1f, 0x6e, 0x7b, 0x8c, 0x79, 0x17, 0xc4, 0x96, 0x6f, 0x9d, 0xfe, 0xa9, 0xdd,
+	0xf6, 0x87, 0xfa, 0x53, 0x2a, 0x85, 0x0b, 0x4a, 0xfc, 0x48, 0x38, 0xaa, 0x27, 0x2d, 0xb8, 0x37,
+	0x23, 0xc7, 0x54, 0x42, 0x52, 0xb8, 0xf5, 0xdb, 0x12, 0xac, 0x1f, 0x73, 0xaf, 0x99, 0xd8, 0xbf,
+	0x09, 0x88, 0x7f, 0xe4, 0xd3, 0x08, 0xdd, 0x81, 0x92, 0x0a, 0xd9, 0xa2, 0x5d, 0x6c, 0x34, 0x8c,
+	0xed, 0x92, 0xb3, 0xaa, 0x0c, 0x47, 0x5d, 0xf4, 0x35, 0x54, 0x5c, 0xd6, 0xf7, 0x23, 0x12, 0x06,
+	0xed, 0x30, 0x1a, 0xe2, 0xa5, 0x86, 0xb1, 0x5d, 0x7e, 0xf8, 0x81, 0x95, 0xbd, 0x73, 0xab, 0x99,
+	0xd2, 0x1e, 0xe6, 0x9f, 0xff, 0x5d, 0xcf, 0x39, 0x63, 0xfe, 0xe8, 0x33, 0x58, 0x19, 0x90, 0x90,
+	0x53, 0xe6, 0xe3, 0x65, 0x19, 0xaa, 0x3e, 0x2b, 0xd4, 0x13, 0x25, 0x73, 0x62, 0x3d, 0x7a, 0x0f,
+	0x2a, 0x5d, 0x72, 0xd1, 0x1e, 0xb6, 0x02, 0x12, 0x52, 0xd6, 0xc5, 0xf9, 0x86, 0xb1, 0x9d, 0x77,
+	0xca, 0xd2, 0xf6, 0x58, 0x9a, 0xd0, 0x06, 0x14, 0x39, 0xf5, 0x7c, 0x12, 0xe2, 0x82, 0xdc, 0x87,
+	0x7e, 0xfb, 0x7c, 0xed, 0xd7, 0x3f, 0xea, 0xb9, 0x9f, 0x5f, 0x3d, 0xbb, 0xaf, 0x0d, 0x5b, 0x75,
+	0xb8, 0x9b, 0x59, 0x0c, 0x87, 0xf0, 0x80, 0xf9, 0x9c, 0x6c, 0xfd, 0x53, 0x80, 0xea, 0x94, 0xe2,
+	0x24, 0x1c, 0x5e, 0x5f, 0xad, 0x3d, 0xd8, 0x08, 0x42, 0x32, 0xa0, 0xac, 0xcf, 0x5b, 0xa3, 0xdd,
+	0x08, 0xa5, 0xa8, 0x5b, 0xe9, 0x70, 0x09, 0x1b, 0x4e, 0x35, 0x56, 0x8c, 0x62, 0x1f, 0x75, 0xd1,
+	0x17, 0x50, 0xd1, 0x61, 0x79, 0xd4, 0x8e, 0x88, 0x2e, 0x4e, 0xd5, 0x52, 0x68, 0x58, 0x31, 0x1a,
+	0xd6, 0x81, 0x3f, 0x94, 0x51, 0xca, 0x4a, 0xfd, 0xad, 0x10, 0x4f, 0x35, 0x29, 0xff, 0x86, 0x4d,
+	0x9a, 0xac, 0x74, 0x61, 0xba, 0xd2, 0x27, 0xb0, 0x9e, 0x76, 0x69, 0xe9, 0x26, 0x71, 0x5c, 0x6c,
+	0x2c, 0xcf, 0xd3, 0xd5, 0x6a, 0xda, 0x5b, 0x1b, 0x39, 0x6a, 0x42, 0x25, 0x08, 0x19, 0x3b, 0x6d,
+	0x9d, 0x11, 0xea, 0x9d, 0x45, 0x78, 0x45, 0x6e, 0xc4, 0x4c, 0x05, 0x53, 0xec, 0x0f, 0x76, 0xad,
+	0xaf, 0xa4, 0x42, 0xa7, 0x5f, 0x96, 0x5e, 0xca, 0x84, 0xee, 0x02, 0xa8, 0x20, 0xd4, 0xa7, 0x11,
+	0x5e, 0x6d, 0x18, 0xdb, 0x15, 0xa7, 0x24, 0x2d, 0x12, 0xf7, 0x0f, 0xe3, 0x35, 0x54, 0x2c, 0x5c,
+	0x12, 0x02, 0x55, 0x53, 0x69, 0x6f, 0x4a, 0x33, 0xfa, 0x08, 0xd6, 0xb4, 0x4c, 0xf0, 0xe0, 0xf3,
+	0x3e, 0xc7, 0x90, 0x28, 0xdf, 0x52, 0xca, 0xf8, 0x0b, 0x3a, 0x86, 0xb7, 0x13, 0x59, 0x9c, 0x7b,
+	0xf9, 0x7f, 0x73, 0x2f, 0x8a, 0xdc, 0xb1, 0xe1, 0xac, 0x25, 0xbe, 0x7a, 0x07, 0x23, 0x8c, 0x2b,
+	0x69, 0x8c, 0xd1, 0x97, 0x60, 0x9e, 0x31, 0x1e, 0x8d, 0x52, 0x52, 0xb0, 0xb4, 0x64, 0x36, 0xf8,
+	0x56, 0x92, 0xde, 0xa6, 0x50, 0x25, 0xd9, 0x49, 0x46, 0x1e, 0x0b, 0xc9, 0xf4, 0x1c, 0xd4, 0xe0,
+	0xdd, 0x2c, 0xca, 0x93, 0x31, 0x78, 0x99, 0xcf, 0x18, 0x83, 0x03, 0xf7, 0x1c, 0xbd, 0x0f, 0xb7,
+	0xc6, 0x01, 0x57, 0xa3, 0x50, 0x71, 0xd3, 0x50, 0xef, 0x83, 0x39, 0x06, 0x49, 0xc6, 0x48, 0x38,
+	0x38, 0xad, 0x18, 0x1b, 0x89, 0x37, 0xf8, 0x55, 0x4c, 0x4e, 0x53, 0x7e, 0x91, 0x69, 0x9a, 0x84,
+	0xb0, 0xf0, 0x3a, 0x10, 0xde, 0x01, 0x85, 0x5c, 0x2b, 0x0a, 0x87, 0xb8, 0x28, 0x19, 0x5c, 0x95,
+	0x06, 0xf1, 0x0f, 0x99, 0x44, 0x70, 0x65, 0x6e, 0x04, 0x57, 0x17, 0x42, 0xb0, 0x74, 0x13, 0x08,
+	0xc2, 0x02, 0x08, 0x96, 0x6f, 0x08, 0xc1, 0x03, 0xf7, 0x3c, 0x41, 0xf0, 0x4f, 0x03, 0xf0, 0x94,
+	0xa0, 0xc9, 0xfc, 0x53, 0x1a, 0xf6, 0xe6, 0xc3, 0x30, 0xe9, 0x45, 0xdb, 0x3d, 0x97, 0xd4, 0xc5,
+	0xbd, 0x10, 0x20, 0x4f, 0x76, 0x7b, 0xf9, 0x75, 0xba, 0x3d, 0xaa, 0x56, 0xfe, 0xfa, 0x73, 0x67,
+	0x0b, 0x1a, 0xb3, 0xf6, 0x92, 0x6c, 0xf8, 0x29, 0xac, 0x1d, 0x73, 0xef, 0xbb, 0xa0, 0x2b, 0x6a,
+	0xd6, 0x0e, 0xdb, 0x3d, 0x9e, 0x8a, 0x6f, 0x8c, 0x75, 0x63, 0x1f, 0x8a, 0x81, 0x54, 0xe8, 0x73,
+	0xb9, 0x36, 0x6b, 0x42, 0x54, 0x1c, 0x9d, 0xba, 0xf6, 0x99, 0xce, 0xee, 0x36, 0x6c, 0x4e, 0xac,
+	0x1c, 0x27, 0xf5, 0xf0, 0xdf, 0x3c, 0x2c, 0x1f, 0x73, 0x0f, 0xfd, 0x08, 0x28, 0xe3, 0x0a, 0xb1,
+	0x33, 0x6b, 0xdd, 0xcc, 0x43, 0xd6, 0xfc, 0x74, 0x21, 0x79, 0x9c, 0x03, 0xfa, 0x01, 0xde, 0x99,
+	0x3e, 0x8f, 0x3f, 0x9e, 0x3b, 0xd6, 0x49, 0x38, 0x34, 0x3f, 0x59, 0x44, 0x3d, 0x7b, 0x61, 0x01,
+	0xce, 0xfc, 0x0b, 0x1f, 0xb8, 0xe7, 0x0b, 0x2c, 0x9c, 0x62, 0x1f, 0xfd, 0x62, 0xc0, 0x7a, 0x36,
+	0xf8, 0x0f, 0xe6, 0x8e, 0xa7, 0x3d, 0xcc, 0xbd, 0x45, 0x3d, 0x92, 0x2c, 0x42, 0xd8, 0x50, 0x4c,
+	0x8c, 0x64, 0x9a, 0xcb, 0x7b, 0xd7, 0xc4, 0x4c, 0x63, 0x64, 0xda, 0x73, 0x0a, 0xe3, 0x35, 0xcd,
+	0xc2, 0x4f, 0xaf, 0x9e, 0xdd, 0x37, 0x0e, 0x9f, 0x3c, 0xbf, 0xac, 0x19, 0x2f, 0x2e, 0x6b, 0xc6,
+	0xcb, 0xcb, 0x9a, 0xf1, 0xfb, 0x55, 0x2d, 0xf7, 0xe2, 0xaa, 0x96, 0xfb, 0xeb, 0xaa, 0x96, 0xfb,
+	0x7e, 0xdf, 0xa3, 0xd1, 0x59, 0xbf, 0x63, 0xb9, 0xac, 0x67, 0xeb, 0x8b, 0x35, 0xed, 0xb8, 0x3b,
+	0x1e, 0xb3, 0x07, 0x7b, 0x76, 0x8f, 0x75, 0xfb, 0x17, 0x84, 0xab, 0x8b, 0xf1, 0x83, 0x47, 0x3b,
+	0xa9, 0xbb, 0x71, 0x34, 0x0c, 0x08, 0xef, 0x14, 0xe5, 0x11, 0xf0, 0xe8, 0xbf, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x21, 0x96, 0x4a, 0x73, 0xe3, 0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/ibc/core/connection/v1/tx.proto b/proto/ibc/core/connection/v1/tx.proto
index 3ba8ff45660..648cb4bac1c 100644
--- a/proto/ibc/core/connection/v1/tx.proto
+++ b/proto/ibc/core/connection/v1/tx.proto
@@ -60,7 +60,7 @@ message MsgConnectionOpenTry {
   string client_id = 1;
   // Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC.
   string                    previous_connection_id = 2 [deprecated = true];
-  google.protobuf.Any       client_state           = 3;
+  google.protobuf.Any       client_state           = 3 [deprecated = true];
   Counterparty              counterparty           = 4 [(gogoproto.nullable) = false];
   uint64                    delay_period           = 5;
   repeated Version          counterparty_versions  = 6;
@@ -69,13 +69,13 @@ message MsgConnectionOpenTry {
   // INIT`
   bytes proof_init = 8;
   // proof of client state included in message
-  bytes proof_client = 9;
+  bytes proof_client = 9 [deprecated = true];
   // proof of client consensus state
-  bytes                     proof_consensus  = 10;
-  ibc.core.client.v1.Height consensus_height = 11 [(gogoproto.nullable) = false];
+  bytes                     proof_consensus  = 10 [deprecated = true];
+  ibc.core.client.v1.Height consensus_height = 11 [deprecated = true, (gogoproto.nullable) = false];
   string                    signer           = 12;
   // optional proof data for host state machines that are unable to introspect their own consensus state
-  bytes host_consensus_state_proof = 13;
+  bytes host_consensus_state_proof = 13 [deprecated = true];
 }
 
 // MsgConnectionOpenTryResponse defines the Msg/ConnectionOpenTry response type.
@@ -91,19 +91,19 @@ message MsgConnectionOpenAck {
   string                    connection_id              = 1;
   string                    counterparty_connection_id = 2;
   Version                   version                    = 3;
-  google.protobuf.Any       client_state               = 4;
+  google.protobuf.Any       client_state               = 4 [deprecated = true];
   ibc.core.client.v1.Height proof_height               = 5 [(gogoproto.nullable) = false];
   // proof of the initialization the connection on Chain B: `UNITIALIZED ->
   // TRYOPEN`
   bytes proof_try = 6;
   // proof of client state included in message
-  bytes proof_client = 7;
+  bytes proof_client = 7 [deprecated = true];
   // proof of client consensus state
-  bytes                     proof_consensus  = 8;
-  ibc.core.client.v1.Height consensus_height = 9 [(gogoproto.nullable) = false];
+  bytes                     proof_consensus  = 8 [deprecated = true];
+  ibc.core.client.v1.Height consensus_height = 9 [deprecated = true, (gogoproto.nullable) = false];
   string                    signer           = 10;
   // optional proof data for host state machines that are unable to introspect their own consensus state
-  bytes host_consensus_state_proof = 11;
+  bytes host_consensus_state_proof = 11 [deprecated = true];
 }
 
 // MsgConnectionOpenAckResponse defines the Msg/ConnectionOpenAck response type.
@@ -143,4 +143,4 @@ message MsgUpdateParams {
 }
 
 // MsgUpdateParamsResponse defines the MsgUpdateParams response type.
-message MsgUpdateParamsResponse {}
\ No newline at end of file
+message MsgUpdateParamsResponse {}

From ab413b0b621cfa1a707e219b565a44937a5d65d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20Axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:32:24 +0200
Subject: [PATCH 3/4] add changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da517e87049..961356b9cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## [v8.5.0]()
+
+### State Machine Breaking
+
+* (core/03-connection)[\#7129](https://github.com/cosmos/ibc-go/pull/7129) Remove verification of self client and consensus state from connection handshake. 
+
 ## [v8.4.0](https://github.com/cosmos/ibc-go/releases/tag/v8.4.0) - 2024-07-29
 
 ### Improvements

From 354d3979bfcada569855b1025d98a430bbfd81ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20Axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:37:22 +0200
Subject: [PATCH 4/4] refactor: remove unpacking from msg server

---
 modules/core/keeper/msg_server.go | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go
index 27dae2e0c2e..dacea0e8b4b 100644
--- a/modules/core/keeper/msg_server.go
+++ b/modules/core/keeper/msg_server.go
@@ -149,13 +149,8 @@ func (k Keeper) ConnectionOpenInit(goCtx context.Context, msg *connectiontypes.M
 func (k Keeper) ConnectionOpenTry(goCtx context.Context, msg *connectiontypes.MsgConnectionOpenTry) (*connectiontypes.MsgConnectionOpenTryResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	targetClient, err := clienttypes.UnpackClientState(msg.ClientState)
-	if err != nil {
-		return nil, err
-	}
-
 	if _, err := k.ConnectionKeeper.ConnOpenTry(
-		ctx, msg.Counterparty, msg.DelayPeriod, msg.ClientId, targetClient,
+		ctx, msg.Counterparty, msg.DelayPeriod, msg.ClientId, nil,
 		msg.CounterpartyVersions, msg.ProofInit, msg.ProofClient, msg.ProofConsensus,
 		msg.ProofHeight, msg.ConsensusHeight,
 	); err != nil {
@@ -169,13 +164,8 @@ func (k Keeper) ConnectionOpenTry(goCtx context.Context, msg *connectiontypes.Ms
 func (k Keeper) ConnectionOpenAck(goCtx context.Context, msg *connectiontypes.MsgConnectionOpenAck) (*connectiontypes.MsgConnectionOpenAckResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	targetClient, err := clienttypes.UnpackClientState(msg.ClientState)
-	if err != nil {
-		return nil, err
-	}
-
 	if err := k.ConnectionKeeper.ConnOpenAck(
-		ctx, msg.ConnectionId, targetClient, msg.Version, msg.CounterpartyConnectionId,
+		ctx, msg.ConnectionId, nil, msg.Version, msg.CounterpartyConnectionId,
 		msg.ProofTry, msg.ProofClient, msg.ProofConsensus,
 		msg.ProofHeight, msg.ConsensusHeight,
 	); err != nil {