Merge pull request #18 from datachainlab/misbehaviour

Bump lcp to v0.2.6 and add misbehaviour support

Signed-off-by: Jun Kimura <[email protected]>

README.md

@@ -7,7 +7,7 @@ lcp-go includes the followings:
 
 ## Dependencies
 
-- [lcp v0.2.5](https://github.com/datachainlab/lcp/releases/tag/v0.2.5)
+- [lcp v0.2.6](https://github.com/datachainlab/lcp/releases/tag/v0.2.6)
 - [ibc-go v7.2](https://github.com/cosmos/ibc-go/releases/tag/v7.2.0)
 - [yui-relayer v0.4.21](https://github.com/hyperledger-labs/yui-relayer/releases/tag/v0.4.21)
 

light-clients/lcp/types/client_state.go

@@ -84,13 +84,6 @@ func (cs ClientState) ExportMetadata(_ sdk.KVStore) []exported.GenesisMetadata {
 	panic("not implemented") // TODO: Implement
 }
 
-func (cs ClientState) CheckForMisbehaviour(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, msg exported.ClientMessage) bool {
-	return false
-}
-
-func (cs ClientState) UpdateStateOnMisbehaviour(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, _ exported.ClientMessage) {
-}
-
 func (cs ClientState) CheckSubstituteAndUpdateState(
 	ctx sdk.Context, cdc codec.BinaryCodec, subjectClientStore,
 	substituteClientStore sdk.KVStore, substituteClient exported.ClientState,
@@ -157,11 +150,11 @@ func (cs ClientState) VerifyMembership(
 	if err != nil {
 		return err
 	}
-	m, err := commitmentProof.GetELCMessage()
+	m, err := commitmentProof.GetMessage()
 	if err != nil {
 		return err
 	}
-	msg, err := m.GetVerifyMembershipMessage()
+	msg, err := m.GetVerifyMembershipProxyMessage()
 	if err != nil {
 		return err
 	}

light-clients/lcp/types/errors.go

@@ -11,4 +11,5 @@ var (
 	ErrProcessedTimeNotFound       = sdkerrors.Register(ModuleName, 4, "processed time not found")
 	ErrProcessedHeightNotFound     = sdkerrors.Register(ModuleName, 5, "processed height not found")
 	ErrDelayPeriodNotPassed        = sdkerrors.Register(ModuleName, 6, "packet-specified delay period has not been reached")
+	ErrInvalidMisbehaviour         = sdkerrors.Register(ModuleName, 7, "invalid misbehaviour")
 )

light-clients/lcp/types/header.go

@@ -1,37 +1,54 @@
 package types
 
 import (
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	"fmt"
+
 	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
 
+type ProxyMessage interface{}
+
 var _ exported.ClientMessage = (*UpdateClientMessage)(nil)
 
 func (UpdateClientMessage) ClientType() string {
 	return ClientTypeLCP
 }
 
 func (ucm UpdateClientMessage) GetHeight() exported.Height {
-	m, err := ucm.GetELCMessage()
+	m, err := ucm.GetProxyMessage()
 	if err != nil {
 		panic(err)
 	}
-	return m.PostHeight
+	switch m := m.(type) {
+	case *UpdateStateProxyMessage:
+		return m.PostHeight
+	default:
+		panic(fmt.Errorf("unexpected message type: %T", m))
+	}
 }
 
 func (ucm UpdateClientMessage) ValidateBasic() error {
-	if _, err := ucm.GetELCMessage(); err != nil {
+	if _, err := ucm.GetProxyMessage(); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (ucm UpdateClientMessage) GetELCMessage() (*ELCUpdateClientMessage, error) {
-	m, err := EthABIDecodeHeaderedMessage(ucm.ElcMessage)
+func (ucm UpdateClientMessage) GetProxyMessage() (ProxyMessage, error) {
+	m, err := EthABIDecodeHeaderedProxyMessage(ucm.ProxyMessage)
 	if err != nil {
 		return nil, err
 	}
-	return m.GetUpdateClientMessage()
+	if m.Version != LCPMessageVersion {
+		return nil, fmt.Errorf("unexpected commitment version: expected=%v actual=%v", LCPMessageVersion, m.Version)
+	}
+	if m.Type == LCPMessageTypeUpdateState {
+		return m.GetUpdateStateProxyMessage()
+	} else if m.Type == LCPMessageTypeMisbehaviour {
+		return m.GetMisbehaviourProxyMessage()
+	} else {
+		return nil, fmt.Errorf("unexpected message type: %v", m.Type)
+	}
 }
 
 var _ exported.ClientMessage = (*RegisterEnclaveKeyMessage)(nil)
@@ -40,12 +57,6 @@ func (RegisterEnclaveKeyMessage) ClientType() string {
 	return ClientTypeLCP
 }
 
-func (RegisterEnclaveKeyMessage) GetHeight() exported.Height {
-	// XXX: the header doesn't have height info, so return zero
-	// this is just workaround until this function removed
-	return clienttypes.ZeroHeight()
-}
-
 func (RegisterEnclaveKeyMessage) ValidateBasic() error {
 	return nil
 }