Utxo counts

cli/src/cli.rs

@@ -782,10 +782,36 @@ impl KaspaCli {
                         .join(" "),
                     )
                 }
-                SyncState::UtxoSync { total, .. } => {
-                    Some([style("SYNC UTXO").red().to_string(), style(total.separated_string()).dim().to_string()].join(" "))
+                SyncState::PruningPointUTXOs { processed, total } => {
+                    let progress = (*processed as f64 / *total as f64).round() as u64;
+                    Some(
+                        [
+                            style("SYNC IBD Pruning Point UTXOs ").red().to_string(),
+                            style(format!("{} ({}%)", processed.separated_string(), progress)).dim().to_string(),
+                        ]
+                        .join(" "),
+                    )
+                }
+                SyncState::VirtualUTXOs { processed, total } => {
+                    let progress = (*processed as f64 / *total as f64).round() as u64;
+                    Some(
+                        [
+                            style("SYNC Virtual UTXOs").red().to_string(),
+                            style(format!("{} ({}%)", processed.separated_string(), progress)).dim().to_string(),
+                        ]
+                        .join(" "),
+                    )
+                }
+                SyncState::UtxoIndexUTXOs { processed, total } => {
+                    let progress = (*processed as f64 / *total as f64).round() as u64;
+                    Some(
+                        [
+                            style("SYNC UtxoIndex UTXOs").red().to_string(),
+                            style(format!("{} ({}%)", processed.separated_string(), progress)).dim().to_string(),
+                        ]
+                        .join(" "),
+                    )
                 }
-                SyncState::UtxoResync => Some([style("SYNC").red().to_string(), style("UTXO").black().to_string()].join(" ")),
                 SyncState::NotSynced => Some([style("SYNC").red().to_string(), style("...").black().to_string()].join(" ")),
                 SyncState::Synced { .. } => None,
             }

components/consensusmanager/src/session.rs

@@ -284,6 +284,10 @@ impl ConsensusSessionOwned {
         self.clone().spawn_blocking(move |c| c.get_virtual_utxos(from_outpoint, chunk_size, skip_first)).await
     }
 
+    pub async fn async_get_virtual_utxoset_count(&self) -> u64 {
+        self.clone().spawn_blocking(|c| c.get_virtual_utxoset_count()).await
+    }
+
     pub async fn async_get_tips(&self) -> Vec<Hash> {
         self.clone().spawn_blocking(|c| c.get_tips()).await
     }
@@ -408,6 +412,10 @@ impl ConsensusSessionOwned {
             .await
     }
 
+    pub async fn async_get_pruning_point_utxoset_count(&self) -> u64 {
+        self.clone().spawn_blocking(|c| c.get_pruning_point_utxoset_count()).await
+    }
+
     pub async fn async_get_missing_block_body_hashes(&self, high: Hash) -> ConsensusResult<Vec<Hash>> {
         self.clone().spawn_blocking(move |c| c.get_missing_block_body_hashes(high)).await
     }

consensus/core/src/api/mod.rs

@@ -187,6 +187,10 @@ pub trait ConsensusApi: Send + Sync {
         unimplemented!()
     }
 
+    fn get_virtual_utxoset_count(&self) -> u64 {
+        unimplemented!()
+    }
+
     fn get_tips(&self) -> Vec<Hash> {
         unimplemented!()
     }
@@ -324,6 +328,10 @@ pub trait ConsensusApi: Send + Sync {
         unimplemented!()
     }
 
+    fn get_pruning_point_utxoset_count(&self) -> u64 {
+        unimplemented!()
+    }
+
     fn get_missing_block_body_hashes(&self, high: Hash) -> ConsensusResult<Vec<Hash>> {
         unimplemented!()
     }

consensus/src/consensus/mod.rs

@@ -715,6 +715,10 @@ impl ConsensusApi for Consensus {
         iter.map(|item| item.unwrap()).collect()
     }
 
