Refactor: Replace gen_delegs Vec<u8> with PoolId

Author: lowhung

codec/src/block.rs

@@ -1,22 +1,22 @@
 use acropolis_common::{
-    GenesisDelegate, HeavyDelegate, crypto::keyhash_224, queries::blocks::BlockIssuer,
+    GenesisDelegate, HeavyDelegate, PoolId, crypto::keyhash_224, queries::blocks::BlockIssuer,
 };
 use pallas_primitives::byron::BlockSig::DlgSig;
 use pallas_traverse::MultiEraHeader;
 use std::collections::HashMap;
 
 pub fn map_to_block_issuer(
     header: &MultiEraHeader,
-    byron_heavy_delegates: &HashMap<Vec<u8>, HeavyDelegate>,
-    shelley_genesis_delegates: &HashMap<Vec<u8>, GenesisDelegate>,
+    byron_heavy_delegates: &HashMap<PoolId, HeavyDelegate>,
+    shelley_genesis_delegates: &HashMap<PoolId, GenesisDelegate>,
 ) -> Option<BlockIssuer> {
     match header.issuer_vkey() {
         Some(vkey) => match header {
             MultiEraHeader::ShelleyCompatible(_) => {
                 let digest = keyhash_224(vkey);
                 if let Some(issuer) = shelley_genesis_delegates
                     .values()
-                    .find(|v| v.delegate == digest.to_vec())
+                    .find(|v| v.delegate == digest)
                     .map(|i| BlockIssuer::GenesisDelegate(i.clone()))
                 {
                     Some(issuer)

common/src/protocol_params.rs

@@ -2,7 +2,7 @@ use crate::{
     genesis_values::GenesisValues,
     rational_number::{ChameleonFraction, RationalNumber},
     BlockHash, BlockVersionData, Committee, Constitution, CostModel, DRepVotingThresholds, Era,
-    ExUnitPrices, ExUnits, GenesisDelegate, HeavyDelegate, NetworkId, PoolVotingThresholds,
+    ExUnitPrices, ExUnits, GenesisDelegate, HeavyDelegate, NetworkId, PoolId, PoolVotingThresholds,
     ProtocolConsts,
 };
 use anyhow::{bail, Result};
@@ -34,7 +34,7 @@ pub struct ByronParams {
     pub start_time: u64,
 
     #[serde_as(as = "Vec<(_, _)>")]
-    pub heavy_delegation: HashMap<Vec<u8>, HeavyDelegate>,
+    pub heavy_delegation: HashMap<PoolId, HeavyDelegate>,
 }
 
 //
@@ -131,7 +131,7 @@ pub struct ShelleyParams {
     pub update_quorum: u32,
 
     #[serde_as(as = "HashMap<Hex, _>")]
-    pub gen_delegs: HashMap<Vec<u8>, GenesisDelegate>,
+    pub gen_delegs: HashMap<PoolId, GenesisDelegate>,
 }
 
 #[serde_as]

common/src/types.rs

@@ -1350,7 +1350,7 @@ pub struct HeavyDelegate {
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct GenesisDelegate {
     #[serde_as(as = "Hex")]
-    pub delegate: Vec<u8>,
+    pub delegate: Hash<28>,
     #[serde_as(as = "Hex")]
     pub vrf: Vec<u8>,
 }

modules/accounts_state/src/monetary.rs

@@ -108,11 +108,11 @@ fn calculate_monetary_expansion(
 mod tests {
     use super::*;
     use acropolis_common::rational_number::rational_number_from_f32;
-    use acropolis_common::NetworkId;
     use acropolis_common::{
         protocol_params::{Nonce, NonceVariant, ProtocolVersion, ShelleyProtocolParams},
         GenesisDelegate,
     };
+    use acropolis_common::{NetworkId, PoolId};
     use chrono::{DateTime, Utc};
     use std::collections::HashMap;
 
@@ -175,7 +175,7 @@ mod tests {
             slots_per_kes_period: 129600,
             system_start: DateTime::<Utc>::default(),
             update_quorum: 5,
-            gen_delegs: HashMap::<Vec<u8>, GenesisDelegate>::new(),
+            gen_delegs: HashMap::<PoolId, GenesisDelegate>::new(),
         }
     }
 

modules/chain_store/src/chain_store.rs

@@ -12,7 +12,7 @@ use acropolis_common::{
     },
     queries::misc::Order,
     state_history::{StateHistory, StateHistoryStore},
-    BechOrdAddress, BlockHash, GenesisDelegate, HeavyDelegate, TxHash,
+    BechOrdAddress, BlockHash, GenesisDelegate, HeavyDelegate, PoolId, TxHash,
 };
 use anyhow::{bail, Result};
 use caryatid_sdk::{module, Context, Module};
@@ -525,8 +525,8 @@ impl ChainStore {
 
 #[derive(Default, Debug, Clone)]
 pub struct State {
-    pub byron_heavy_delegates: HashMap<Vec<u8>, HeavyDelegate>,
-    pub shelley_genesis_delegates: HashMap<Vec<u8>, GenesisDelegate>,
+    pub byron_heavy_delegates: HashMap<PoolId, HeavyDelegate>,
+    pub shelley_genesis_delegates: HashMap<PoolId, GenesisDelegate>,
 }
 
 impl State {

modules/parameters_state/src/genesis_params.rs

@@ -3,7 +3,7 @@ use acropolis_common::{
     protocol_params::{AlonzoParams, BabbageParams, ByronParams, ConwayParams, ShelleyParams},
     rational_number::{rational_number_from_f32, RationalNumber},
     Anchor, BlockVersionData, Committee, Constitution, CostModel, Credential, DRepVotingThresholds,
-    Era, HeavyDelegate, PoolVotingThresholds, ProtocolConsts, SoftForkRule, TxFeePolicy,
+    Era, HeavyDelegate, PoolId, PoolVotingThresholds, ProtocolConsts, SoftForkRule, TxFeePolicy,
 };
 use anyhow::{anyhow, bail, Result};
 use base64::prelude::*;
@@ -183,13 +183,13 @@ fn map_byron(genesis: &byron::GenesisFile) -> Result<ByronParams> {
         .heavy_delegation
         .iter()
         .map(|(k, v)| {
-            let k = hex::decode(k)?;
+            let k = PoolId::try_from(decode(k)?)?;
             let v = HeavyDelegate {
-                cert: hex::decode(v.cert.clone())?,
+                cert: decode(v.cert.clone())?,
                 delegate_pk: BASE64_STANDARD.decode(v.delegate_pk.clone())?,
                 issuer_pk: BASE64_STANDARD.decode(v.issuer_pk.clone())?,
             };
-            Ok::<(Vec<u8>, HeavyDelegate), anyhow::Error>((k, v))
+            Ok::<(PoolId, HeavyDelegate), anyhow::Error>((k, v))
         })
         .collect::<Result<_, _>>()?;
     Ok(ByronParams {