fix conflict

Signed-off-by: Naohiro Yoshida <naohiro.yoshida@datachain.jp>

Author: Naohiro Yoshida

README.md

@@ -25,5 +25,5 @@ Parameters can be specified to check for acceptable headers at build time.
 
 | Name | Description                                                                                                                  | 
 | --- |------------------------------------------------------------------------------------------------------------------------------| 
-| `MINIMUM_TIMESTAMP_SUPPORTED` | Timestamp(millisecond) of the lowest header this light client will accept. All the ForkSpec must be greater than this value. | 
-| `MINIMUM_HEIGHT_SUPPORTED` | Height of the lowest header this light client will accept. All the ForkSpec must be greater than this value.                 | 
+| `MINIMUM_TIMESTAMP_SUPPORTED` | Timestamp(millisecond) of the lowest header this light client will accept. All the ForkSpec must be greater than or equal to this value. |
+| `MINIMUM_HEIGHT_SUPPORTED` | Height of the lowest header this light client will accept. All the ForkSpec must be greater than or equal to this value.                 | 

light-client/src/client.rs

@@ -150,6 +150,8 @@ impl LightClient for ParliaLightClient {
     }
 }
 
+const NANO_TO_MILLIS: u128 = 1_000_000;
+
 struct InnerLightClient;
 
 impl InnerLightClient {
@@ -166,7 +168,7 @@ impl InnerLightClient {
 
         let height = client_state.latest_height;
         let timestamp = consensus_state.timestamp;
-        let milli_timestamp = (timestamp.as_unix_timestamp_nanos() / 1_000_000) as u64;
+        let milli_timestamp = (timestamp.as_unix_timestamp_nanos() / NANO_TO_MILLIS) as u64;
 
         #[allow(clippy::absurd_extreme_comparisons)]
         if milli_timestamp < MINIMUM_TIMESTAMP_SUPPORTED {
@@ -187,21 +189,20 @@ impl InnerLightClient {
 
         verify_sorted_asc(&client_state.fork_specs)?;
 
-        for spec in &client_state.fork_specs {
-            match spec.height_or_timestamp {
-                HeightOrTimestamp::Height(height) =>
-                {
-                    #[allow(clippy::absurd_extreme_comparisons)]
-                    if height < MINIMUM_HEIGHT_SUPPORTED {
-                        return Err(Error::UnsupportedMinimumHeightForkSpec(height));
-                    }
+        let first = client_state.fork_specs.first().unwrap();
+        match first.height_or_timestamp {
+            HeightOrTimestamp::Height(height) =>
+            {
+                #[allow(clippy::absurd_extreme_comparisons)]
+                if height < MINIMUM_HEIGHT_SUPPORTED {
+                    return Err(Error::UnsupportedMinimumHeightForkSpec(height));
                 }
-                HeightOrTimestamp::Time(time) =>
-                {
-                    #[allow(clippy::absurd_extreme_comparisons)]
-                    if time < MINIMUM_TIMESTAMP_SUPPORTED {
-                        return Err(Error::UnsupportedMinimumTimestampForkSpec(time));
-                    }
+            }
+            HeightOrTimestamp::Time(time) =>
+            {
+                #[allow(clippy::absurd_extreme_comparisons)]
+                if time < MINIMUM_TIMESTAMP_SUPPORTED {
+                    return Err(Error::UnsupportedMinimumTimestampForkSpec(time));
                 }
             }
         }
@@ -519,7 +520,7 @@ mod test {
     use rstest::rstest;
     use time::macros::datetime;
 
-    use crate::client::ParliaLightClient;
+    use crate::client::{ParliaLightClient, NANO_TO_MILLIS};
     use crate::client_state::ClientState;
     use crate::consensus_state::ConsensusState;
 
@@ -636,12 +637,12 @@ mod test {
 
                 let cs = ConsensusState::try_from(any_consensus_state).unwrap();
                 assert_eq!(
-                    (data.timestamp.as_unix_timestamp_nanos() / 1_000_000) as u64,
+                    (data.timestamp.as_unix_timestamp_nanos() / NANO_TO_MILLIS) as u64,
                     timestamp
                 );
                 assert_eq!(
-                    data.timestamp.as_unix_timestamp_nanos() / 1_000_000,
-                    cs.timestamp.as_unix_timestamp_nanos() / 1_000_000
+                    data.timestamp.as_unix_timestamp_nanos() / NANO_TO_MILLIS,
+                    cs.timestamp.as_unix_timestamp_nanos() / NANO_TO_MILLIS
                 );
                 assert_eq!(data.emitted_states[0].0, result.height);
                 assert_eq!(data.emitted_states[0].1, any_client_state);

light-client/src/fork_spec.rs

@@ -234,8 +234,8 @@ pub fn get_boundary_epochs(
 
 /// Verifies that the given list of `ForkSpec` is sorted in ascending order.
 ///
-/// This function checks that the `ForkSpec` list is sorted by either height or timestamp
-/// in ascending order. If the list is not sorted correctly, it returns an error.
+/// HEIGHT should be sorted by HEIGHT and TIMESTAMP should be sorted by TIMESTAMP.
+/// As an operational constraint, ForkSpec should be submitted in HF order
 pub fn verify_sorted_asc(fork_specs: &[ForkSpec]) -> Result<(), Error> {
     let mut last_height: Option<u64> = None;
     let mut last_timestamp: Option<u64> = None;

proto/definitions/ibc/lightclients/parlia/v1/parlia.proto

@@ -12,6 +12,8 @@ message ForkSpec {
     uint64 height = 1;
     uint64 timestamp = 2;
   }
+  // The number of headers prior to Pascal HF is set to 0.
+  // For example, the number of headers before Pascal HF is set to 1 because of the addition of the requestsHash.
   uint64 additional_header_item_count = 3;
   uint64 epoch_length = 4;
   uint64 max_turn_length = 5;

proto/src/prost/ibc.lightclients.parlia.v1.rs

@@ -1,6 +1,8 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ForkSpec {
+    /// The number of headers prior to Pascal HF is set to 0.
+    /// For example, the number of headers before Pascal HF is set to 1 because of the addition of the requestsHash.
     #[prost(uint64, tag = "3")]
     pub additional_header_item_count: u64,
     #[prost(uint64, tag = "4")]