fix: build errors

Author: golddydev

common/src/genesis_values.rs

@@ -1,76 +1,20 @@
-use std::collections::BTreeMap;
-
 use crate::{
     calculations::{
         epoch_to_first_slot_with_shelley_params, slot_to_epoch_with_shelley_params,
         slot_to_timestamp_with_params,
     },
-    hash::Hash,
+    GenesisDelegates,
 };
 const MAINNET_SHELLEY_GENESIS_HASH: &str =
     "1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81";
 
-pub type GenesisKey = Hash<28>;
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq)]
-pub struct GenDeleg {
-    // Pool Id
-    pub delegate: Hash<28>,
-    pub vrf: Hash<32>,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct GenesisDelegs(pub BTreeMap<GenesisKey, GenDeleg>);
-
-impl AsRef<BTreeMap<GenesisKey, GenDeleg>> for GenesisDelegs {
-    fn as_ref(&self) -> &BTreeMap<GenesisKey, GenDeleg> {
-        &self.0
-    }
-}
-
-impl From<Vec<(String, (String, String))>> for GenesisDelegs {
-    fn from(entries: Vec<(String, (String, String))>) -> Self {
-        let map = entries
-            .into_iter()
-            .map(|(key_hash, (delegate, vrf))| {
-                let key = Hash::new(
-                    hex::decode(key_hash)
-                        .expect("Invalid key hash hex string")
-                        .try_into()
-                        .expect("Invalid Genesis Key length"),
-                );
-                let delegate_hash = Hash::new(
-                    hex::decode(delegate)
-                        .expect("Invalid delegate hex string")
-                        .try_into()
-                        .expect("Invalid delegate hash length"),
-                );
-                let vrf_hash = Hash::new(
-                    hex::decode(vrf)
-                        .expect("Invalid VRF hex string")
-                        .try_into()
-                        .expect("Invalid VRF hash length"),
-                );
-                (
-                    key,
-                    GenDeleg {
-                        delegate: delegate_hash,
-                        vrf: vrf_hash,
-                    },
-                )
-            })
-            .collect();
-        GenesisDelegs(map)
-    }
-}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct GenesisValues {
     pub byron_timestamp: u64,
     pub shelley_epoch: u64,
     pub shelley_epoch_len: u64,
     pub shelley_genesis_hash: [u8; 32],
-    pub genesis_delegs: GenesisDelegs,
+    pub genesis_delegs: GenesisDelegates,
 }
 
 impl GenesisValues {
@@ -83,64 +27,58 @@ impl GenesisValues {
                 .unwrap()
                 .try_into()
                 .unwrap(),
-            genesis_delegs: GenesisDelegs::from(vec![
+            genesis_delegs: GenesisDelegates::try_from(vec![
                 (
-                    "ad5463153dc3d24b9ff133e46136028bdc1edbb897f5a7cf1b37950c".to_string(),
+                    "ad5463153dc3d24b9ff133e46136028bdc1edbb897f5a7cf1b37950c",
                     (
-                        "d9e5c76ad5ee778960804094a389f0b546b5c2b140a62f8ec43ea54d".to_string(),
-                        "64fa87e8b29a5b7bfbd6795677e3e878c505bc4a3649485d366b50abadec92d7"
-                            .to_string(),
+                        "d9e5c76ad5ee778960804094a389f0b546b5c2b140a62f8ec43ea54d",
+                        "64fa87e8b29a5b7bfbd6795677e3e878c505bc4a3649485d366b50abadec92d7",
                     ),
                 ),
                 (
-                    "b9547b8a57656539a8d9bc42c008e38d9c8bd9c8adbb1e73ad529497".to_string(),
+                    "b9547b8a57656539a8d9bc42c008e38d9c8bd9c8adbb1e73ad529497",
                     (
-                        "855d6fc1e54274e331e34478eeac8d060b0b90c1f9e8a2b01167c048".to_string(),
-                        "66d5167a1f426bd1adcc8bbf4b88c280d38c148d135cb41e3f5a39f948ad7fcc"
-                            .to_string(),
+                        "855d6fc1e54274e331e34478eeac8d060b0b90c1f9e8a2b01167c048",
+                        "66d5167a1f426bd1adcc8bbf4b88c280d38c148d135cb41e3f5a39f948ad7fcc",
                     ),
                 ),
                 (
-                    "60baee25cbc90047e83fd01e1e57dc0b06d3d0cb150d0ab40bbfead1".to_string(),
+                    "60baee25cbc90047e83fd01e1e57dc0b06d3d0cb150d0ab40bbfead1",
                     (
-                        "7f72a1826ae3b279782ab2bc582d0d2958de65bd86b2c4f82d8ba956".to_string(),
-                        "c0546d9aa5740afd569d3c2d9c412595cd60822bb6d9a4e8ce6c43d12bd0f674"
-                            .to_string(),
+                        "7f72a1826ae3b279782ab2bc582d0d2958de65bd86b2c4f82d8ba956",
+                        "c0546d9aa5740afd569d3c2d9c412595cd60822bb6d9a4e8ce6c43d12bd0f674",
                     ),
                 ),
                 (
-                    "f7b341c14cd58fca4195a9b278cce1ef402dc0e06deb77e543cd1757".to_string(),
+                    "f7b341c14cd58fca4195a9b278cce1ef402dc0e06deb77e543cd1757",
                     (
-                        "69ae12f9e45c0c9122356c8e624b1fbbed6c22a2e3b4358cf0cb5011".to_string(),
-                        "6394a632af51a32768a6f12dac3485d9c0712d0b54e3f389f355385762a478f2"
-                            .to_string(),
+                        "69ae12f9e45c0c9122356c8e624b1fbbed6c22a2e3b4358cf0cb5011",
+                        "6394a632af51a32768a6f12dac3485d9c0712d0b54e3f389f355385762a478f2",
                     ),
                 ),
                 (
-                    "162f94554ac8c225383a2248c245659eda870eaa82d0ef25fc7dcd82".to_string(),
+                    "162f94554ac8c225383a2248c245659eda870eaa82d0ef25fc7dcd82",
                     (
-                        "4485708022839a7b9b8b639a939c85ec0ed6999b5b6dc651b03c43f6".to_string(),
-                        "aba81e764b71006c515986bf7b37a72fbb5554f78e6775f08e384dbd572a4b32"
-                            .to_string(),
+                        "4485708022839a7b9b8b639a939c85ec0ed6999b5b6dc651b03c43f6",
+                        "aba81e764b71006c515986bf7b37a72fbb5554f78e6775f08e384dbd572a4b32",
                     ),
                 ),
                 (
-                    "2075a095b3c844a29c24317a94a643ab8e22d54a3a3a72a420260af6".to_string(),
+                    "2075a095b3c844a29c24317a94a643ab8e22d54a3a3a72a420260af6",
                     (
-                        "6535db26347283990a252313a7903a45e3526ec25ddba381c071b25b".to_string(),
-                        "fcaca997b8105bd860876348fc2c6e68b13607f9bbd23515cd2193b555d267af"
-                            .to_string(),
+                        "6535db26347283990a252313a7903a45e3526ec25ddba381c071b25b",
+                        "fcaca997b8105bd860876348fc2c6e68b13607f9bbd23515cd2193b555d267af",
                     ),
                 ),
                 (
-                    "268cfc0b89e910ead22e0ade91493d8212f53f3e2164b2e4bef0819b".to_string(),
+                    "268cfc0b89e910ead22e0ade91493d8212f53f3e2164b2e4bef0819b",
                     (
-                        "1d4f2e1fda43070d71bb22a5522f86943c7c18aeb4fa47a362c27e23".to_string(),
-                        "63ef48bc5355f3e7973100c371d6a095251c80ceb40559f4750aa7014a6fb6db"
-                            .to_string(),
+                        "1d4f2e1fda43070d71bb22a5522f86943c7c18aeb4fa47a362c27e23",
+                        "63ef48bc5355f3e7973100c371d6a095251c80ceb40559f4750aa7014a6fb6db",
                     ),
                 ),
-            ]),
+            ])
+            .unwrap(),
         }
     }
 

common/src/ouroboros/overlay_schedule.rs

@@ -6,18 +6,17 @@
 //! https://github.com/IntersectMBO/cardano-ledger/blob/24ef1741c5e0109e4d73685a24d8e753e225656d/libs/cardano-protocol-tpraos/src/Cardano/Protocol/TPraos/Rules/Overlay.hs#L332
 
 use crate::{
-    genesis_values::{GenDeleg, GenesisDelegs, GenesisKey},
-    rational_number::RationalNumber,
-    rest_helper::ToCheckedF64,
+    rational_number::RationalNumber, rest_helper::ToCheckedF64, GenesisDelegate, GenesisDelegates,
+    GenesisKeyhash,
 };
 use anyhow::Result;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum OBftSlot {
     /// Overlay slot but no block should be produced (rare edge case)
     NonActiveSlot,
     /// Active overlay slot reserved for specific genesis key
-    ActiveSlot(GenesisKey, GenDeleg),
+    ActiveSlot(GenesisKeyhash, GenesisDelegate),
 }
 
 /// Determine if the given slot is reserved for the overlay schedule.
@@ -57,7 +56,7 @@ pub fn is_overlay_slot(epoch_slot: u64, decentralisation_param: &RationalNumber)
 /// Classification of the slot (NonActiveSlot or ActiveSlot with genesis key)
 pub fn classify_overlay_slot(
     epoch_slot: u64,
-    genesis_delegs: &GenesisDelegs,
+    genesis_delegs: &GenesisDelegates,
     decentralisation_param: &RationalNumber,
     active_slots_coeff: &RationalNumber,
 ) -> Result<OBftSlot> {
@@ -105,7 +104,7 @@ pub fn classify_overlay_slot(
 /// - active_slots_coeff is not a valid rational number
 pub fn lookup_in_overlay_schedule(
     epoch_slot: u64,
-    genesis_delegs: &GenesisDelegs,
+    genesis_delegs: &GenesisDelegates,
     decentralisation_param: &RationalNumber,
     active_slots_coeff: &RationalNumber,
 ) -> Result<Option<OBftSlot>> {

common/src/ouroboros/praos.rs

@@ -9,7 +9,7 @@ use crate::ouroboros::vrf_validation::{
 use crate::protocol_params::Nonce;
 use crate::rational_number::RationalNumber;
 use crate::{protocol_params::PraosParams, BlockInfo};
-use crate::{KeyHash, PoolId};
+use crate::{PoolId, VrfKeyHash};
 use anyhow::Result;
 use pallas::ledger::primitives::VrfCert;
 use pallas::ledger::traverse::MultiEraHeader;
@@ -19,7 +19,7 @@ pub fn validate_vrf_praos<'a>(
     header: &'a MultiEraHeader,
     epoch_nonce: &'a Nonce,
     praos_params: &'a PraosParams,
-    active_spos: &'a HashMap<PoolId, KeyHash>,
+    active_spos: &'a HashMap<PoolId, VrfKeyHash>,
     active_spdd: &'a HashMap<PoolId, u64>,
     total_active_stake: u64,
 ) -> Result<Vec<VrfValidation<'a>>, VrfValidationError> {
@@ -28,7 +28,7 @@ pub fn validate_vrf_praos<'a>(
     let Some(issuer_vkey) = header.issuer_vkey() else {
         return Ok(vec![Box::new(|| Err(VrfValidationError::MissingIssuerKey))]);
     };
-    let pool_id: PoolId = keyhash_224(issuer_vkey);
+    let pool_id = PoolId::from(keyhash_224(issuer_vkey));
     let registered_vrf_key_hash =
         active_spos.get(&pool_id).ok_or(VrfValidationError::UnknownPool {
             pool_id: pool_id.clone(),
@@ -87,8 +87,8 @@ fn vrf_result<'a>(header: &'a MultiEraHeader) -> Option<&'a VrfCert> {
 #[cfg(test)]
 mod tests {
     use crate::{
-        crypto::keyhash_256, protocol_params::NonceHash, serialization::Bech32WithHrp, BlockHash,
-        BlockStatus, Era,
+        crypto::keyhash_256, protocol_params::NonceHash, serialization::Bech32Conversion,
+        BlockHash, BlockStatus, Era,
     };
 
     use super::*;
@@ -124,14 +124,12 @@ mod tests {
         };
         let block_header =
             MultiEraHeader::decode(block_info.era as u8, None, &block_header_7854823).unwrap();
-        let pool_id = Vec::<u8>::from_bech32_with_hrp(
-            "pool195gdnmj6smzuakm4etxsxw3fgh8asqc4awtcskpyfnkpcvh2v8t",
-            "pool",
-        )
-        .unwrap();
+        let pool_id =
+            PoolId::from_bech32("pool195gdnmj6smzuakm4etxsxw3fgh8asqc4awtcskpyfnkpcvh2v8t")
+                .unwrap();
         let active_spos = HashMap::from([(
             pool_id.clone(),
-            keyhash_256(block_header.vrf_vkey().unwrap()),
+            VrfKeyHash::from(keyhash_256(block_header.vrf_vkey().unwrap())),
         )]);
         let active_spdd = HashMap::from([(pool_id.clone(), 64590523391239)]);
         let result = validate_vrf_praos(