Merge branch 'feature/verify_block_hash' into feature/for_op_elc

Author: yoshidan

crates/ibc/Cargo.toml

@@ -16,10 +16,11 @@ ssz-rs = { git = "https://github.com/bluele/ssz_rs", branch = "serde-no-std", de
 hex = { version = "0.4.3", default-features = false }
 
 ethereum-ibc-proto = { path = "../../proto", default-features = false }
-ethereum-consensus = { git = "https://github.com/datachainlab/ethereum-light-client-rs", rev = "v0.1.7", default-features = false }
-ethereum-light-client-verifier = { git = "https://github.com/datachainlab/ethereum-light-client-rs", rev = "v0.1.7", default-features = false }
+ethereum-consensus = { git = "https://github.com/yoshidan/ethereum-light-client-rs", branch = "feature/verify_block_hash", default-features = false }
+ethereum-light-client-verifier = { git = "https://github.com/yoshidan/ethereum-light-client-rs", branch = "feature/verify_block_hash", default-features = false }
 
 [dev-dependencies]
 time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
 hex-literal = "0.4.1"
-ethereum-light-client-verifier = { git = "https://github.com/datachainlab/ethereum-light-client-rs", rev = "v0.1.7", default-features = false, features = ["test-utils"] }
+ethereum-light-client-verifier = { git = "https://github.com/yoshidan/ethereum-light-client-rs", branch = "feature/verify_block_hash", default-features = false, features = ["test-utils"] }
+

crates/ibc/src/client_state.rs

@@ -722,6 +722,7 @@ impl<const SYNC_COMMITTEE_SIZE: usize> TryFrom<RawClientState>
                     execution_payload_state_root_gindex: spec.execution_payload_state_root_gindex,
                     execution_payload_block_number_gindex: spec
                         .execution_payload_block_number_gindex,
+                    execution_payload_block_hash_gindex: spec.execution_payload_block_hash_gindex,
                 })
             } else {
                 Err(Error::proto_missing(&format!("forks[{}].spec", idx)))
@@ -765,7 +766,8 @@ impl<const SYNC_COMMITTEE_SIZE: usize> TryFrom<RawClientState>
             epochs_per_sync_committee_period: value.epochs_per_sync_committee_period.into(),
             ibc_address: value.ibc_address.as_slice().try_into()?,
             ibc_commitments_slot: H256::from_slice(&value.ibc_commitments_slot),
-            trust_level: Fraction::new(trust_level.numerator, trust_level.denominator),
+            trust_level: Fraction::new(trust_level.numerator, trust_level.denominator)
+                .map_err(Error::VerificationError)?,
             trusting_period: value
                 .trusting_period
                 .ok_or(Error::MissingTrustingPeriod)?
@@ -803,6 +805,7 @@ impl<const SYNC_COMMITTEE_SIZE: usize> From<ClientState<SYNC_COMMITTEE_SIZE>> fo
                     execution_payload_state_root_gindex: spec.execution_payload_state_root_gindex,
                     execution_payload_block_number_gindex: spec
                         .execution_payload_block_number_gindex,
+                    execution_payload_block_hash_gindex: spec.execution_payload_block_hash_gindex,
                 }),
             }
         }
@@ -831,8 +834,8 @@ impl<const SYNC_COMMITTEE_SIZE: usize> From<ClientState<SYNC_COMMITTEE_SIZE>> fo
             ibc_address: value.ibc_address.0.to_vec(),
             ibc_commitments_slot: value.ibc_commitments_slot.as_bytes().to_vec(),
             trust_level: Some(ProtoFraction {
-                numerator: value.trust_level.numerator,
-                denominator: value.trust_level.denominator,
+                numerator: value.trust_level.numerator(),
+                denominator: value.trust_level.denominator(),
             }),
             trusting_period: Some(value.trusting_period.into()),
             max_clock_drift: Some(value.max_clock_drift.into()),
