add GetChainID

modules/core/02-client/legacy/v100/solomachine.go

@@ -53,6 +53,11 @@ func (cs ClientState) ClientType() string {
 	panic("legacy solo machine is deprecated!")
 }
 
+// GetChainID panics!
+func (cs ClientState) GetChainID() string {
+	panic("legacy solo machine is deprecated!")
+}
+
 // GetLatestHeight panics!
 func (cs ClientState) GetLatestHeight() exported.Height {
 	panic("legacy solo machine is deprecated!")

modules/core/exported/client.go

@@ -46,6 +46,7 @@ type ClientState interface {
 	proto.Message
 
 	ClientType() string
+	GetChainID() string
 	GetLatestHeight() Height
 	Validate() error
 
@@ -204,6 +205,7 @@ type Misbehaviour interface {
 	proto.Message
 
 	ClientType() string
+	GetChainID() string
 	GetClientID() string
 	ValidateBasic() error
 }
@@ -213,6 +215,7 @@ type Header interface {
 	proto.Message
 
 	ClientType() string
+	GetChainID() string
 	GetHeight() Height
 	ValidateBasic() error
 }

modules/light-clients/01-dymint/types/header.go

@@ -28,6 +28,11 @@ func (h Header) ClientType() string {
 	return exported.Dymint
 }
 
+// GetChainID returns the chain-id
+func (h Header) GetChainID() string {
+	return h.Header.ChainID
+}
+
 // GetHeight returns the current height. It returns 0 if the dymint
 // header is nil.
 // NOTE: the header.Header is checked to be non nil in ValidateBasic.

modules/light-clients/01-dymint/types/misbehaviour.go

@@ -29,6 +29,12 @@ func (misbehaviour Misbehaviour) ClientType() string {
 	return exported.Dymint
 }
 
+// GetChainID returns the chain-id
+func (misbehaviour Misbehaviour) GetChainID() string {
+	// assuming Header1.hainID and Header2.hainID are same as checked in ValidateBasic
+	return misbehaviour.Header1.GetChainID()
+}
+
 // GetClientID returns the ID of the client that committed a misbehaviour.
 func (misbehaviour Misbehaviour) GetClientID() string {
 	return misbehaviour.ClientId

modules/light-clients/06-solomachine/types/client_state.go

@@ -32,6 +32,11 @@ func (cs ClientState) ClientType() string {
 	return exported.Solomachine
 }
 
+// GetChainID returns the chain-id
+func (cs ClientState) GetChainID() string {
+	return ""
+}
+
 // GetLatestHeight returns the latest sequence number.
 // Return exported.Height to satisfy ClientState interface
 // Revision number is always 0 for a solo-machine.

modules/light-clients/06-solomachine/types/header.go

@@ -17,6 +17,11 @@ func (Header) ClientType() string {
 	return exported.Solomachine
 }
 
+// GetChainID returns the chain-id
+func (h Header) GetChainID() string {
+	return ""
+}
+
 // GetHeight returns the current sequence number as the height.
 // Return clientexported.Height to satisfy interface
 // Revision number is always 0 for a solo-machine

modules/light-clients/06-solomachine/types/misbehaviour.go

@@ -17,6 +17,11 @@ func (misbehaviour Misbehaviour) ClientType() string {
 	return exported.Solomachine
 }
 
+// GetChainID returns the chain-id
+func (misbehaviour Misbehaviour) GetChainID() string {
+	return ""
+}
+
 // GetClientID returns the ID of the client that committed a misbehaviour.
 func (misbehaviour Misbehaviour) GetClientID() string {
 	return misbehaviour.ClientId

modules/light-clients/07-tendermint/types/header.go

@@ -28,6 +28,11 @@ func (h Header) ClientType() string {
 	return exported.Tendermint
 }
 
+// GetChainID returns the chain-id
+func (h Header) GetChainID() string {
+	return h.Header.ChainID
+}
+
 // GetHeight returns the current height. It returns 0 if the tendermint
 // header is nil.
 // NOTE: the header.Header is checked to be non nil in ValidateBasic.

modules/light-clients/07-tendermint/types/misbehaviour.go

@@ -31,6 +31,12 @@ func (misbehaviour Misbehaviour) ClientType() string {
 	return exported.Tendermint
 }
 
+// GetChainID returns the chain-id
+func (misbehaviour Misbehaviour) GetChainID() string {
+	// assuming Header1.hainID and Header2.hainID are same as checked in ValidateBasic
+	return misbehaviour.Header1.GetChainID()
+}
+
 // GetClientID returns the ID of the client that committed a misbehaviour.
 func (misbehaviour Misbehaviour) GetClientID() string {
 	return misbehaviour.ClientId