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

hd_account_index wrapped in Zip32AccountIndex

This commit is contained in:
Lukas Korba 2024-12-09 10:09:34 +01:00
parent e48cd60a0e
commit df1b3195fc
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/ZcashLightClientKit/Account/Account.swift
View File

@ -14,7 +14,7 @@ public struct Zip32AccountIndex: Equatable, Codable, Hashable {
/// - Parameter index: the ZIP 32 account index, which must be less than ``1<<31``.
public init(_ index: UInt32) {
guard index < (1<<31) else {
guard index < (1 << 31) else {
fatalError("Account index must be less than 1<<31. Input value is \(index).")
}

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

@ -15,7 +15,7 @@ public struct Account: Equatable, Hashable, Codable, Identifiable {
public let name: String
public let keySource: String?
public let seedFingerprint: [UInt8]?
public let hdAccountIndex: UInt32?
public let hdAccountIndex: Zip32AccountIndex?
}
public struct UnifiedSpendingKey: Equatable, Undescribable {

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

@ -136,7 +136,7 @@ struct ZcashRustBackend: ZcashRustBackendWelding {
let treeStateBytes = try treeState.serializedData(partial: false).bytes
var kSource: [CChar]? = nil
var kSource: [CChar]?
if let keySource {
kSource = [CChar](keySource.utf8CString)
@ -1052,12 +1052,11 @@ extension FfiAccount {
name: account_name != nil ? String(cString: account_name) : "",
keySource: key_source != nil ? String(cString: key_source) : nil,
seedFingerprint: seedFingerprintArray,
hdAccountIndex: hd_account_index
hdAccountIndex: Zip32AccountIndex(hd_account_index)
)
}
}
extension FfiBoxedSlice {
/// converts an [`FfiBoxedSlice`] into a [`UnifiedSpendingKey`]
/// - Note: This does not check that the converted value actually holds a valid USK