fix: use Hash for shelley genesis hash type

Author: golddydev

common/src/genesis_values.rs

@@ -1,8 +1,11 @@
+use std::str::FromStr;
+
 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 =
@@ -13,7 +16,7 @@ pub struct GenesisValues {
     pub byron_timestamp: u64,
     pub shelley_epoch: u64,
     pub shelley_epoch_len: u64,
-    pub shelley_genesis_hash: [u8; 32],
+    pub shelley_genesis_hash: Hash<32>,
     pub genesis_delegs: GenesisDelegates,
 }
 
@@ -23,10 +26,7 @@ impl GenesisValues {
             byron_timestamp: 1506203091,
             shelley_epoch: 208,
             shelley_epoch_len: 432000,
-            shelley_genesis_hash: hex::decode(MAINNET_SHELLEY_GENESIS_HASH)
-                .unwrap()
-                .try_into()
-                .unwrap(),
+            shelley_genesis_hash: Hash::<32>::from_str(MAINNET_SHELLEY_GENESIS_HASH).unwrap(),
             genesis_delegs: GenesisDelegates::try_from(vec![
                 (
                     "ad5463153dc3d24b9ff133e46136028bdc1edbb897f5a7cf1b37950c",

common/src/types.rs

@@ -1765,8 +1765,8 @@ impl Voter {
 impl Display for Voter {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self.to_bech32() {
-            Ok(addr) => write!(f, "{}", addr),
-            Err(e) => write!(f, "<invalid voter: {}>", e),
+            Ok(addr) => write!(f, "{addr}"),
+            Err(e) => write!(f, "<invalid voter: {e}>"),
         }
     }
 }

modules/genesis_bootstrapper/src/genesis_bootstrapper.rs

@@ -3,6 +3,7 @@
 
 use acropolis_common::{
     genesis_values::GenesisValues,
+    hash::Hash,
     messages::{
         CardanoMessage, GenesisCompleteMessage, GenesisUTxOsMessage, Message, PotDeltasMessage,
         UTXODeltasMessage,
@@ -41,11 +42,11 @@ const SANCHONET_SHELLEY_START_EPOCH: u64 = 0;
 // Initial reserves (=maximum ever Lovelace supply)
 const INITIAL_RESERVES: Lovelace = 45_000_000_000_000_000;
 
-fn hash_genesis_bytes(raw_bytes: &[u8]) -> [u8; 32] {
+fn hash_genesis_bytes(raw_bytes: &[u8]) -> Hash<32> {
     let mut hasher = Blake2b::<U32>::new();
     hasher.update(raw_bytes);
     let hash: [u8; 32] = hasher.finalize().into();
-    hash
+    Hash::<32>::new(hash)
 }
 
 /// Genesis bootstrapper module

modules/snapshot_bootstrapper/src/snapshot_bootstrapper.rs

@@ -1,7 +1,8 @@
-use std::sync::Arc;
+use std::{str::FromStr, sync::Arc};
 
 use acropolis_common::{
     genesis_values::GenesisValues,
+    hash::Hash,
     messages::{CardanoMessage, GenesisCompleteMessage, Message},
     snapshot::{
         streaming_snapshot::{
@@ -86,12 +87,11 @@ impl SnapshotHandler {
             byron_timestamp: 1506203091, // Byron mainnet genesis timestamp
             shelley_epoch: 208,          // Shelley started at epoch 208 on mainnet
             shelley_epoch_len: 432000,   // 5 days in seconds
-            shelley_genesis_hash: [
-                // Shelley mainnet genesis hash (placeholder - should be from config)
-                0x1a, 0x3d, 0x98, 0x7a, 0x95, 0xad, 0xd2, 0x3e, 0x4f, 0x4d, 0x2d, 0x78, 0x74, 0x9f,
-                0x96, 0x65, 0xd4, 0x1e, 0x48, 0x3e, 0xf2, 0xa2, 0x22, 0x9c, 0x4b, 0x0b, 0xf3, 0x9f,
-                0xad, 0x7d, 0x5e, 0x27,
-            ],
+            // Shelley mainnet genesis hash (placeholder - should be from config)
+            shelley_genesis_hash: Hash::<32>::from_str(
+                "1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81",
+            )
+            .unwrap(),
             genesis_delegs: GenesisDelegates::try_from(vec![]).unwrap(),
         })
     }