Merge pull request cosmos#173 from octopus-network/feature/beefy-m2

Add block hash comparism in block header verification.

modules/src/clients/ics10_grandpa/client_def.rs

@@ -95,24 +95,17 @@ impl ClientDef for GrandpaClient {
         let mmr_leaf_hash = beefy_merkle_tree::Keccak256::hash(&mmr_leaf_encode[..]);
         let mmr_leaf = beefy_light_client::mmr::MmrLeaf::from(header.clone().mmr_leaf);
 
-        let header_hash = header.hash();
-
         if mmr_leaf.parent_number_and_hash.1.is_empty() {
             return Err(Error::empty_mmr_leaf_parent_hash_mmr_root());
         }
-        tracing::trace!(
-            "ics1 client_def :[check_header_and_update_state] >> header_hash = {:?}",
-            header_hash
-        );
         tracing::trace!(
             "ics1 client_def :[check_header_and_update_state] >> parent_mmr_root = {:?}",
             mmr_leaf.parent_number_and_hash.1
         );
 
-        /*            if header_hash != mmr_leaf.parent_number_and_hash.1 {
+        if header.block_header.parent_hash != mmr_leaf.parent_number_and_hash.1.to_vec() {
             return Err(Error::header_hash_not_match());
-        }*/
-        // Todo: Is this comparism needed?
+        }
 
         tracing::trace!(
             "in client_def: [check_header_and_update_state] >> mmr_root = {:?}",

relayer/src/chain/substrate.rs

@@ -663,8 +663,8 @@ impl ChainEndpoint for SubstrateChain {
         proto_msgs: TrackedMsgs,
     ) -> Result<Vec<TxResponse>, Error> {
         tracing::debug!(
-            "in substrate: [send_messages_and_wait_check_tx], raw msg to send {:?}",
-            proto_msgs
+            "in substrate: [send_messages_and_wait_check_tx], url of msg to send {:?}",
+            proto_msgs.messages().to_vec().iter().map(|value| value.type_url.clone()).collect::<Vec<String>>()
         );
 
         // sleep(Duration::from_secs(4));