Replace AddrKeyhash with StakeAddress in spo_distribution_store.rs and use to_/from_binary to encode the entire stake address (network + hash) so we can retrieve the stake address out of it.

Author: lowhung

common/src/stake_addresses.rs

@@ -1467,14 +1467,8 @@ mod tests {
             let map = stake_addresses.get_drep_delegations_map(&addresses).unwrap();
 
             assert_eq!(map.len(), 3);
-            assert_eq!(
-                map.get(&addr1).unwrap(),
-                &Some(DRepChoice::Abstain)
-            );
-            assert_eq!(
-                map.get(&addr2).unwrap(),
-                &Some(DRepChoice::Key(DREP_HASH))
-            );
+            assert_eq!(map.get(&addr1).unwrap(), &Some(DRepChoice::Abstain));
+            assert_eq!(map.get(&addr2).unwrap(), &Some(DRepChoice::Key(DREP_HASH)));
             assert_eq!(map.get(&addr3).unwrap(), &None);
         }
 

modules/rest_blockfrost/src/handlers/governance.rs

@@ -4,10 +4,14 @@ use crate::types::{
     DRepInfoREST, DRepMetadataREST, DRepUpdateREST, DRepVoteREST, DRepsListREST, ProposalVoteREST,
     VoterRoleREST,
 };
-use acropolis_common::{messages::{Message, RESTResponse, StateQuery, StateQueryResponse}, queries::{
-    accounts::{AccountsStateQuery, AccountsStateQueryResponse},
-    governance::{GovernanceStateQuery, GovernanceStateQueryResponse},
-}, Credential, GovActionId, StakeAddress, TxHash, Voter};
+use acropolis_common::{
+    messages::{Message, RESTResponse, StateQuery, StateQueryResponse},
+    queries::{
+        accounts::{AccountsStateQuery, AccountsStateQueryResponse},
+        governance::{GovernanceStateQuery, GovernanceStateQueryResponse},
+    },
+    Credential, GovActionId, StakeAddress, TxHash, Voter,
+};
 use anyhow::{anyhow, Result};
 use caryatid_sdk::Context;
 use reqwest::Client;

modules/spo_state/src/state.rs

@@ -10,8 +10,8 @@ use acropolis_common::{
     params::TECHNICAL_PARAMETER_POOL_RETIRE_MAX_EPOCH,
     queries::governance::VoteRecord,
     stake_addresses::StakeAddressMap,
-    BlockInfo, PoolId, PoolMetadata, PoolRegistration, PoolRetirement, PoolUpdateEvent,
-    Relay, StakeAddress, TxCertificate, TxHash, TxIdentifier, Voter, VotingProcedures,
+    BlockInfo, PoolId, PoolMetadata, PoolRegistration, PoolRetirement, PoolUpdateEvent, Relay,
+    StakeAddress, TxCertificate, TxHash, TxIdentifier, Voter, VotingProcedures,
 };
 use anyhow::Result;
 use imbl::HashMap;