Include AddressType in AddressName

Import AddressType into AddressName and add an optional address_type field (serialized as "type") so address names can carry their address type. Update AddressType enum to derive PartialEq, Eq and Hash and add a new Contact variant. Persist the new field by populating address_type in ScanAddressRow conversion.

Author: DRadmir

crates/primitives/src/address_name.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use typeshare::typeshare;
 
-use crate::Chain;
+use crate::{scan::AddressType, Chain};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[typeshare(swift = "Equatable, Hashable, Sendable")]
@@ -10,4 +10,6 @@ pub struct AddressName {
     pub chain: Chain,
     pub address: String,
     pub name: String,
+    #[serde(rename = "type")]
+    pub address_type: Option<AddressType>,
 }

crates/primitives/src/scan.rs

@@ -31,14 +31,15 @@ pub struct ScanAddressTarget {
     pub address: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, EnumIter, AsRefStr, EnumString)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, EnumIter, AsRefStr, EnumString)]
 #[typeshare(swift = "Equatable, Sendable")]
 #[serde(rename_all = "lowercase")]
 #[strum(serialize_all = "lowercase")]
 pub enum AddressType {
     Address,
     Contract,
     Validator,
+    Contact,
 }
 
 impl AddressType {

crates/storage/src/models/scan_addresses.rs

@@ -28,6 +28,7 @@ impl ScanAddressRow {
             chain: Chain::from_str(&self.chain).unwrap(),
             address: self.address,
             name,
+            address_type: Some(self.type_.0.clone()),
         })
     }