wip: dump state tools

Author: SmaGMan

block-util/src/state/shard_state_stuff.rs

@@ -137,7 +137,7 @@ impl ShardStateStuff {
         state.gen_utime as u64 * 1000 + state.gen_utime_ms as u64
     }
 
-    pub fn get_top_shards(&self) -> Result<Vec<ShardIdent>> {
+    pub fn get_all_top_shards(&self) -> Result<Vec<ShardIdent>> {
         let mut res = vec![self.block_id().shard];
 
         for item in self.shards()?.latest_blocks() {
@@ -147,6 +147,20 @@ impl ShardStateStuff {
 
         Ok(res)
     }
+
+    pub fn get_top_shard_blocks_info(&self) -> Result<Vec<(BlockId, bool)>> {
+        let mut res = vec![];
+
+        for item in self.shards()?.iter() {
+            let (shard_id, shard_descr) = item?;
+            res.push((
+                shard_descr.as_block_id(shard_id),
+                shard_descr.top_sc_block_updated,
+            ));
+        }
+
+        Ok(res)
+    }
 }
 
 impl AsRef<ShardStateUnsplit> for ShardStateStuff {

cli/src/node/mod.rs

@@ -327,7 +327,7 @@ impl Node {
 
         // We should clear uncommitted queue state because it may contain incorrect diffs
         // that were created before node restart. We will restore queue strictly above last committed state
-        let top_shards = mc_state.get_top_shards()?;
+        let top_shards = mc_state.get_all_top_shards()?;
         message_queue_adapter.clear_uncommitted_state(&top_shards)?;
 
         let validator = ValidatorStdImpl::new(

collator/src/collator/do_collate/finalize.rs

@@ -156,6 +156,7 @@ impl Phase<FinalizeState> {
             let finalize_message_reader_res = messages_reader.finalize(
                 self.extra.executor.min_next_lt(),
                 &other_updated_top_shard_diffs_info,
+                true,
             )?;
             create_queue_diff_elapsed = histogram_create_queue_diff.finish();
             finalize_message_reader_res

collator/src/collator/messages_reader/mod.rs

@@ -435,6 +435,7 @@ impl<V: InternalMessageValue> MessagesReader<V> {
             ShardIdent,
             (PartitionRouter, DiffStatistics),
         >,
+        check_for_unprocessed_messages: bool,
     ) -> Result<FinalizedMessagesReader<V>> {
         let mut has_unprocessed_messages = self.has_messages_in_buffers()
             || self.has_pending_new_messages()
@@ -444,7 +445,7 @@ impl<V: InternalMessageValue> MessagesReader<V> {
         let mut internals_reader_state = InternalsReaderState::default();
         for (_par_id, par_reader) in self.internals_partition_readers.iter_mut() {
             // check pending internals in iterators
-            if !has_unprocessed_messages {
+            if !has_unprocessed_messages && check_for_unprocessed_messages {
                 has_unprocessed_messages = par_reader.check_has_pending_internals_in_iterators()?;
             }