zec
/
ZcashLightClientKit
mirror of https://github.com/zcash/ZcashLightClientKit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ufvk in the Account

This commit is contained in:
Lukas Korba 2025-03-01 12:13:49 +01:00
parent 09aeeb7d2d
commit f2b830fe72
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/ZcashLightClientKit/Model/WalletTypes.swift
View File

@ -16,8 +16,7 @@ public struct Account: Equatable, Hashable, Codable, Identifiable {
public let keySource: String?
public let seedFingerprint: [UInt8]?
public let hdAccountIndex: Zip32AccountIndex?
// TODO: This should be `UnifiedFullViewingKey?`
public let ufvk: String?
public let ufvk: UnifiedFullViewingKey?
}
public struct UnifiedSpendingKey: Equatable, Undescribable {
@ -52,7 +51,7 @@ public struct TransparentAccountPrivKey: Equatable, Undescribable {
}
/// A ZIP 316 Unified Full Viewing Key.
public struct UnifiedFullViewingKey: Equatable, StringEncoded, Undescribable {
public struct UnifiedFullViewingKey: Equatable, StringEncoded, Undescribable, Hashable, Codable {
let encoding: String
public var stringEncoded: String { encoding }

9
Sources/ZcashLightClientKit/Rust/ZcashRustBackend.swift
View File

@ -1230,6 +1230,13 @@ extension FfiAccount {
)
}
let ufvkTyped: UnifiedFullViewingKey?
if let ufvk {
ufvkTyped = UnifiedFullViewingKey(validatedEncoding: String(cString: ufvk))
} else {
ufvkTyped = nil
}
// Valid ZIP32 account index
return .init(
id: AccountUUID(id: uuidArray),
@ -1237,7 +1244,7 @@ extension FfiAccount {
keySource: key_source != nil ? String(cString: key_source) : nil,
seedFingerprint: seedFingerprintArray,
hdAccountIndex: Zip32AccountIndex(hd_account_index),
ufvk: ufvk != nil ? String(cString: ufvk) : nil
ufvk: ufvkTyped
)
}
}