react-native-zcash 0.6.10 → 0.6.11

package/ios/ZCashLightClientKit/Initializer.swift

@@ -90,7 +90,6 @@ public class Initializer {
     struct URLs {
         let fsBlockDbRoot: URL
         let dataDbURL: URL
-        let generalStorageURL: URL
         let spendParamsURL: URL
         let outputParamsURL: URL
     }
@@ -113,7 +112,6 @@ public class Initializer {
     let alias: ZcashSynchronizerAlias
     let endpoint: LightWalletEndpoint
     let fsBlockDbRoot: URL
-    let generalStorageURL: URL
     let dataDbURL: URL
     let spendParamsURL: URL
     let outputParamsURL: URL
@@ -144,20 +142,13 @@ public class Initializer {
     ///  - cacheDbURL: previous location of the cacheDb. If you don't know what a cacheDb is and you are adopting this SDK for the first time then
     ///                just pass `nil` here.
     ///  - fsBlockDbRoot: location of the compact blocks cache
-    ///  - generalStorageURL: Location of the directory where the SDK can store any information it needs. A directory doesn't have to exist. But the
-    ///                       SDK must be able to write to this location after it creates this directory. It is suggested that this directory is
-    ///                       a subdirectory of the `Documents` directory. If this information is stored in `Documents` then the system itself won't
-    ///                       remove these data.
     ///  - dataDbURL: Location of the data db
     ///  - endpoint: the endpoint representing the lightwalletd instance you want to point to
     ///  - spendParamsURL: location of the spend parameters
     ///  - outputParamsURL: location of the output parameters
-    ///  - loggingPolicy: the `LoggingPolicy` for the logger
-    ///  - enableBackendTracing: this enables tracing for super detailed debugging. it will slow down everything 10 or 100x.
     convenience public init(
         cacheDbURL: URL?,
         fsBlockDbRoot: URL,
-        generalStorageURL: URL,
         dataDbURL: URL,
         endpoint: LightWalletEndpoint,
         network: ZcashNetwork,
@@ -165,8 +156,7 @@ public class Initializer {
         outputParamsURL: URL,
         saplingParamsSourceURL: SaplingParamsSourceURL,
         alias: ZcashSynchronizerAlias = .default,
-        loggingPolicy: LoggingPolicy = .default(.debug),
-        enableBackendTracing: Bool = false
+        loggingPolicy: LoggingPolicy = .default(.debug)
     ) {
         let container = DIContainer()
         
@@ -176,7 +166,6 @@ public class Initializer {
             container: container,
             cacheDbURL: cacheDbURL,
             fsBlockDbRoot: fsBlockDbRoot,
-            generalStorageURL: generalStorageURL,
             dataDbURL: dataDbURL,
             endpoint: endpoint,
             network: network,
@@ -184,8 +173,7 @@ public class Initializer {
             outputParamsURL: outputParamsURL,
             saplingParamsSourceURL: saplingParamsSourceURL,
             alias: alias,
-            loggingPolicy: loggingPolicy,
-            enableBackendTracing: enableBackendTracing
+            loggingPolicy: loggingPolicy
         )
         
         self.init(
@@ -206,7 +194,6 @@ public class Initializer {
         container: DIContainer,
         cacheDbURL: URL?,
         fsBlockDbRoot: URL,
-        generalStorageURL: URL,
         dataDbURL: URL,
         endpoint: LightWalletEndpoint,
         network: ZcashNetwork,
@@ -214,8 +201,7 @@ public class Initializer {
         outputParamsURL: URL,
         saplingParamsSourceURL: SaplingParamsSourceURL,
         alias: ZcashSynchronizerAlias = .default,
-        loggingPolicy: LoggingPolicy = .default(.debug),
-        enableBackendTracing: Bool = false
+        loggingPolicy: LoggingPolicy = .default(.debug)
     ) {
         // It's not possible to fail from constructor. Technically it's possible but it can be pain for the client apps to handle errors thrown
         // from constructor. So `parsingError` is just stored in initializer and `SDKSynchronizer.prepare()` throw this error if it exists.
@@ -223,7 +209,6 @@ public class Initializer {
             container: container,
             cacheDbURL: cacheDbURL,
             fsBlockDbRoot: fsBlockDbRoot,
-            generalStorageURL: generalStorageURL,
             dataDbURL: dataDbURL,
             endpoint: endpoint,
             network: network,
@@ -231,8 +216,7 @@ public class Initializer {
             outputParamsURL: outputParamsURL,
             saplingParamsSourceURL: saplingParamsSourceURL,
             alias: alias,
-            loggingPolicy: loggingPolicy,
-            enableBackendTracing: enableBackendTracing
+            loggingPolicy: loggingPolicy
         )
 
         self.init(
@@ -263,7 +247,6 @@ public class Initializer {
         self.cacheDbURL = cacheDbURL
         self.rustBackend = container.resolve(ZcashRustBackendWelding.self)
         self.fsBlockDbRoot = urls.fsBlockDbRoot
-        self.generalStorageURL = urls.generalStorageURL
         self.dataDbURL = urls.dataDbURL
         self.endpoint = endpoint
         self.spendParamsURL = urls.spendParamsURL
@@ -295,7 +278,6 @@ public class Initializer {
         container: DIContainer,
         cacheDbURL: URL?,
         fsBlockDbRoot: URL,
-        generalStorageURL: URL,
         dataDbURL: URL,
         endpoint: LightWalletEndpoint,
         network: ZcashNetwork,
@@ -303,13 +285,11 @@ public class Initializer {
         outputParamsURL: URL,
         saplingParamsSourceURL: SaplingParamsSourceURL,
         alias: ZcashSynchronizerAlias,
-        loggingPolicy: LoggingPolicy = .default(.debug),
-        enableBackendTracing: Bool = false
+        loggingPolicy: LoggingPolicy = .default(.debug)
     ) -> (URLs, ZcashError?) {
         let urls = URLs(
             fsBlockDbRoot: fsBlockDbRoot,
             dataDbURL: dataDbURL,
-            generalStorageURL: generalStorageURL,
             spendParamsURL: spendParamsURL,
             outputParamsURL: outputParamsURL
         )
@@ -324,8 +304,7 @@ public class Initializer {
             alias: alias,
             networkType: network.networkType,
             endpoint: endpoint,
-            loggingPolicy: loggingPolicy,
-            enableBackendTracing: enableBackendTracing
+            loggingPolicy: loggingPolicy
         )
         
         return (updatedURLs, parsingError)
@@ -381,15 +360,10 @@ public class Initializer {
             return .failure(.initializerCantUpdateURLWithAlias(urls.outputParamsURL))
         }
 
-        guard let updatedGeneralStorageURL = urls.generalStorageURL.updateLastPathComponent(with: alias) else {
-            return .failure(.initializerCantUpdateURLWithAlias(urls.generalStorageURL))
-        }
-
         return .success(
             URLs(
                 fsBlockDbRoot: updatedFsBlockDbRoot,
                 dataDbURL: updatedDataDbURL,
-                generalStorageURL: updatedGeneralStorageURL,
                 spendParamsURL: updatedSpendParamsURL,
                 outputParamsURL: updateOutputParamsURL
             )
@@ -409,7 +383,7 @@ public class Initializer {
     /// - Parameter seed: ZIP-32 Seed bytes for the wallet that will be initialized
     /// - Throws: `InitializerError.dataDbInitFailed` if the creation of the dataDb fails
     /// `InitializerError.accountInitFailed` if the account table can't be initialized. 
-    func initialize(with seed: [UInt8]?, walletBirthday: BlockHeight, for walletMode: WalletInitMode) async throws -> InitializationResult {
+    func initialize(with seed: [UInt8]?, viewingKeys: [UnifiedFullViewingKey], walletBirthday: BlockHeight) async throws -> InitializationResult {
         try await storage.create()
 
         if case .seedRequired = try await rustBackend.initDataDb(seed: seed) {
@@ -417,22 +391,27 @@ public class Initializer {
         }
 
         let checkpoint = Checkpoint.birthday(with: walletBirthday, network: network)
+        do {
+            try await rustBackend.initBlocksTable(
+                height: Int32(checkpoint.height),
+                hash: checkpoint.hash,
+                time: checkpoint.time,
+                saplingTree: checkpoint.saplingTree
+            )
+        } catch ZcashError.rustInitBlocksTableDataDbNotEmpty {
+            // this is fine
+        } catch {
+            throw error
+        }
 
         self.walletBirthday = checkpoint.height
-
-        // If there are no accounts it must be created, the default amount of accounts is 1
-        if let seed, try accountRepository.getAll().isEmpty {
-            var chainTip: UInt32?
-            
-            if walletMode == .restoreWallet {
-                chainTip = UInt32(try await lightWalletService.latestBlockHeight())
-            }
-            
-            _ = try await rustBackend.createAccount(
-                seed: seed,
-                treeState: checkpoint.treeState(),
-                recoverUntil: chainTip
-            )
+ 
+        do {
+            try await rustBackend.initAccountsTable(ufvks: viewingKeys)
+        } catch ZcashError.rustInitAccountsTableDataDbNotEmpty {
+            // this is fine
+        } catch {
+            throw error
         }
 
         return .success

package/ios/ZCashLightClientKit/Metrics/SDKMetrics.swift

@@ -32,6 +32,9 @@ import Foundation
 /// We encourage you to check`SDKMetricsTests` and other tests in the Test/PerformanceTests/ folder.
 public class SDKMetrics {
     public struct BlockMetricReport: Equatable {
+        public let startHeight: BlockHeight
+        public let progressHeight: BlockHeight
+        public let targetHeight: BlockHeight
         public let batchSize: Int
         public let startTime: TimeInterval
         public let endTime: TimeInterval
@@ -40,6 +43,7 @@ public class SDKMetrics {
     
     public enum Operation {
         case downloadBlocks
+        case validateBlocks
         case scanBlocks
         case enhancement
         case fetchUTXOs
@@ -71,6 +75,7 @@ public class SDKMetrics {
     /// `SDKMetrics` focuses deeply on sync process and metrics related to it. By default there are reports around
     /// block operations like download, validate, etc. This method pushes data on a stack for the specific operation.
     func pushProgressReport(
+        progress: BlockProgress,
         start: Date,
         end: Date,
         batchSize: Int,
@@ -79,6 +84,9 @@ public class SDKMetrics {
         guard isEnabled else { return }
         
         let blockMetricReport = BlockMetricReport(
+            startHeight: progress.startHeight,
+            progressHeight: progress.progressHeight,
+            targetHeight: progress.targetHeight,
             batchSize: batchSize,
             startTime: start.timeIntervalSinceReferenceDate,
             endTime: end.timeIntervalSinceReferenceDate
@@ -150,6 +158,7 @@ public class SDKMetrics {
 extension SDKMetrics {
     public struct CumulativeSummary: Equatable {
         public let downloadedBlocksReport: ReportSummary?
+        public let validatedBlocksReport: ReportSummary?
         public let scannedBlocksReport: ReportSummary?
         public let enhancementReport: ReportSummary?
         public let fetchUTXOsReport: ReportSummary?
@@ -168,6 +177,7 @@ extension SDKMetrics {
     /// independently. A `ReportSummary` is the result per `operation`, providing min, max and avg times.
     public func cumulativeSummary() -> CumulativeSummary {
         let downloadReport = summaryFor(reports: reports[.downloadBlocks])
+        let validateReport = summaryFor(reports: reports[.validateBlocks])
         let scanReport = summaryFor(reports: reports[.scanBlocks])
         let enhancementReport = summaryFor(reports: reports[.enhancement])
         let fetchUTXOsReport = summaryFor(reports: reports[.fetchUTXOs])
@@ -179,6 +189,7 @@ extension SDKMetrics {
         
         return CumulativeSummary(
             downloadedBlocksReport: downloadReport,
+            validatedBlocksReport: validateReport,
             scannedBlocksReport: scanReport,
             enhancementReport: enhancementReport,
             fetchUTXOsReport: fetchUTXOsReport,
@@ -206,6 +217,7 @@ extension SDKMetrics {
         cumulativeSummaries.forEach { summary in
             finalSummary = CumulativeSummary(
                 downloadedBlocksReport: accumulate(left: finalSummary?.downloadedBlocksReport, right: summary.downloadedBlocksReport),
+                validatedBlocksReport: accumulate(left: finalSummary?.validatedBlocksReport, right: summary.validatedBlocksReport),
                 scannedBlocksReport: accumulate(left: finalSummary?.scannedBlocksReport, right: summary.scannedBlocksReport),
                 enhancementReport: accumulate(left: finalSummary?.enhancementReport, right: summary.enhancementReport),
                 fetchUTXOsReport: accumulate(left: finalSummary?.fetchUTXOsReport, right: summary.fetchUTXOsReport),

package/ios/ZCashLightClientKit/Model/Checkpoint.swift

@@ -71,18 +71,6 @@ extension Checkpoint: Decodable {
         }
         return height
     }
-
-    public func treeState() -> TreeState {
-        var ret = TreeState()
-        ret.height = UInt64(height)
-        ret.hash = hash
-        ret.time = time
-        ret.saplingTree = saplingTree
-        if let tree = orchardTree {
-            ret.orchardTree = tree
-        }
-        return ret
-    }
 }
 
 public extension BlockHeight {

package/ios/ZCashLightClientKit/Modules/Service/GRPC/LightWalletGRPCService.swift

@@ -262,21 +262,6 @@ extension LightWalletGRPCService: LightWalletService {
             }
         }
     }
-    
-    func getSubtreeRoots(_ request: GetSubtreeRootsArg) -> AsyncThrowingStream<SubtreeRoot, Error> {
-        let stream = compactTxStreamer.getSubtreeRoots(request)
-        var iterator = stream.makeAsyncIterator()
-        
-        return AsyncThrowingStream() {
-            do {
-                guard let subtreeRoot = try await iterator.next() else { return nil }
-                return subtreeRoot
-            } catch {
-                let serviceError = error.mapToServiceError()
-                throw ZcashError.serviceSubtreeRootsStreamFailed(serviceError)
-            }
-        }
-    }
 
     func closeConnection() {
         _ = channel.close()