Merge pull request #102 from KeystoneHQ/update

feat: modify zcash account structure

Author: soralit

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

@@ -23,42 +23,10 @@ impl From<ur_registry::zcash::zcash_accounts::ZcashAccounts> for ZcashAccounts {
     }
 }
 
-#[derive(Default, Clone, Debug, Serialize, Deserialize)]
-struct ZcashTransparentAccount {
-    path: String,
-    xpub: String,
-}
-
-impl From<CryptoHDKey> for ZcashTransparentAccount {
-    fn from(value: CryptoHDKey) -> Self {
-        Self {
-            path: value.get_origin().unwrap().get_path().unwrap(),
-            xpub: value.get_bip32_key(),
-        }
-    }
-}
-
-#[derive(Default, Clone, Debug, Serialize, Deserialize)]
-struct ZcashShieldedAccount {
-    path: String,
-    fvk: String,
-}
-
-impl From<ur_registry::zcash::zcash_full_viewing_key::ZcashFullViewingKey>
-    for ZcashShieldedAccount
-{
-    fn from(value: ur_registry::zcash::zcash_full_viewing_key::ZcashFullViewingKey) -> Self {
-        Self {
-            path: value.get_key_path().get_path().unwrap(),
-            fvk: hex::encode(value.get_key_data()),
-        }
-    }
-}
-
 #[derive(Default, Clone, Debug, Serialize, Deserialize)]
 struct ZcashUnifiedAccount {
-    transparent: Option<ZcashTransparentAccount>,
-    orchard: ZcashShieldedAccount,
+    ufvk: String,
+    index: u32,
     name: Option<String>,
 }
 
@@ -69,8 +37,8 @@ impl From<ur_registry::zcash::zcash_unified_full_viewing_key::ZcashUnifiedFullVi
         value: ur_registry::zcash::zcash_unified_full_viewing_key::ZcashUnifiedFullViewingKey,
     ) -> Self {
         Self {
-            transparent: value.get_transparent().map(|account| account.into()),
-            orchard: value.get_orchard().into(),
+            ufvk: value.get_ufvk(),
+            index: value.get_index(),
             name: value.get_name(),
         }
     }

libs/ur-registry/src/macros_impl.rs

