fix misbehaviour validation and tests

Signed-off-by: Jun Kimura <[email protected]>
datachainlab · Nov 12, 2024 · 81cc068 · 81cc068
1 parent e1d8017
commit 81cc068
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/crates/ibc/src/client_state.rs b/crates/ibc/src/client_state.rs
@@ -423,6 +423,7 @@ impl<const SYNC_COMMITTEE_SIZE: usize> Ics2ClientState for ClientState<SYNC_COMM
             return Err(ClientError::ClientFrozen { client_id }.into());
         }
         let misbehaviour = Misbehaviour::<SYNC_COMMITTEE_SIZE>::try_from(misbehaviour)?;
+        misbehaviour.validate()?;
         let consensus_state = match maybe_consensus_state(
             ctx,
             &ClientConsensusStatePath::new(&client_id, &misbehaviour.trusted_sync_committee.height),

diff --git a/crates/ibc/src/header.rs b/crates/ibc/src/header.rs
@@ -77,7 +77,7 @@ pub fn decode_header<const SYNC_COMMITTEE_SIZE: usize, B: Buf>(
 
 impl<const SYNC_COMMITTEE_SIZE: usize> Header<SYNC_COMMITTEE_SIZE> {
     pub fn validate<C: ChainContext>(&self, ctx: &C) -> Result<(), Error> {
-        self.trusted_sync_committee.sync_committee.validate()?;
+        self.trusted_sync_committee.validate()?;
         if self.timestamp.into_tm_time().is_none() {
             return Err(Error::ZeroTimestampError);
         }
@@ -198,6 +198,7 @@ impl<const SYNC_COMMITTEE_SIZE: usize> From<Header<SYNC_COMMITTEE_SIZE>> for IBC
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::client_state::ETHEREUM_CLIENT_REVISION_NUMBER;
     use ethereum_consensus::context::ChainContext;
     use ethereum_consensus::{config, types::U64};
     use ethereum_light_client_verifier::{
@@ -246,7 +247,7 @@ mod tests {
             let update = to_consensus_update_info(update);
             let header = Header {
                 trusted_sync_committee: TrustedSyncCommittee {
-                    height: ibc::Height::new(1, 1).unwrap(),
+                    height: ibc::Height::new(ETHEREUM_CLIENT_REVISION_NUMBER, 1).unwrap(),
                     sync_committee: current_sync_committee.to_committee().clone(),
                     is_next: true,
                 },
@@ -267,7 +268,7 @@ mod tests {
 
             let header = Header {
                 trusted_sync_committee: TrustedSyncCommittee {
-                    height: ibc::Height::new(1, 1).unwrap(),
+                    height: ibc::Height::new(ETHEREUM_CLIENT_REVISION_NUMBER, 1).unwrap(),
                     sync_committee: current_sync_committee.to_committee().clone(),
                     is_next: true,
                 },
@@ -296,7 +297,7 @@ mod tests {
         let update = to_consensus_update_info(update);
         let header = Header {
             trusted_sync_committee: TrustedSyncCommittee {
-                height: ibc::Height::new(1, 1).unwrap(),
+                height: ibc::Height::new(ETHEREUM_CLIENT_REVISION_NUMBER, 1).unwrap(),
                 sync_committee: current_sync_committee.to_committee().clone(),
                 is_next: true,
             },

diff --git a/crates/ibc/src/misbehaviour.rs b/crates/ibc/src/misbehaviour.rs
@@ -36,6 +36,13 @@ pub struct Misbehaviour<const SYNC_COMMITTEE_SIZE: usize> {
     pub data: MisbehaviourData<SYNC_COMMITTEE_SIZE, ConsensusUpdateInfo<SYNC_COMMITTEE_SIZE>>,
 }
 
+impl<const SYNC_COMMITTEE_SIZE: usize> Misbehaviour<SYNC_COMMITTEE_SIZE> {
+    pub fn validate(&self) -> Result<(), Error> {
+        self.trusted_sync_committee.validate()?;
+        Ok(())
+    }
+}
+
 impl<const SYNC_COMMITTEE_SIZE: usize> Ics02Misbehaviour for Misbehaviour<SYNC_COMMITTEE_SIZE> {
     fn client_id(&self) -> &ibc::core::ics24_host::identifier::ClientId {
         &self.client_id

diff --git a/crates/ibc/src/types.rs b/crates/ibc/src/types.rs
@@ -1,3 +1,4 @@
+use crate::client_state::ETHEREUM_CLIENT_REVISION_NUMBER;
 use crate::commitment::decode_eip1184_rlp_proof;
 use crate::errors::Error;
 use crate::internal_prelude::*;
@@ -110,6 +111,19 @@ pub struct TrustedSyncCommittee<const SYNC_COMMITTEE_SIZE: usize> {
     pub is_next: bool,
 }
 
+impl<const SYNC_COMMITTEE_SIZE: usize> TrustedSyncCommittee<SYNC_COMMITTEE_SIZE> {
+    pub fn validate(&self) -> Result<(), Error> {
+        if self.height.revision_number() != ETHEREUM_CLIENT_REVISION_NUMBER {
+            return Err(Error::UnexpectedHeightRevisionNumber {
+                expected: ETHEREUM_CLIENT_REVISION_NUMBER,
+                got: self.height.revision_number(),
+            });
+        }
+        self.sync_committee.validate()?;
+        Ok(())
+    }
+}
+
 impl<const SYNC_COMMITTEE_SIZE: usize> TryFrom<ProtoTrustedSyncCommittee>
     for TrustedSyncCommittee<SYNC_COMMITTEE_SIZE>
 {