fix: use Vec instead of HashSet for addresses field

Signed-off-by: William Hankins <[email protected]>

Author: whankinsiv

modules/historical_accounts_state/src/immutable_historical_account_store.rs

@@ -316,7 +316,7 @@ impl ImmutableHistoricalAccountStore {
                 );
                 Self::extend_opt_vec(&mut agg_entry.withdrawal_history, entry.withdrawal_history);
                 Self::extend_opt_vec(&mut agg_entry.mir_history, entry.mir_history);
-                Self::extend_opt_set(&mut agg_entry.addresses, entry.addresses);
+                Self::extend_opt_vec_ordered(&mut agg_entry.addresses, entry.addresses);
             }
             acc
         })
@@ -378,13 +378,22 @@ impl ImmutableHistoricalAccountStore {
         }
     }
 
-    fn extend_opt_set<T>(target: &mut Option<HashSet<T>>, src: Option<HashSet<T>>)
+    fn extend_opt_vec_ordered<T>(target: &mut Option<Vec<T>>, src: Option<Vec<T>>)
     where
-        T: Eq + Hash,
+        T: Eq + Hash + Clone,
     {
-        if let Some(mut s) = src {
-            if !s.is_empty() {
-                target.get_or_insert_with(HashSet::new).extend(s.drain());
+        if let Some(src_vec) = src {
+            if src_vec.is_empty() {
+                return;
+            }
+
+            let target_vec = target.get_or_insert_with(Vec::new);
+            let mut seen: HashSet<T> = target_vec.iter().cloned().collect();
+
+            for item in src_vec {
+                if seen.insert(item.clone()) {
+                    target_vec.push(item);
+                }
             }
         }
     }

modules/historical_accounts_state/src/state.rs

@@ -32,7 +32,7 @@ pub struct AccountEntry {
     pub registration_history: Option<Vec<RegistrationUpdate>>,
     pub withdrawal_history: Option<Vec<AccountWithdrawal>>,
     pub mir_history: Option<Vec<AccountWithdrawal>>,
-    pub addresses: Option<HashSet<ShelleyAddress>>,
+    pub addresses: Option<Vec<ShelleyAddress>>,
 }
 
 #[derive(Debug, Clone, minicbor::Decode, minicbor::Encode)]
@@ -232,7 +232,7 @@ impl State {
                 .entry(delta.stake_address.clone())
                 .or_default()
                 .addresses
-                .get_or_insert_with(HashSet::new)
+                .get_or_insert_with(Vec::new)
                 .extend(delta.addresses.clone());
         }
     }
@@ -358,10 +358,7 @@ impl State {
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<ShelleyAddress>>> {
-        let mut addresses = match self.immutable.get_addresses(account).await? {
-            Some(list) => list,
-            None => Vec::new(),
-        };
+        let mut addresses = self.immutable.get_addresses(account).await?.unwrap_or_default();
 
         let mut seen: HashSet<ShelleyAddress> = addresses.iter().cloned().collect();
         for block_map in self.volatile.window.iter() {

processes/omnibus/src/main.rs

@@ -118,7 +118,7 @@ pub async fn main() -> Result<()> {
     SPDDState::register(&mut process);
     DRDDState::register(&mut process);
     Consensus::register(&mut process);
-    //ChainStore::register(&mut process);
+    ChainStore::register(&mut process);
 
     Clock::<Message>::register(&mut process);
     RESTServer::<Message>::register(&mut process);