fix: sovereign state root in host consensus states (#178)

* use correct consensus state root * log instructions * use tracing::info
informalsystems · Jun 11, 2024 · 3ffd922 · 3ffd922
1 parent 296bf57
commit 3ffd922
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modules/sov-consensus-state-tracker/Cargo.toml b/modules/sov-consensus-state-tracker/Cargo.toml
@@ -23,6 +23,7 @@ serde      = { workspace = true }
 serde_json = { workspace = true, optional = true }
 thiserror  = { workspace = true }
 uint       = "0.9"
+tracing    = { workspace = true }
 
 # ibc dependencies
 ibc-app-transfer = { workspace = true, features = [ "borsh", "schema" ] }

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
@@ -14,11 +14,12 @@ use sov_modules_api::kernel_state::BootstrapWorkingSet;
 use sov_modules_api::runtime::capabilities::{BatchSelector, Kernel, KernelSlotHooks};
 use sov_modules_api::{DaSpec, Gas, KernelModule, KernelWorkingSet, Spec, StateCheckpoint};
 use sov_state::Storage;
+use tracing::info;
 
 /// 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 +138,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(),
@@ -149,6 +150,8 @@ where
                 &consensus_state,
                 kernel_working_set.inner,
             );
+
+            info!("Host ConsensusState is stored at {height}: {consensus_state:?}");
         }
 
         gas_price

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(