+    fn get_virtual_utxoset_count(&self) -> u64 {
+        self.virtual_stores.read().utxo_set.num_of_entries().unwrap()
+    }
+
     fn get_tips(&self) -> Vec<Hash> {
         self.body_tips_store.read().get().unwrap().read().iter().copied().collect_vec()
     }
@@ -747,6 +751,10 @@ impl ConsensusApi for Consensus {
         Ok(utxos)
     }
 
+    fn get_pruning_point_utxoset_count(&self) -> u64 {
+        self.pruning_utxoset_stores.read().utxo_set.num_of_entries().unwrap()
+    }
+
     fn modify_coinbase_payload(&self, payload: Vec<u8>, miner_data: &MinerData) -> CoinbaseResult<Vec<u8>> {
         self.services.coinbase_manager.modify_coinbase_payload(payload, miner_data)
     }

consensus/src/consensus/storage.rs

@@ -19,6 +19,7 @@ use crate::{
         tips::DbTipsStore,
         utxo_diffs::DbUtxoDiffsStore,
         utxo_multisets::DbUtxoMultisetsStore,
+        utxo_set::{self, UtxoSetStoreReader},
         virtual_state::{LkgVirtualState, VirtualStores},
         DB,
     },
@@ -28,6 +29,7 @@ use crate::{
 use super::cache_policy_builder::CachePolicyBuilder as PolicyBuilder;
 use itertools::Itertools;
 use kaspa_consensus_core::{blockstatus::BlockStatus, BlockHashSet};
+use kaspa_core::info;
 use kaspa_database::registry::DatabaseStorePrefixes;
 use kaspa_hashes::Hash;
 use parking_lot::RwLock;
@@ -239,6 +241,34 @@ impl ConsensusStorage {
         reachability::init(reachability_store.write().deref_mut()).unwrap();
         relations::init(reachability_relations_store.write().deref_mut());
 
+        // Ensure that the the `num_of_entries`` cached items are initialized for the utxo set stores.
+        // TODO: below inits should be removable with the next HF, a once off init should suffice.
+        if utxo_set::init(&mut pruning_utxoset_stores.write().utxo_set).unwrap() {
+            info!(
+                "Initialized the `num_of_entries` cached item db for the pruning utxoset with {0} entries",
+                pruning_utxoset_stores.write().utxo_set.num_of_entries().unwrap()
+            );
+        }
+
+        if utxo_set::init(&mut virtual_stores.write().utxo_set).unwrap() {
+            info!(
+                "Initialized the `num_of_entries` cached item db for the virtual utxoset with {0} entries",
+                virtual_stores.write().utxo_set.num_of_entries().unwrap()
+            );
+        }
+
+        // Sanity checks:
+        if config.enable_sanity_checks {
+            info!("Running sanity checks on the consensus storage, this may take a while...");
+            assert_eq!(
+                pruning_utxoset_stores.read().utxo_set.num_of_entries().unwrap(),
+                pruning_utxoset_stores.read().utxo_set.iterator().count() as u64
+            );
+            assert_eq!(
+                virtual_stores.read().utxo_set.num_of_entries().unwrap(),
+                virtual_stores.read().utxo_set.iterator().count() as u64
+            );
+        }
         Arc::new(Self {
             db,
             statuses_store,

consensus/src/model/stores/pruning_utxoset.rs

@@ -19,7 +19,12 @@ pub struct PruningUtxosetStores {
 impl PruningUtxosetStores {
     pub fn new(db: Arc<DB>, utxoset_cache_policy: CachePolicy) -> Self {
         Self {
-            utxo_set: DbUtxoSetStore::new(db.clone(), utxoset_cache_policy, DatabaseStorePrefixes::PruningUtxoset.into()),
+            utxo_set: DbUtxoSetStore::new(
+                db.clone(),
+                utxoset_cache_policy,
+                DatabaseStorePrefixes::PruningUtxoset.into(),
+                DatabaseStorePrefixes::PruningUtxosetCount.into(),
+            ),
             utxoset_position_access: CachedDbItem::new(db, DatabaseStorePrefixes::PruningUtxosetPosition.into()),
         }
     }