@@ -43,7 +43,6 @@ use crate::sui::{sui_sign_hash_request::SuiSignHashRequest, sui_sign_request::Su
 use crate::sui::sui_signature::SuiSignature;
 use crate::ton::{ton_sign_request::TonSignRequest, ton_signature::TonSignature};
 use crate::zcash::zcash_accounts::ZcashAccounts;
-use crate::zcash::zcash_full_viewing_key::ZcashFullViewingKey;
 use crate::zcash::zcash_pczt::ZcashPczt;
 use crate::zcash::zcash_unified_full_viewing_key::ZcashUnifiedFullViewingKey;
 use crate::{impl_cbor_bytes, impl_ur_try_from_cbor_bytes, impl_ur_try_into_cbor_bytes};
@@ -100,7 +99,6 @@ impl_cbor_bytes!(
     BtcSignRequest,
     BtcSignature,
     ZcashAccounts,
-    ZcashFullViewingKey,
     ZcashUnifiedFullViewingKey,
     ZcashPczt,
 );

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

@@ -1,4 +1,3 @@
 pub mod zcash_accounts;
-pub mod zcash_full_viewing_key;
 pub mod zcash_unified_full_viewing_key;
 pub mod zcash_pczt;

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

@@ -1,20 +1,12 @@
-use alloc::{
-    format,
-    string::{String, ToString},
-    vec::Vec,
-};
+use alloc::{string::ToString, vec::Vec};
 use minicbor::data::{Int, Tag};
 
 use crate::{
     cbor::{cbor_array, cbor_map},
-    crypto_key_path::CryptoKeyPath,
     impl_template_struct,
-    registry_types::{
-        RegistryType, CRYPTO_KEYPATH, TON_SIGN_REQUEST, UUID, ZCASH_ACCOUNTS,
-        ZCASH_UNIFIED_FULL_VIEWING_KEY,
-    },
+    registry_types::{RegistryType, ZCASH_ACCOUNTS, ZCASH_UNIFIED_FULL_VIEWING_KEY},
     traits::{MapSize, RegistryItem},
-    types::{Bytes, Fingerprint},
+    types::Bytes,
 };
 
 use super::zcash_unified_full_viewing_key::ZcashUnifiedFullViewingKey;

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

@@ -1,40 +1,26 @@
-use alloc::{
-    format,
-    string::{String, ToString},
-};
-use minicbor::data::{Int, Tag};
+use alloc::string::{String, ToString};
+use minicbor::data::Int;
 
 use crate::{
     cbor::cbor_map,
-    crypto_hd_key::CryptoHDKey,
-    crypto_key_path::CryptoKeyPath,
     impl_template_struct,
-    registry_types::{
-        RegistryType, CRYPTO_HDKEY, CRYPTO_KEYPATH, ZCASH_FULL_VIEWING_KEY,
-        ZCASH_UNIFIED_FULL_VIEWING_KEY,
-    },
+    registry_types::{RegistryType, ZCASH_UNIFIED_FULL_VIEWING_KEY},
     traits::{MapSize, RegistryItem},
-    types::Bytes,
 };
 
-use super::zcash_full_viewing_key::ZcashFullViewingKey;
-
-const TRANSPARENT: u8 = 1;
-const ORCHARD: u8 = 2;
+const UFVK: u8 = 1;
+const INDEX: u8 = 2;
 const NAME: u8 = 3;
 
 impl_template_struct!(ZcashUnifiedFullViewingKey {
-    transparent: Option<CryptoHDKey>,
-    orchard: ZcashFullViewingKey,
+    ufvk: String,
+    index: u32,
     name: Option<String>
 });
 
 impl MapSize for ZcashUnifiedFullViewingKey {
     fn map_size(&self) -> u64 {
-        let mut size = 1;
-        if self.transparent.is_some() {
-            size += 1;
-        }
+        let mut size = 2;
         if self.name.is_some() {
             size += 1;
         }
@@ -56,18 +42,11 @@ impl<C> minicbor::Encode<C> for ZcashUnifiedFullViewingKey {
     ) -> Result<(), minicbor::encode::Error<W::Error>> {
         e.map(self.map_size())?;
 
-        if let Some(transparent) = &self.transparent {
-            e.int(Int::from(TRANSPARENT))?
-                .tag(Tag::Unassigned(CRYPTO_HDKEY.get_tag()))?;
-            CryptoHDKey::encode(transparent, e, _ctx);
-        }
-
-        e.int(Int::from(ORCHARD))?
-            .tag(Tag::Unassigned(ZCASH_FULL_VIEWING_KEY.get_tag()))?;
-        ZcashFullViewingKey::encode(&self.orchard, e, _ctx);
+        e.int(Int::from(UFVK))?.str(&self.ufvk)?;
+        e.int(Int::from(INDEX))?.u32(self.index)?;
 
         if let Some(name) = &self.name {
-            e.int(Int::from(NAME))?.str(name);
+            e.int(Int::from(NAME))?.str(name)?;
         }
 
         Ok(())
@@ -81,13 +60,11 @@ impl<'b, C> minicbor::Decode<'b, C> for ZcashUnifiedFullViewingKey {
             let key =
                 u8::try_from(key).map_err(|e| minicbor::decode::Error::message(e.to_string()))?;
             match key {
-                TRANSPARENT => {
-                    d.tag()?;
-                    obj.transparent = Some(CryptoHDKey::decode(d, ctx)?);
+                UFVK => {
+                    obj.ufvk = d.str()?.to_string();
                 }
-                ORCHARD => {
-                    d.tag()?;
-                    obj.orchard = ZcashFullViewingKey::decode(d, ctx)?;
+                INDEX => {
+                    obj.index = d.u32()?;
                 }
                 NAME => {
                     obj.name = Some(d.str()?.to_string());