feat(zcash): add device_version to ZcashAccounts

libs/ur-registry-ffi/src/zcash/zcash_accounts.rs

@@ -22,6 +22,7 @@ use ur_registry::{crypto_hd_key::CryptoHDKey, registry_types::ZCASH_ACCOUNTS};
 struct ZcashAccounts {
     seed_fingerprint: String,
     accounts: Vec<ZcashUnifiedAccount>,
+    device_version: Option<String>,
 }
 
 impl From<ur_registry::zcash::zcash_accounts::ZcashAccounts> for ZcashAccounts {
@@ -33,6 +34,7 @@ impl From<ur_registry::zcash::zcash_accounts::ZcashAccounts> for ZcashAccounts {
                 .iter()
                 .map(|account| account.clone().into())
                 .collect(),
+            device_version: value.get_device_version(),
         }
     }
 }

libs/ur-registry/src/zcash/zcash_accounts.rs

@@ -10,12 +10,11 @@
 //! - Accounts: An array of Zcash unified full viewing keys
 
 
-use alloc::{string::ToString, vec::Vec};
+use alloc::{string::{String, ToString}, vec::Vec};
 use minicbor::data::{Int, Tag};
 
 use crate::{
     cbor::{cbor_array, cbor_map},
-    impl_template_struct,
     registry_types::{RegistryType, ZCASH_ACCOUNTS, ZCASH_UNIFIED_FULL_VIEWING_KEY},
     traits::{MapSize, RegistryItem},
     types::Bytes,
@@ -25,15 +24,59 @@ use super::zcash_unified_full_viewing_key::ZcashUnifiedFullViewingKey;
 
 const SEED_FINGERPRINT: u8 = 1;
 const ACCOUNTS: u8 = 2;
+const DEVICE_VERSION: u8 = 3;
 
-impl_template_struct!(ZcashAccounts {
-    seed_fingerprint: Bytes,
-    accounts: Vec<ZcashUnifiedFullViewingKey>
-});
+#[derive(Debug, Clone, Default)]
+pub struct ZcashAccounts {
+    pub seed_fingerprint: Bytes,
+    pub accounts: Vec<ZcashUnifiedFullViewingKey>,
+    pub device_version: Option<String>,
+}
+
+impl ZcashAccounts {
+    pub fn new(
+        seed_fingerprint: Bytes,
+        accounts: Vec<ZcashUnifiedFullViewingKey>,
+    ) -> Self {
+        Self {
+            seed_fingerprint,
+            accounts,
+            device_version: None,
+        }
+    }
+
+    pub fn get_seed_fingerprint(&self) -> Bytes {
+        self.seed_fingerprint.clone()
+    }
+
+    pub fn set_seed_fingerprint(&mut self, seed_fingerprint: Bytes) {
+        self.seed_fingerprint = seed_fingerprint;
+    }
+
+    pub fn get_accounts(&self) -> Vec<ZcashUnifiedFullViewingKey> {
+        self.accounts.clone()
+    }
+
+    pub fn set_accounts(&mut self, accounts: Vec<ZcashUnifiedFullViewingKey>) {
+        self.accounts = accounts;
+    }
+
+    pub fn get_device_version(&self) -> Option<String> {
+        self.device_version.clone()
+    }
+
+    pub fn set_device_version(&mut self, device_version: String) {
+        self.device_version = Some(device_version);
+    }
+}
 
 impl MapSize for ZcashAccounts {
     fn map_size(&self) -> u64 {
-        2
+        let mut size = 2;
+        if self.device_version.is_some() {
+            size += 1;
+        }
+        size
     }
 }
 
@@ -61,6 +104,10 @@ impl<C> minicbor::Encode<C> for ZcashAccounts {
             ZcashUnifiedFullViewingKey::encode(account, e, _ctx)?;
         }
 
+        if let Some(device_version) = &self.device_version {
+            e.int(Int::from(DEVICE_VERSION))?.str(device_version)?;
+        }
+
         Ok(())
     }
 }
@@ -84,6 +131,9 @@ impl<'b, C> minicbor::Decode<'b, C> for ZcashAccounts {
                     })?;
                     obj.accounts = keys;
                 }
+                DEVICE_VERSION => {
+                    obj.device_version = Some(d.str()?.to_string());
+                }
                 _ => {}
             }
             Ok(())
