Message aggregation support

light-clients/lcp/types/client_state.go

@@ -157,32 +157,32 @@ func (cs ClientState) VerifyMembership(
 	if err != nil {
 		return err
 	}
-	c, err := commitmentProof.GetCommitment()
+	m, err := commitmentProof.GetELCMessage()
 	if err != nil {
 		return err
 	}
-	commitment, err := c.GetStateCommitment()
+	msg, err := m.GetVerifyMembershipMessage()
 	if err != nil {
 		return err
 	}
-	commitmentValue := crypto.Keccak256Hash(value)
+	hashedValue := crypto.Keccak256Hash(value)
 
-	if !height.EQ(commitment.Height) {
-		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid height: expected=%v got=%v", height, commitment.Height)
+	if !height.EQ(msg.Height) {
+		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid height: expected=%v got=%v", height, msg.Height)
 	}
-	if !bytes.Equal(prefixBytes, commitment.Prefix) {
-		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid prefix: expected=%v got=%v", prefixBytes, commitment.Prefix)
+	if !bytes.Equal(prefixBytes, msg.Prefix) {
+		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid prefix: expected=%v got=%v", prefixBytes, msg.Prefix)
 	}
-	if !bytes.Equal(commitmentPath, commitment.Path) {
-		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid path: expected=%v got=%v", string(commitmentPath), string(commitment.Path))
+	if !bytes.Equal(commitmentPath, msg.Path) {
+		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid path: expected=%v got=%v", string(commitmentPath), string(msg.Path))
 	}
-	if commitmentValue != commitment.Value {
-		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid value: expected=%X got=%X", commitmentValue[:], commitment.Value)
+	if hashedValue != msg.Value {
+		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid value: expected=%X got=%X", hashedValue[:], msg.Value)
 	}
-	if !commitment.StateID.EqualBytes(consensusState.StateId) {
-		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid state ID: expected=%v got=%v", consensusState.StateId, commitment.StateID)
+	if !msg.StateID.EqualBytes(consensusState.StateId) {
+		return sdkerrors.Wrapf(ErrInvalidStateCommitment, "invalid state ID: expected=%v got=%v", consensusState.StateId, msg.StateID)
 	}
-	if err := VerifySignatureWithSignBytes(commitmentProof.CommitmentBytes, commitmentProof.Signature, commitmentProof.Signer); err != nil {
+	if err := VerifySignatureWithSignBytes(commitmentProof.Message, commitmentProof.Signature, commitmentProof.Signer); err != nil {
 		return sdkerrors.Wrapf(ErrInvalidStateCommitmentProof, "failed to verify state commitment proof: %v", err)
 	}
 	if !cs.IsActiveKey(ctx.BlockTime(), clientStore, commitmentProof.Signer) {

light-clients/lcp/types/header.go

@@ -11,27 +11,27 @@ func (UpdateClientMessage) ClientType() string {
 	return ClientTypeLCP
 }
 
-func (m UpdateClientMessage) GetHeight() exported.Height {
-	c, err := m.GetCommitment()
+func (ucm UpdateClientMessage) GetHeight() exported.Height {
+	m, err := ucm.GetELCMessage()
 	if err != nil {
 		panic(err)
 	}
-	return c.NewHeight
+	return m.PostHeight
 }
 
-func (m UpdateClientMessage) ValidateBasic() error {
-	if _, err := m.GetCommitment(); err != nil {
+func (ucm UpdateClientMessage) ValidateBasic() error {
+	if _, err := ucm.GetELCMessage(); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (h UpdateClientMessage) GetCommitment() (*UpdateClientCommitment, error) {
-	c, err := EthABIDecodeHeaderedCommitment(h.Commitment)
+func (ucm UpdateClientMessage) GetELCMessage() (*ELCUpdateClientMessage, error) {
+	m, err := EthABIDecodeHeaderedMessage(ucm.ElcMessage)
 	if err != nil {
 		return nil, err
 	}
-	return c.GetUpdateClientCommitment()
+	return m.GetUpdateClientMessage()
 }
 
 var _ exported.ClientMessage = (*RegisterEnclaveKeyMessage)(nil)