fix conflict

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

Author: Naohiro Yoshida

light-client/src/client.rs

@@ -858,6 +858,9 @@ mod test {
         mock_consensus_state.insert(Height::new(0, input.trusted_height), trusted_cs.clone());
 
         // Set fork spec boundary timestamp is all[1]
+        // This indicates that target is the HEADER immediately before the HF occurs.
+        // By setting the height of the HF to ClientState here, the next update_client will be able to validate headers after the HF.
+        // In order to validate the header after HF, it is necessary to set the height at which HF occurs in ClientState in advance.
         let mut boundary_fs = fork_spec_after_lorentz();
         boundary_fs.height_or_timestamp =
             HeightOrTimestamp::Time(header.eth_header().all[1].milli_timestamp());
@@ -1369,6 +1372,8 @@ mod test {
                     additional_header_item_count: 0,
                     epoch_length: 200,
                     max_turn_length: 9,
+                    enable_header_msec: false,
+                    gas_limit_bound_divider: 256,
                 }];
                 (client_state, cons_state)
             }));
@@ -1382,6 +1387,8 @@ mod test {
                     additional_header_item_count: 0,
                     epoch_length: 200,
                     max_turn_length: 9,
+                    enable_header_msec: false,
+                    gas_limit_bound_divider: 256,
                 }];
                 (client_state, cons_state)
             }));
@@ -1396,6 +1403,8 @@ mod test {
                     additional_header_item_count: 0,
                     epoch_length: 200,
                     max_turn_length: 9,
+                    enable_header_msec: false,
+                    gas_limit_bound_divider: 256,
                 }];
                 (client_state, cons_state)
             }))

light-client/src/client_state.rs

@@ -325,6 +325,8 @@ mod test {
             additional_header_item_count: 1, // requestsHash
             epoch_length: 200,
             max_turn_length: 9,
+            enable_header_msec: false,
+            gas_limit_bound_divider: 256,
         }
     }
 

light-client/src/consensus_state.rs

@@ -18,6 +18,7 @@ pub struct ConsensusState {
     /// the storage root of the IBC contract
     pub state_root: Hash,
     /// timestamp from execution payload
+    /// After Lorentz HF, the unit is millisecond. Before that, it was seconds.
     pub timestamp: Time,
     pub current_validators_hash: Hash,
     pub previous_validators_hash: Hash,

light-client/src/errors.rs

@@ -73,6 +73,8 @@ pub enum Error {
     MissingVanityInExtraData(BlockNumber, usize, usize),
     MissingSignatureInExtraData(BlockNumber, usize, usize),
     UnexpectedMixHash(BlockNumber, Vec<u8>),
+    UnexpectedNotEmptyMixHash(BlockNumber, Vec<u8>),
+    UnexpectedMilliSecondValue(BlockNumber, u64),
     UnexpectedUncleHash(BlockNumber),
     UnexpectedDifficulty(BlockNumber, u64),
     UnexpectedNonce(BlockNumber),
@@ -82,6 +84,7 @@ pub enum Error {
     MissingSignerInValidator(BlockNumber, Address),
     UnexpectedGasDiff(BlockNumber, u64, u64),
     UnexpectedGasUsed(BlockNumber, u64, u64),
+    UnexpectedGasLimitDivider(BlockNumber),
     UnexpectedHeaderRelation(BlockNumber, BlockNumber, Hash, Vec<u8>, u64, u64),
     ProofRLPError(rlp::DecoderError),
     InvalidProofFormatError(Vec<u8>),
@@ -142,6 +145,9 @@ pub enum Error {
     UnexpectedMissingForkSpecInPreviousEpochCalculation(BlockNumber, alloc::boxed::Box<Error>),
     UnexpectedPreviousEpochInCalculatingNextEpoch(BlockNumber, BlockNumber, BlockNumber),
     EmptyPreviousForkSpecs,
+    UnexpectedEpochLength(u64, u64),
+    MustBeEpoch(BlockNumber, ForkSpec),
+    MustNotBeEpoch(BlockNumber, ForkSpec),
 
     // Misbehaviour
     MissingHeader1,
@@ -510,6 +516,24 @@ impl core::fmt::Display for Error {
             Error::EmptyPreviousForkSpecs => {
                 write!(f, "EmptyPreviousForkSpecs")
             }
+            Error::UnexpectedNotEmptyMixHash(e1, e2) => {
+                write!(f, "UnexpectedNotEmptyMixHash : {} {:?}", e1, e2)
+            }
+            Error::UnexpectedMilliSecondValue(e1, e2) => {
+                write!(f, "UnexpectedMilliSecondValue : {} {}", e1, e2)
+            }
+            Error::UnexpectedGasLimitDivider(e1) => {
+                write!(f, "UnexpectedGasLimitDivider : {}", e1)
+            }
+            Error::UnexpectedEpochLength(e1, e2) => {
+                write!(f, "UnexpectedEpochLength : {} {}", e1, e2)
+            }
+            Error::MustBeEpoch(e1, e2) => {
+                write!(f, "MustBeEpoch : {} {:?}", e1, e2)
+            }
+            Error::MustNotBeEpoch(e1, e2) => {
+                write!(f, "MustNotBeEpoch : {} {:?}", e1, e2)
+            }
         }
     }
 }

light-client/src/fixture/mod.rs

@@ -75,6 +75,8 @@ pub fn fork_spec_after_pascal() -> ForkSpec {
         additional_header_item_count: 1,
         epoch_length: 200,
         max_turn_length: 64,
+        enable_header_msec: false,
+        gas_limit_bound_divider: 256,
     }
 }
 
@@ -84,6 +86,8 @@ pub fn fork_spec_after_lorentz() -> ForkSpec {
         additional_header_item_count: 1,
         epoch_length: 500,
         max_turn_length: 64,
+        enable_header_msec: true,
+        gas_limit_bound_divider: 1024,
     }
 }
 
@@ -93,6 +97,8 @@ pub fn fork_spec_after_maxwell() -> ForkSpec {
         additional_header_item_count: 1,
         epoch_length: 1000,
         max_turn_length: 64,
+        enable_header_msec: true,
+        gas_limit_bound_divider: 1024,
     }
 }
 
@@ -102,6 +108,8 @@ pub fn fork_spec_after_post_maxwell_1() -> ForkSpec {
         additional_header_item_count: 1,
         epoch_length: 1000,
         max_turn_length: 64,
+        enable_header_msec: true,
+        gas_limit_bound_divider: 1024,
     }
 }
 
@@ -111,5 +119,7 @@ pub fn fork_spec_after_post_maxwell_2() -> ForkSpec {
         additional_header_item_count: 1,
         epoch_length: 2000,
         max_turn_length: 64,
+        enable_header_msec: true,
+        gas_limit_bound_divider: 1024,
     }
 }