@@ -101,7 +151,7 @@ mod tests {
     #[test]
     fn test_zcash_accounts_encode_decode() {
         let seed_fingerprint = hex::decode("d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1").unwrap();
-        
+
         let ufvk1 = ZcashUnifiedFullViewingKey::new(
             "uview1qqqqqqqqqqqqqq8rzd0efkm6ej5n0twzum9czt9kj5y7jxjm9qz3uq9qgpqqqqqqqqqqqqqq9en0hkucteqncqcfqcqcpz4wuwl".to_string(),
             0,
@@ -113,15 +163,16 @@ mod tests {
             1,
             Some("Keystone 2".to_string())
         );
-        
+
         let accounts = ZcashAccounts {
             seed_fingerprint,
             accounts: vec![ufvk1, ufvk2],
+            device_version: None,
         };
-        
+
         let cbor = minicbor::to_vec(&accounts).unwrap();
         let decoded: ZcashAccounts = minicbor::decode(&cbor).unwrap();
-        
+
         assert_eq!(decoded.seed_fingerprint, accounts.seed_fingerprint);
         assert_eq!(decoded.accounts.len(), 2);
         assert_eq!(decoded.accounts[0].get_ufvk(), accounts.accounts[0].get_ufvk());
@@ -130,32 +181,62 @@ mod tests {
         assert_eq!(decoded.accounts[1].get_ufvk(), accounts.accounts[1].get_ufvk());
         assert_eq!(decoded.accounts[1].get_index(), accounts.accounts[1].get_index());
         assert_eq!(decoded.accounts[1].get_name(), accounts.accounts[1].get_name());
+        assert_eq!(decoded.device_version, None);
     }
-
+
+    #[test]
+    fn test_zcash_accounts_with_device_version() {
+        let seed_fingerprint = hex::decode("d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1").unwrap();
+
+        let ufvk = ZcashUnifiedFullViewingKey::new(
+            "uview1qqqqqqqqqqqqqq8rzd0efkm6ej5n0twzum9czt9kj5y7jxjm9qz3uq9qgpqqqqqqqqqqqqqq9en0hkucteqncqcfqcqcpz4wuwl".to_string(),
+            0,
+            Some("Keystone 1".to_string())
+        );
+
+        let mut accounts = ZcashAccounts::new(seed_fingerprint, vec![ufvk]);
+        accounts.set_device_version("1.2.3".to_string());
+
+        let cbor = minicbor::to_vec(&accounts).unwrap();
+        let decoded: ZcashAccounts = minicbor::decode(&cbor).unwrap();
+
+        assert_eq!(decoded.device_version, Some("1.2.3".to_string()));
+        assert_eq!(decoded.accounts.len(), 1);
+    }
+
+    #[test]
+    fn test_zcash_accounts_without_device_version_decodes_from_old_cbor() {
+        // Encode without device_version, then decode — simulates old firmware
+        let seed_fingerprint = hex::decode("d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1").unwrap();
+        let accounts = ZcashAccounts::new(seed_fingerprint, vec![]);
+
+        let cbor = minicbor::to_vec(&accounts).unwrap();
+        let decoded: ZcashAccounts = minicbor::decode(&cbor).unwrap();
+
+        assert_eq!(decoded.device_version, None);
+    }
+
     #[test]
     fn test_zcash_accounts_empty() {
         let seed_fingerprint = hex::decode("d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1").unwrap();
-
-        let accounts = ZcashAccounts {
-            seed_fingerprint,
-            accounts: vec![],
-        };
-
+
+        let accounts = ZcashAccounts::new(seed_fingerprint.clone(), vec![]);
+
         let cbor = minicbor::to_vec(&accounts).unwrap();
         let decoded: ZcashAccounts = minicbor::decode(&cbor).unwrap();
-        
-        assert_eq!(decoded.seed_fingerprint, accounts.seed_fingerprint);
+
+        assert_eq!(decoded.seed_fingerprint, seed_fingerprint);
         assert_eq!(decoded.accounts.len(), 0);
     }
-    
+
     #[test]
     fn test_map_size() {
         let seed_fingerprint = hex::decode("d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1d1").unwrap();
-        let accounts = ZcashAccounts {
-            seed_fingerprint,
-            accounts: vec![],
-        };
-
+        let accounts = ZcashAccounts::new(seed_fingerprint, vec![]);
         assert_eq!(accounts.map_size(), 2);
+
+        let mut accounts_with_version = ZcashAccounts::new(vec![], vec![]);
+        accounts_with_version.set_device_version("1.0.0".to_string());
+        assert_eq!(accounts_with_version.map_size(), 3);
     }
 }