@@ -1072,7 +1075,7 @@ mod tests {
                 epochs_per_sync_committee_period: PRESET.EPOCHS_PER_SYNC_COMMITTEE_PERIOD,
                 ibc_address: Address(hex!("ff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F")),
                 ibc_commitments_slot: keccak256("ibc_commitments_slot"),
-                trust_level: Fraction::new(2, 3),
+                trust_level: Fraction::new(2, 3).unwrap(),
                 trusting_period: Duration::from_secs(60 * 60 * 27),
                 max_clock_drift: Duration::from_secs(60),
                 latest_execution_block_number: 1.into(),

crates/ibc/src/consensus_state.rs

@@ -53,6 +53,10 @@ impl ConsensusState {
             Err(Error::UninitializedConsensusStateField(
                 "current_sync_committee",
             ))
+        } else if self.next_sync_committee == PublicKey::default() {
+            Err(Error::UninitializedConsensusStateField(
+                "next_sync_committee",
+            ))
         } else {
             Ok(())
         }

crates/ibc/src/header.rs

@@ -224,7 +224,7 @@ mod tests {
             config::minimal::get_config(),
             Default::default(),
             Default::default(),
-            Fraction::new(2, 3),
+            Fraction::new(2, 3).unwrap(),
             SystemTime::now()
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap()
@@ -239,6 +239,7 @@ mod tests {
         let base_finalized_epoch = base_attested_slot / ctx.slots_per_epoch();
         let dummy_execution_state_root = [1u8; 32].into();
         let dummy_execution_block_number = 1;
+        let dummy_execution_block_hash = [1u8; 32].into();
 
         for b in [false, true] {
             let (update, _) = gen_light_client_update_with_params::<32, _>(
@@ -248,6 +249,7 @@ mod tests {
                 base_finalized_epoch,
                 dummy_execution_state_root,
                 dummy_execution_block_number.into(),
+                dummy_execution_block_hash,
                 current_sync_committee,
                 scm.get_committee(2),
                 b,
@@ -304,6 +306,7 @@ mod tests {
             base_finalized_epoch,
             dummy_execution_state_root,
             dummy_execution_block_number.into(),
+            dummy_execution_block_hash,
             current_sync_committee,
             scm.get_committee(2),
             true,

crates/ibc/src/misbehaviour.rs

@@ -229,7 +229,7 @@ mod tests {
             config::minimal::get_config(),
             Default::default(),
             Default::default(),
-            Fraction::new(2, 3),
+            Fraction::new(2, 3).unwrap(),
             SystemTime::now()
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap()
@@ -244,6 +244,7 @@ mod tests {
         let base_finalized_epoch = base_attested_slot / ctx.slots_per_epoch();
         let dummy_execution_state_root = [1u8; 32].into();
         let dummy_execution_block_number = 1;
+        let dummy_execution_block_hash = [1u8; 32].into();
 
         let (update_1, _) = gen_light_client_update_with_params::<32, _>(
             &ctx,
@@ -252,6 +253,7 @@ mod tests {
             base_finalized_epoch,
             dummy_execution_state_root,
             dummy_execution_block_number.into(),
+            dummy_execution_block_hash,
             current_sync_committee,
             scm.get_committee(2),
             true,
@@ -264,6 +266,7 @@ mod tests {
             base_finalized_epoch,
             dummy_execution_state_root,
             dummy_execution_block_number.into(),
+            dummy_execution_block_hash,
             current_sync_committee,
             scm.get_committee(3),
             true,
@@ -295,6 +298,7 @@ mod tests {
             base_finalized_epoch,
             different_dummy_execution_state_root,
             dummy_execution_block_number.into(),
+            dummy_execution_block_hash,
             current_sync_committee,
             scm.get_committee(2),
             true,

crates/ibc/src/types.rs

@@ -81,6 +81,10 @@ pub struct ExecutionUpdateInfo {
     pub block_number: U64,
     /// Branch indicating the block number in the tree corresponding to the execution payload
     pub block_number_branch: Vec<H256>,
+    /// Block hash of the execution payload
+    pub block_hash: H256,
+    /// Branch indicating the block hash in the tree corresponding to the execution payload
+    pub block_hash_branch: Vec<H256>,
 }
 
 impl ExecutionUpdate for ExecutionUpdateInfo {
@@ -99,6 +103,14 @@ impl ExecutionUpdate for ExecutionUpdateInfo {
     fn block_number_branch(&self) -> Vec<H256> {
         self.block_number_branch.clone()
     }
+
+    fn block_hash(&self) -> H256 {
+        self.block_hash
+    }
+
+    fn block_hash_branch(&self) -> Vec<H256> {
+        self.block_hash_branch.clone()
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
@@ -241,6 +253,12 @@ pub fn convert_proto_to_execution_update(
             .into_iter()
             .map(|n| H256::from_slice(&n))
             .collect(),
+        block_hash: H256::from_slice(&execution_update.block_hash),
+        block_hash_branch: execution_update
+            .block_hash_branch
+            .into_iter()
+            .map(|n| H256::from_slice(&n))
+            .collect(),
     }
 }
 
@@ -260,6 +278,12 @@ pub(crate) fn convert_execution_update_to_proto(
             .into_iter()
             .map(|n| n.as_bytes().to_vec())
             .collect(),
+        block_hash: execution_update.block_hash.as_bytes().into(),
+        block_hash_branch: execution_update
+            .block_hash_branch
+            .into_iter()
+            .map(|n| n.as_bytes().to_vec())
+            .collect(),
     }
 }
 

crates/ibc/src/update.rs

@@ -110,7 +110,7 @@ mod tests {
             config::minimal::get_config(),
             Default::default(),
             Default::default(),
-            Fraction::new(2, 3),
+            Fraction::new(2, 3).unwrap(),
             SystemTime::now()
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap()
@@ -128,6 +128,7 @@ mod tests {
         let current_sync_committee = scm.get_committee(base_store_period);
         let dummy_execution_state_root = [1u8; 32].into();
         let dummy_execution_block_number = 1;
+        let dummy_execution_block_hash = [1u8; 32].into();
 
         let client_state =
             ClientState::<{ ethereum_consensus::preset::minimal::PRESET.SYNC_COMMITTEE_SIZE }> {
@@ -149,7 +150,7 @@ mod tests {
                 epochs_per_sync_committee_period: PRESET.EPOCHS_PER_SYNC_COMMITTEE_PERIOD,
                 ibc_address: Address(hex!("ff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F")),
                 ibc_commitments_slot: keccak256("ibc_commitments_slot"),
-                trust_level: Fraction::new(2, 3),
+                trust_level: Fraction::new(2, 3).unwrap(),
                 trusting_period: Duration::from_secs(60 * 60 * 27),
                 max_clock_drift: Duration::from_secs(60),
                 latest_execution_block_number: 1.into(),
@@ -184,6 +185,7 @@ mod tests {
                 base_finalized_epoch,
                 dummy_execution_state_root,
                 dummy_execution_block_number.into(),
+                dummy_execution_block_hash,
                 current_sync_committee,
                 scm.get_committee(base_store_period + 1),
                 true,
@@ -234,6 +236,7 @@ mod tests {
                 base_finalized_epoch + ctx.epochs_per_sync_committee_period(),
                 dummy_execution_state_root,
                 dummy_execution_block_number.into(),
+                dummy_execution_block_hash,
                 current_sync_committee,
                 scm.get_committee(base_store_period + 2),
                 true,
@@ -285,6 +288,7 @@ mod tests {
                 base_finalized_epoch + ctx.epochs_per_sync_committee_period(),
                 dummy_execution_state_root,
                 dummy_execution_block_number.into(),
+                dummy_execution_block_hash,
                 current_sync_committee,
                 scm.get_committee(base_store_period + 2),
                 false,
@@ -324,6 +328,7 @@ mod tests {
                 base_finalized_epoch - ctx.epochs_per_sync_committee_period(),
                 dummy_execution_state_root,
                 dummy_execution_block_number.into(),
+                dummy_execution_block_hash,
                 current_sync_committee,
                 scm.get_committee(base_store_period),
                 true,

proto/definitions/ibc/lightclients/ethereum/v1/ethereum.proto

@@ -72,6 +72,7 @@ message ForkSpec {
   uint32 execution_payload_gindex = 4;
   uint32 execution_payload_state_root_gindex = 5;
   uint32 execution_payload_block_number_gindex = 6;
+  uint32 execution_payload_block_hash_gindex = 7;
 }
 
 message ConsensusUpdate {
@@ -101,6 +102,8 @@ message ExecutionUpdate {
   repeated bytes state_root_branch = 2;
   uint64 block_number = 3;
   repeated bytes block_number_branch = 4;
+  bytes block_hash = 5;
+  repeated bytes block_hash_branch = 6;
 }
 
 message AccountUpdate {

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

@@ -120,6 +120,8 @@ pub struct ForkSpec {
     pub execution_payload_state_root_gindex: u32,
     #[prost(uint32, tag = "6")]
     pub execution_payload_block_number_gindex: u32,
+    #[prost(uint32, tag = "7")]
+    pub execution_payload_block_hash_gindex: u32,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -174,6 +176,10 @@ pub struct ExecutionUpdate {
     pub block_number: u64,
     #[prost(bytes = "vec", repeated, tag = "4")]
     pub block_number_branch: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    #[prost(bytes = "vec", tag = "5")]
+    pub block_hash: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", repeated, tag = "6")]
+    pub block_hash_branch: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]