react-native-zcash 0.6.10 → 0.6.11

package/ios/ZCashLightClientKit/Modules/Service/GRPC/ProtoBuf/service.pb.swift

@@ -24,46 +24,6 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ShieldedProtocol: SwiftProtobuf.Enum {
-  typealias RawValue = Int
-  case sapling // = 0
-  case orchard // = 1
-  case UNRECOGNIZED(Int)
-
-  init() {
-    self = .sapling
-  }
-
-  init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .sapling
-    case 1: self = .orchard
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  var rawValue: Int {
-    switch self {
-    case .sapling: return 0
-    case .orchard: return 1
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-#if swift(>=4.2)
-
-extension ShieldedProtocol: CaseIterable {
-  // The compiler won't synthesize support with the UNRECOGNIZED case.
-  static var allCases: [ShieldedProtocol] = [
-    .sapling,
-    .orchard,
-  ]
-}
-
-#endif  // swift(>=4.2)
-
 /// A BlockID message contains identifiers to select a block: a height or a
 /// hash. Specification by hash is not implemented, but may be in the future.
 struct BlockID {
@@ -144,7 +104,7 @@ struct TxFilter {
   fileprivate var _block: BlockID? = nil
 }
 
-/// RawTransaction contains the complete transaction data. It also optionally includes
+/// RawTransaction contains the complete transaction data. It also optionally includes 
 /// the block height in which the transaction was included, or, when returned
 /// by GetMempoolStream(), the latest block height.
 struct RawTransaction {
@@ -366,7 +326,6 @@ struct TreeState {
   /// "main" or "test"
   var network: String = String()
 
-  /// block height
   var height: UInt64 = 0
 
   /// block id
@@ -376,48 +335,7 @@ struct TreeState {
   var time: UInt32 = 0
 
   /// sapling commitment tree state
-  var saplingTree: String = String()
-
-  /// orchard commitment tree state
-  var orchardTree: String = String()
-
-  var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  init() {}
-}
-
-struct GetSubtreeRootsArg {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
-  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
-  // methods supported on all messages.
-
-  /// Index identifying where to start returning subtree roots
-  var startIndex: UInt32 = 0
-
-  /// Shielded protocol to return subtree roots for
-  var shieldedProtocol: ShieldedProtocol = .sapling
-
-  /// Maximum number of entries to return, or 0 for all entries.
-  var maxEntries: UInt32 = 0
-
-  var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  init() {}
-}
-
-struct SubtreeRoot {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
-  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
-  // methods supported on all messages.
-
-  /// The 32-byte Merkle root of the subtree.
-  var rootHash: Data = Data()
-
-  /// The hash of the block that completed this subtree.
-  var completingBlockHash: Data = Data()
-
-  /// The height of the block that completed this subtree in the main chain.
-  var completingBlockHeight: UInt64 = 0
+  var tree: String = String()
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -478,7 +396,6 @@ struct GetAddressUtxosReplyList {
 }
 
 #if swift(>=5.5) && canImport(_Concurrency)
-extension ShieldedProtocol: @unchecked Sendable {}
 extension BlockID: @unchecked Sendable {}
 extension BlockRange: @unchecked Sendable {}
 extension TxFilter: @unchecked Sendable {}
@@ -495,8 +412,6 @@ extension AddressList: @unchecked Sendable {}
 extension Balance: @unchecked Sendable {}
 extension Exclude: @unchecked Sendable {}
 extension TreeState: @unchecked Sendable {}
-extension GetSubtreeRootsArg: @unchecked Sendable {}
-extension SubtreeRoot: @unchecked Sendable {}
 extension GetAddressUtxosArg: @unchecked Sendable {}
 extension GetAddressUtxosReply: @unchecked Sendable {}
 extension GetAddressUtxosReplyList: @unchecked Sendable {}
@@ -506,13 +421,6 @@ extension GetAddressUtxosReplyList: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "cash.z.wallet.sdk.rpc"
 
-extension ShieldedProtocol: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "sapling"),
-    1: .same(proto: "orchard"),
-  ]
-}
-
 extension BlockID: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".BlockID"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -1112,8 +1020,7 @@ extension TreeState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     2: .same(proto: "height"),
     3: .same(proto: "hash"),
     4: .same(proto: "time"),
-    5: .same(proto: "saplingTree"),
-    6: .same(proto: "orchardTree"),
+    5: .same(proto: "tree"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -1126,8 +1033,7 @@ extension TreeState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
       case 2: try { try decoder.decodeSingularUInt64Field(value: &self.height) }()
       case 3: try { try decoder.decodeSingularStringField(value: &self.hash) }()
       case 4: try { try decoder.decodeSingularUInt32Field(value: &self.time) }()
-      case 5: try { try decoder.decodeSingularStringField(value: &self.saplingTree) }()
-      case 6: try { try decoder.decodeSingularStringField(value: &self.orchardTree) }()
+      case 5: try { try decoder.decodeSingularStringField(value: &self.tree) }()
       default: break
       }
     }
@@ -1146,11 +1052,8 @@ extension TreeState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     if self.time != 0 {
       try visitor.visitSingularUInt32Field(value: self.time, fieldNumber: 4)
     }
-    if !self.saplingTree.isEmpty {
-      try visitor.visitSingularStringField(value: self.saplingTree, fieldNumber: 5)
-    }
-    if !self.orchardTree.isEmpty {
-      try visitor.visitSingularStringField(value: self.orchardTree, fieldNumber: 6)
+    if !self.tree.isEmpty {
+      try visitor.visitSingularStringField(value: self.tree, fieldNumber: 5)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -1160,96 +1063,7 @@ extension TreeState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     if lhs.height != rhs.height {return false}
     if lhs.hash != rhs.hash {return false}
     if lhs.time != rhs.time {return false}
-    if lhs.saplingTree != rhs.saplingTree {return false}
-    if lhs.orchardTree != rhs.orchardTree {return false}
-    if lhs.unknownFields != rhs.unknownFields {return false}
-    return true
-  }
-}
-
-extension GetSubtreeRootsArg: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = _protobuf_package + ".GetSubtreeRootsArg"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "startIndex"),
-    2: .same(proto: "shieldedProtocol"),
-    3: .same(proto: "maxEntries"),
-  ]
-
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
-      switch fieldNumber {
-      case 1: try { try decoder.decodeSingularUInt32Field(value: &self.startIndex) }()
-      case 2: try { try decoder.decodeSingularEnumField(value: &self.shieldedProtocol) }()
-      case 3: try { try decoder.decodeSingularUInt32Field(value: &self.maxEntries) }()
-      default: break
-      }
-    }
-  }
-
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.startIndex != 0 {
-      try visitor.visitSingularUInt32Field(value: self.startIndex, fieldNumber: 1)
-    }
-    if self.shieldedProtocol != .sapling {
-      try visitor.visitSingularEnumField(value: self.shieldedProtocol, fieldNumber: 2)
-    }
-    if self.maxEntries != 0 {
-      try visitor.visitSingularUInt32Field(value: self.maxEntries, fieldNumber: 3)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  static func ==(lhs: GetSubtreeRootsArg, rhs: GetSubtreeRootsArg) -> Bool {
-    if lhs.startIndex != rhs.startIndex {return false}
-    if lhs.shieldedProtocol != rhs.shieldedProtocol {return false}
-    if lhs.maxEntries != rhs.maxEntries {return false}
-    if lhs.unknownFields != rhs.unknownFields {return false}
-    return true
-  }
-}
-
-extension SubtreeRoot: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = _protobuf_package + ".SubtreeRoot"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    2: .same(proto: "rootHash"),
-    3: .same(proto: "completingBlockHash"),
-    4: .same(proto: "completingBlockHeight"),
-  ]
-
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
-      switch fieldNumber {
-      case 2: try { try decoder.decodeSingularBytesField(value: &self.rootHash) }()
-      case 3: try { try decoder.decodeSingularBytesField(value: &self.completingBlockHash) }()
-      case 4: try { try decoder.decodeSingularUInt64Field(value: &self.completingBlockHeight) }()
-      default: break
-      }
-    }
-  }
-
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.rootHash.isEmpty {
-      try visitor.visitSingularBytesField(value: self.rootHash, fieldNumber: 2)
-    }
-    if !self.completingBlockHash.isEmpty {
-      try visitor.visitSingularBytesField(value: self.completingBlockHash, fieldNumber: 3)
-    }
-    if self.completingBlockHeight != 0 {
-      try visitor.visitSingularUInt64Field(value: self.completingBlockHeight, fieldNumber: 4)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  static func ==(lhs: SubtreeRoot, rhs: SubtreeRoot) -> Bool {
-    if lhs.rootHash != rhs.rootHash {return false}
-    if lhs.completingBlockHash != rhs.completingBlockHash {return false}
-    if lhs.completingBlockHeight != rhs.completingBlockHeight {return false}
+    if lhs.tree != rhs.tree {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }

package/ios/ZCashLightClientKit/Modules/Service/LightWalletService.swift

@@ -180,7 +180,6 @@ protocol LightWalletService: AnyObject {
     func fetchTransaction(txId: Data) async throws -> ZcashTransaction.Fetched
 
     /// - Throws: `serviceFetchUTXOsFailed` when GRPC call fails.
-    // sourcery: mockedName="fetchUTXOsSingle"
     func fetchUTXOs(for tAddress: String, height: BlockHeight) -> AsyncThrowingStream<UnspentTransactionOutputEntity, Error>
 
     /// - Throws: `serviceFetchUTXOsFailed` when GRPC call fails.
@@ -193,11 +192,4 @@ protocol LightWalletService: AnyObject {
     ) -> AsyncThrowingStream<ZcashCompactBlock, Error>
 
     func closeConnection()
-    
-    /// Returns a stream of information about roots of subtrees of the Sapling and Orchard
-    /// note commitment trees.
-    ///
-    /// - Parameters:
-    ///   - request: Request to send to GetSubtreeRoots.
-    func getSubtreeRoots(_ request: GetSubtreeRootsArg) -> AsyncThrowingStream<SubtreeRoot, Error>
 }

package/ios/ZCashLightClientKit/Providers/LatestBlocksDataProvider.swift

@@ -8,52 +8,62 @@
 import Foundation
 
 protocol LatestBlocksDataProvider {
-    var fullyScannedHeight: BlockHeight { get async }
-    var maxScannedHeight: BlockHeight { get async }
+    var latestScannedHeight: BlockHeight { get async }
+    var latestScannedTime: TimeInterval { get async }
     var latestBlockHeight: BlockHeight { get async }
     var walletBirthday: BlockHeight { get async }
 
     func updateScannedData() async
     func updateBlockData() async
     func updateWalletBirthday(_ walletBirthday: BlockHeight) async
-    func update(_ latestBlockHeight: BlockHeight) async
+    func updateLatestScannedHeight(_ latestScannedHeight: BlockHeight) async
+    func updateLatestScannedTime(_ latestScannedTime: TimeInterval) async
 }
 
 actor LatestBlocksDataProviderImpl: LatestBlocksDataProvider {
     let service: LightWalletService
-    let rustBackend: ZcashRustBackendWelding
+    let transactionRepository: TransactionRepository
     
     // Valid values are stored here after Synchronizer's `prepare` is called.
-    private(set) var fullyScannedHeight: BlockHeight = .zero
-    private(set) var maxScannedHeight: BlockHeight = .zero
+    private(set) var latestScannedHeight: BlockHeight = .zero
+    private(set) var latestScannedTime: TimeInterval = 0.0
     // Valid value is stored here after block processor's `nextState` is called.
     private(set) var latestBlockHeight: BlockHeight = .zero
     // Valid values are stored here after Synchronizer's `prepare` is called.
     private(set) var walletBirthday: BlockHeight = .zero
 
-    init(service: LightWalletService, rustBackend: ZcashRustBackendWelding) {
+    init(service: LightWalletService, transactionRepository: TransactionRepository) {
         self.service = service
-        self.rustBackend = rustBackend
+        self.transactionRepository = transactionRepository
     }
     
+    /// Call of this function is potentially dangerous and can result in `database lock` errors.
+    /// Typical use is outside of a sync process. Example: Synchronizer's prepare function, call there is a safe one.
+    /// The update of `latestScannedHeight` and `latestScannedTime` during the syncing is done via
+    /// appropriate `updateX()` methods inside `BlockScanner` so `transactionRepository` is omitted.
     func updateScannedData() async {
-        fullyScannedHeight = (try? await rustBackend.fullyScannedHeight()) ?? walletBirthday
-        maxScannedHeight = (try? await rustBackend.maxScannedHeight()) ?? walletBirthday
+        latestScannedHeight = (try? await transactionRepository.lastScannedHeight()) ?? walletBirthday
+        if let time = try? await transactionRepository.blockForHeight(latestScannedHeight)?.time {
+            latestScannedTime = TimeInterval(time)
+        }
     }
-
+    
     func updateBlockData() async {
-        if let newLatestBlockHeight = try? await service.latestBlockHeight() {
-            await update(newLatestBlockHeight)
+        if let newLatestBlockHeight = try? await service.latestBlockHeight(),
+        latestBlockHeight < newLatestBlockHeight {
+            latestBlockHeight = newLatestBlockHeight
         }
     }
-
+    
     func updateWalletBirthday(_ walletBirthday: BlockHeight) async {
         self.walletBirthday = walletBirthday
     }
     
-    func update(_ newLatestBlockHeight: BlockHeight) async {
-        if latestBlockHeight < newLatestBlockHeight {
-            latestBlockHeight = newLatestBlockHeight
-        }
+    func updateLatestScannedHeight(_ latestScannedHeight: BlockHeight) async {
+        self.latestScannedHeight = latestScannedHeight
+    }
+    
+    func updateLatestScannedTime(_ latestScannedTime: TimeInterval) async {
+        self.latestScannedTime = latestScannedTime
     }
 }

package/ios/ZCashLightClientKit/Repository/CompactBlockRepository.swift

@@ -15,7 +15,7 @@ protocol CompactBlockRepository {
     /**
     Gets the height of the highest block that is currently stored.
     */
-    func latestHeight() async throws -> BlockHeight
+    func latestHeight() async -> BlockHeight
 
     /**
     Write the given blocks to this store, which may be anything from an in-memory cache to a DB.

package/ios/ZCashLightClientKit/Repository/TransactionRepository.swift

@@ -11,7 +11,11 @@ protocol TransactionRepository {
     func closeDBConnection()
     func countAll() async throws -> Int
     func countUnmined() async throws -> Int
+    func blockForHeight(_ height: BlockHeight) async throws -> Block?
+    func lastScannedHeight() async throws -> BlockHeight
+    func lastScannedBlock() async throws -> Block?
     func isInitialized() async throws -> Bool
+    func find(id: Int) async throws -> ZcashTransaction.Overview
     func find(rawID: Data) async throws -> ZcashTransaction.Overview
     func find(offset: Int, limit: Int, kind: TransactionKind) async throws -> [ZcashTransaction.Overview]
     func find(in range: CompactBlockRange, limit: Int, kind: TransactionKind) async throws -> [ZcashTransaction.Overview]
@@ -20,6 +24,6 @@ protocol TransactionRepository {
     func findReceived(offset: Int, limit: Int) async throws -> [ZcashTransaction.Overview]
     func findSent(offset: Int, limit: Int) async throws -> [ZcashTransaction.Overview]
     func findMemos(for transaction: ZcashTransaction.Overview) async throws -> [Memo]
-    func getRecipients(for rawID: Data) async throws -> [TransactionRecipient]
-    func getTransactionOutputs(for rawID: Data) async throws -> [ZcashTransaction.Output]
+    func getRecipients(for id: Int) async throws -> [TransactionRecipient]
+    func getTransactionOutputs(for id: Int) async throws -> [ZcashTransaction.Output]
 }

package/ios/ZCashLightClientKit/Resources/checkpoints/mainnet/2460000.json

@@ -0,0 +1,8 @@
+{
+  "network": "main",
+  "height": "2460000",
+  "hash": "0000000000a80564b9debb0924e78c72e71219113926631b18247182df16d0e1",
+  "time": 1712280596,
+  "saplingTree": "014219aac068b520e9bb0875efaf8f6b9d4b5cb87cbe436a3eb7dd1c6aadd25872013cffa5b64a9f7cf9d88d75c0335a76c2a7cc36970e33a5e4c14928dd0122f3241a00014b8c1f93bc144b0e9a4f4e993032a6594df6be5c46da8cebb4d79680c9a9df29000000018755b473c246b7ffed524cf0f847f64881e0a8c328b8a9c2a306d8e757b0f12101e1c12dc145c0ac8887a1972db6d116aeb2aec56b74fd2d1512ddf110e08fd53000000189e127b6ffb369c16447e4f812ec20a50df4446ebdea3d1b5f998f3da3b62616000001067187080be7f0b7273e4331b7505d7c985974c9c461fa602d80cc999289432501e3644c42c5d7ecd832a2c662dcd397824930ebe37b37bc61ec5af84f724c2571000132c525343fc4ebe79ab6515e9d9fceb916d920394bad5926a1afe7f46badef420001d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e",
+  "orchardTree": "01fb149d0df15c527e6835fb5d390cbeda1f145d686f65122265ce135189c1572f001f016b7b5ab212d482bd440dc01b56a8ddb971f47977cd20a19fceed6ac80e5f562a0108312ad01321d0add9aaf53c53ffddd7517d26abecfb7abbf38f5e9619e8573a01442421c12b4765419f3fa597869b0796d67f10d71bbeb268d779840984b11f1d01aabedb668b408751bf9aecbcf1fbc01b20422ebc854ce2ff46f44f4afb7dd11d0115c625f23c8821eead1f11c18262b58febe7d93acba6ce1f7909c611a0de7f1a000001bb42696ce5ace721acb713867320296bbb729d697610d9525bec9f5864f1d20a00000000000001be7e4675134c4441539879962acf4c9ce2523471c82f11a2bfe90d910e5ac11901d386508c9fabdc60836bfe3c7251fcbdd4617180a804d40fa29dc25fb9c0aa3401cf3bf92f69798e68555548afcce1648add1fb2548d64fa9a1ec22a3e26e7890101e637281deb58dff0c44ba13149b784a95da1b493005efd057e6f4ac20ef5d81d000001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000"
+}