proto ics09

x/ibc/09-localhost/types/client_state.go

@@ -18,23 +18,23 @@ import (
 	ibctypes "github.com/cosmos/cosmos-sdk/x/ibc/types"
 )
 
-var _ clientexported.ClientState = ClientState{}
+var _ clientexported.ClientState = (*ClientState)(nil)
 
 // ClientState requires (read-only) access to keys outside the client prefix.
-type ClientState struct {
-	store   sdk.KVStore
-	ID      string `json:"id" yaml:"id"`
-	ChainID string `json:"chain_id" yaml:"chain_id"`
-	Height  int64  `json:"height" yaml:"height"`
-}
+// type ClientState struct {
+// 	store   sdk.KVStore
+// 	ID      string `json:"id" yaml:"id"`
+// 	ChainID string `json:"chain_id" yaml:"chain_id"`
+// 	Height  int64  `json:"height" yaml:"height"`
+// }
 
 // NewClientState creates a new ClientState instance
 func NewClientState(store sdk.KVStore, chainID string, height int64) ClientState {
 	return ClientState{
-		store:   store,
+		// store:   store,
 		ID:      clientexported.Localhost.String(),
 		ChainID: chainID,
-		Height:  height,
+		Height:  uint64(height),
 	}
 }
 
@@ -55,7 +55,7 @@ func (cs ClientState) ClientType() clientexported.ClientType {
 
 // GetLatestHeight returns the latest height stored.
 func (cs ClientState) GetLatestHeight() uint64 {
-	return uint64(cs.Height)
+	return cs.Height
 }
 
 // IsFrozen returns false.

x/ibc/09-localhost/types/codec.go

@@ -9,17 +9,27 @@ const (
 	SubModuleName = "localhost"
 )
 
-// SubModuleCdc defines the IBC localhost client codec.
-var SubModuleCdc *codec.Codec
-
-// RegisterCodec registers the localhost types
+// RegisterCodec registers the necessary x/ibc/09-localhost interfaces and concrete types
+// on the provided Amino codec. These types are used for Amino JSON serialization.
 func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterConcrete(ClientState{}, "ibc/client/localhost/ClientState", nil)
 	cdc.RegisterConcrete(MsgCreateClient{}, "ibc/client/localhost/MsgCreateClient", nil)
-	SetSubModuleCodec(cdc)
 }
 
-// SetSubModuleCodec sets the ibc localhost client codec
-func SetSubModuleCodec(cdc *codec.Codec) {
-	SubModuleCdc = cdc
+var (
+	amino = codec.New()
+
+	// SubModuleCdc references the global x/ibc/07-tendermint module codec. Note, the codec
+	// should ONLY be used in certain instances of tests and for JSON encoding as Amino
+	// is still used for that purpose.
+	//
+	// The actual codec used for serialization should be provided to x/ibc/07-tendermint and
+	// defined at the application level.
+	SubModuleCdc = codec.NewHybridCodec(amino)
+)
+
+func init() {
+	RegisterCodec(amino)
+	codec.RegisterCrypto(amino)
+	amino.Seal()
 }

x/ibc/09-localhost/types/msgs.go

@@ -16,11 +16,6 @@ var (
 	_ clientexported.MsgCreateClient = MsgCreateClient{}
 )
 
-// MsgCreateClient defines a message to create an IBC client
-type MsgCreateClient struct {
-	Signer sdk.AccAddress `json:"address" yaml:"address"`
-}
-
 // NewMsgCreateClient creates a new MsgCreateClient instance
 func NewMsgCreateClient(signer sdk.AccAddress) MsgCreateClient {
 	return MsgCreateClient{