DAT-2: Add the validation for frozen and latest_height

light-client/src/client.rs

@@ -54,6 +54,13 @@ impl<const L1_SYNC_COMMITTEE_SIZE: usize> LightClient
         let height = client_state.latest_height;
         let timestamp = consensus_state.timestamp;
 
+        if client_state.frozen {
+            return Err(Error::CannotInitializeFrozenClient.into());
+        }
+        if client_state.latest_height.revision_height() == 0 {
+            return Err(Error::UnexpectedLatestHeight(client_state.latest_height).into());
+        }
+
         Ok(CreateClientResult {
             height,
             message: UpdateStateProxyMessage {
@@ -289,6 +296,7 @@ mod test {
     use prost::Message;
     extern crate std;
 
+    #[derive(Default)]
     struct MockClientReader {
         client_state: Option<ClientState>,
         consensus_state: BTreeMap<Height, ConsensusState>,
@@ -406,11 +414,7 @@ mod test {
         let any_cs = Any::try_from(cs.clone()).unwrap();
         let result = client
             .create_client(
-                &MockClientReader {
-                    client_state: None,
-                    consensus_state: BTreeMap::new(),
-                    time: None,
-                },
+                &MockClientReader::default(),
                 any_cs.clone(),
                 Any::try_from(cons_state.clone()).unwrap(),
             )
@@ -438,6 +442,51 @@ mod test {
         }
     }
 
+    #[test]
+    fn test_create_client_error_frozen() {
+        let client = OptimismLightClient::<
+            { ethereum_consensus::preset::minimal::PRESET.SYNC_COMMITTEE_SIZE },
+        >;
+        let (mut cs, cons_state) = get_initial_state();
+        cs.frozen = true;
+        let any_cs = Any::try_from(cs.clone()).unwrap();
+        let err = client
+            .create_client(
+                &MockClientReader::default(),
+                any_cs.clone(),
+                Any::try_from(cons_state.clone()).unwrap(),
+            )
+            .unwrap_err();
+        assert!(
+            err.to_string().contains("CannotInitializeFrozenClient"),
+            "{:?}",
+            err
+        );
+    }
+
+    #[test]
+    fn test_create_client_error_invalid_height() {
+        let client = OptimismLightClient::<
+            { ethereum_consensus::preset::minimal::PRESET.SYNC_COMMITTEE_SIZE },
+        >;
+        let (mut cs, cons_state) = get_initial_state();
+        cs.latest_height = Height::new(0, 0);
+
+        let any_cs = Any::try_from(cs.clone()).unwrap();
+        let err = client
+            .create_client(
+                &MockClientReader::default(),
+                any_cs.clone(),
+                Any::try_from(cons_state.clone()).unwrap(),
+            )
+            .unwrap_err();
+        assert!(
+            err.to_string().contains("UnexpectedLatestHeight"),
+            "{:?}",
+            err
+        );
+    }
+
     #[test]
     fn test_update_client() {
         let client = OptimismLightClient::<

light-client/src/errors.rs

@@ -53,6 +53,10 @@ pub enum Error {
     NegativeMaxClockDrift,
     #[error("UnexpectedRollupConfig: err={0:?}")]
     UnexpectedRollupConfig(serde_json::Error),
+    #[error("CannotInitializeFrozenClient")]
+    CannotInitializeFrozenClient,
+    #[error("UnexpectedLatestHeight: height={0}")]
+    UnexpectedLatestHeight(Height),
 
     // ConsState error
     #[error("UnexpectedStorageRoot: proof_height={0} latest_height={1}")]