use correct consensus state root

informalsystems · Jun 11, 2024 · cc11b18 · cc11b18
1 parent 8cf305b
commit cc11b18
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/modules/sov-consensus-state-tracker/src/celestia_da.rs b/modules/sov-consensus-state-tracker/src/celestia_da.rs
@@ -11,8 +11,8 @@ use sov_rollup_interface::da::BlockHeaderTrait;
 use crate::HasConsensusState;
 
 impl HasConsensusState for CelestiaSpec {
-    fn consensus_state(header: &CelestiaHeader) -> HostConsensusState {
-        let sovereign_params = CommitmentRoot::from_bytes(header.hash().as_ref()).into();
+    fn consensus_state(header: &CelestiaHeader, user_hash: [u8; 32]) -> HostConsensusState {
+        let sovereign_params = CommitmentRoot::from_bytes(&user_hash).into();
 
         let da_params = TmConsensusParams::new(
             tendermint::Time::from_unix_timestamp(

diff --git a/modules/sov-consensus-state-tracker/src/lib.rs b/modules/sov-consensus-state-tracker/src/lib.rs
@@ -18,7 +18,7 @@ use sov_state::Storage;
 /// Implement HasConsensusState for all DaSpecs that you wish to support, and
 /// extract the consensus state from the header.
 pub trait HasConsensusState: DaSpec {
-    fn consensus_state(header: &Self::BlockHeader) -> HostConsensusState;
+    fn consensus_state(header: &Self::BlockHeader, user_hash: [u8; 32]) -> HostConsensusState;
 }
 
 #[derive(Clone)]
@@ -137,7 +137,7 @@ where
                 .host_height_map
                 .set(&height, kernel_working_set.inner);
 
-            let consensus_state = Da::consensus_state(slot_header);
+            let consensus_state = Da::consensus_state(slot_header, pre_state_root.clone().into());
 
             self.ibc.host_timestamp_map.set(
                 &consensus_state.timestamp().into(),

diff --git a/modules/sov-consensus-state-tracker/src/mock_da.rs b/modules/sov-consensus-state-tracker/src/mock_da.rs
@@ -11,8 +11,8 @@ use sov_rollup_interface::da::BlockHeaderTrait;
 use crate::HasConsensusState;
 
 impl HasConsensusState for MockDaSpec {
-    fn consensus_state(header: &Self::BlockHeader) -> HostConsensusState {
-        let sovereign_params = CommitmentRoot::from_bytes(header.hash().as_ref()).into();
+    fn consensus_state(header: &Self::BlockHeader, user_hash: [u8; 32]) -> HostConsensusState {
+        let sovereign_params = CommitmentRoot::from_bytes(&user_hash).into();
 
         let da_params = TmConsensusParams::new(
             tendermint::Time::from_unix_timestamp(