Merge pull request #142 from input-output-hk/golddydev/refactor-epoch-activity

refactor: add rollback support to epoch activity counter

Author: sandtreader

Cargo.lock

@@ -1,4 +1,4 @@
-use crate::{messages::EpochActivityMessage, KeyHash};
+use crate::{messages::EpochActivityMessage, protocol_params::ProtocolParams, KeyHash};
 
 pub const DEFAULT_EPOCHS_QUERY_TOPIC: (&str, &str) =
     ("epochs-state-query-topic", "cardano.query.epochs");
@@ -16,6 +16,7 @@ pub enum EpochsStateQuery {
 
     // Pools related queries
     GetBlocksMintedByPools { vrf_key_hashes: Vec<KeyHash> },
+    GetTotalBlocksMintedByPools { vrf_key_hashes: Vec<KeyHash> },
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
@@ -31,6 +32,7 @@ pub enum EpochsStateQueryResponse {
 
     // Pools related responses
     BlocksMintedByPools(BlocksMintedByPools),
+    TotalBlocksMintedByPools(TotalBlocksMintedByPools),
 
     NotFound,
     Error(String),
@@ -42,7 +44,14 @@ pub struct LatestEpoch {
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct EpochInfo {}
+pub struct LatestEpochParameters {
+    pub parameters: ProtocolParams,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct EpochInfo {
+    pub epoch: EpochActivityMessage,
+}
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct NextEpochs {}
@@ -67,3 +76,9 @@ pub struct BlocksMintedByPools {
     // this is in same order of vrf_key_hashes from EpochsStateQuery::BlocksMintedByPools
     pub blocks_minted: Vec<u64>,
 }
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct TotalBlocksMintedByPools {
+    // this is in same order of vrf_key_hashes from EpochsStateQuery::TotalBlocksMinted
+    pub total_blocks_minted: Vec<u64>,
+}

common/src/queries/epochs.rs

@@ -13,10 +13,6 @@ pub enum PoolsStateQuery {
         pools_operators: Vec<Vec<u8>>,
         epoch: u64,
     },
-    // Get total blocks minted for each vrf vkey hashes (not included current epoch's blocks minted)
-    GetPoolsTotalBlocksMinted {
-        vrf_key_hashes: Vec<Vec<u8>>,
-    },
     GetPoolInfo {
         pool_id: Vec<u8>,
     },
@@ -50,7 +46,6 @@ pub enum PoolsStateQueryResponse {
     PoolsRetiredList(PoolsRetiredList),
     PoolsRetiringList(PoolsRetiringList),
     PoolsActiveStakes(PoolsActiveStakes),
-    PoolsTotalBlocksMinted(PoolsTotalBlocksMinted),
     PoolInfo(PoolInfo),
     PoolHistory(PoolHistory),
     PoolMetadata(PoolMetadata),
@@ -92,12 +87,6 @@ pub struct PoolsActiveStakes {
     pub total_active_stake: u64,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct PoolsTotalBlocksMinted {
-    // this is in same order of vrf_key_hashes from PoolsStateQuery::GetPoolsTotalBlocksMinted
-    pub total_blocks_minted: Vec<u64>,
-}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct PoolInfo {}
 

common/src/queries/pools.rs

@@ -19,6 +19,8 @@ tracing = "0.1.40"
 serde = { version = "1.0.214", features = ["derive"] }
 serde_json = "1.0.132"
 hex = "0.4.3"
+dashmap = "6.1.0"
+imbl = "6.0.0"
 
 [lib]
 path = "src/epoch_activity_counter.rs"