Move channel back to counterparty

modules/apps/transfer/v2/keeper/msg_server_test.go

@@ -268,15 +268,15 @@ func (suite *KeeperTestSuite) TestMsgRecvPacketTransfer() {
 			"failure: invalid destination channel on received packet",
 			func() {},
 			func() {
-				packet.DestinationChannel = ibctesting.InvalidID
+				packet.DestinationId = ibctesting.InvalidID
 			},
 			channeltypesv2.ErrChannelNotFound,
 		},
 		{
 			"failure: counter party channel does not match source channel",
 			func() {},
 			func() {
-				packet.SourceChannel = ibctesting.InvalidID
+				packet.SourceId = ibctesting.InvalidID
 			},
 			channeltypes.ErrInvalidChannelIdentifier,
 		},
@@ -335,15 +335,15 @@ func (suite *KeeperTestSuite) TestMsgRecvPacketTransfer() {
 			if expPass {
 				suite.Require().NoError(err)
 
-				actualAckHash := suite.chainB.GetSimApp().IBCKeeper.ChannelKeeperV2.GetPacketAcknowledgement(suite.chainB.GetContext(), packet.DestinationChannel, packet.Sequence)
+				actualAckHash := suite.chainB.GetSimApp().IBCKeeper.ChannelKeeperV2.GetPacketAcknowledgement(suite.chainB.GetContext(), packet.DestinationId, packet.Sequence)
 				expectedHash := channeltypesv2.CommitAcknowledgement(expectedAck)
 
 				suite.Require().Equal(expectedHash, actualAckHash)
 
 				denom := transfertypes.Denom{
 					Base: sdk.DefaultBondDenom,
 					Trace: []transfertypes.Hop{
-						transfertypes.NewHop(sendPayload.DestinationPort, packet.DestinationChannel),
+						transfertypes.NewHop(sendPayload.DestinationPort, packet.DestinationId),
 					},
 				}
 

modules/core/02-client/keeper/keeper.go

@@ -115,6 +115,45 @@ func (k *Keeper) SetClientState(ctx context.Context, clientID string, clientStat
 	store.Set(host.ClientStateKey(), types.MustMarshalClientState(k.cdc, clientState))
 }
 
+// GetClientCreator returns the creator of a client
+func (k *Keeper) GetClientCreator(ctx context.Context, clientID string) sdk.AccAddress {
+	store := k.ClientStore(ctx, clientID)
+	bz := store.Get(types.CreatorKey())
+	if len(bz) == 0 {
+		return nil
+	}
+	return sdk.AccAddress(bz)
+}
+
+// SetClientCreator sets the creator of a client
+func (k *Keeper) SetClientCreator(ctx context.Context, clientID string, creator sdk.AccAddress) {
+	store := k.ClientStore(ctx, clientID)
+	store.Set(types.CreatorKey(), creator.Bytes())
+}
+
+// DeleteClientCreator deletes the creator of a client
+func (k *Keeper) DeleteClientCreator(ctx context.Context, clientID string) {
+	store := k.ClientStore(ctx, clientID)
+	store.Delete(types.CreatorKey())
+}
+
+func (k *Keeper) SetClientCounterparty(ctx context.Context, clientID string, counterparty types.CounterpartyInfo) {
+	store := k.ClientStore(ctx, clientID)
+	store.Set(types.CounterpartyKey(), k.cdc.MustMarshal(&counterparty))
+}
+
+func (k *Keeper) GetClientCounterparty(ctx context.Context, clientID string) (types.CounterpartyInfo, bool) {
+	store := k.ClientStore(ctx, clientID)
+	bz := store.Get(types.CounterpartyKey())
+	if len(bz) == 0 {
+		return types.CounterpartyInfo{}, false
+	}
+
+	var counterparty types.CounterpartyInfo
+	k.cdc.MustUnmarshal(bz, &counterparty)
+	return counterparty, true
+}
+
 // GetClientConsensusState gets the stored consensus state from a client at a given height.
 func (k *Keeper) GetClientConsensusState(ctx context.Context, clientID string, height exported.Height) (exported.ConsensusState, bool) {
 	store := k.ClientStore(ctx, clientID)

modules/core/02-client/keeper/keeper_test.go

@@ -127,6 +127,25 @@ func (suite *KeeperTestSuite) TestSetClientState() {
 	suite.Require().Equal(clientState, retrievedState, "Client states are not equal")
 }
 
+func (suite *KeeperTestSuite) TestSetClientCreator() {
+	creator := suite.chainA.SenderAccount.GetAddress()
+	suite.keeper.SetClientCreator(suite.ctx, testClientID, creator)
+	getCreator := suite.keeper.GetClientCreator(suite.ctx, testClientID)
+	suite.Require().Equal(creator, getCreator)
+	suite.keeper.DeleteClientCreator(suite.ctx, testClientID)
+	getCreator = suite.keeper.GetClientCreator(suite.ctx, testClientID)
+	suite.Require().Equal(sdk.AccAddress(nil), getCreator)
+}
+
+func (suite *KeeperTestSuite) TestSetClientCounterparty() {
+	counterparty := types.NewCounterpartyInfo([][]byte{[]byte("ibc"), []byte("channel-7")}, testClientID2)
+	suite.keeper.SetClientCounterparty(suite.ctx, testClientID, counterparty)
+
+	retrievedCounterparty, found := suite.keeper.GetClientCounterparty(suite.ctx, testClientID)
+	suite.Require().True(found, "GetCounterparty failed")
+	suite.Require().Equal(counterparty, retrievedCounterparty, "Counterparties are not equal")
+}
+
 func (suite *KeeperTestSuite) TestSetClientConsensusState() {
 	suite.keeper.SetClientConsensusState(suite.ctx, testClientID, testClientHeight, suite.consensusState)
 

modules/core/02-client/types/counterparty.go

@@ -0,0 +1,8 @@
+package types
+
+func NewCounterpartyInfo(merklePrefix [][]byte, clientId string) CounterpartyInfo {
+	return CounterpartyInfo{
+		MerklePrefix: merklePrefix,
+		ClientId:     clientId,
+	}
+}