react-native-zcash 0.6.14 → 0.7.1

package/ios/ZCashLightClientKit/Entity/AccountEntity.swift

@@ -14,11 +14,6 @@ protocol AccountEntity {
 }
 
 struct DbAccount: AccountEntity, Encodable, Decodable {
-    enum CodingKeys: String, CodingKey {
-        case account
-        case ufvk
-    }
-    
     let account: Int
     let ufvk: String
 }
@@ -38,171 +33,3 @@ extension DbAccount: Hashable {
         return true
     }
 }
-
-protocol AccountRepository {
-    func getAll() throws -> [AccountEntity]
-    func findBy(account: Int) throws -> AccountEntity?
-    func update(_ account: AccountEntity) throws
-}
-
-class AccountSQDAO: AccountRepository {
-    enum TableColums {
-        static let account = Expression<Int>("account")
-        static let extfvk = Expression<String>("ufvk")
-    }
-
-    let table = Table("accounts")
-
-    let dbProvider: ConnectionProvider
-    let logger: Logger
-    
-    init(dbProvider: ConnectionProvider, logger: Logger) {
-        self.dbProvider = dbProvider
-        self.logger = logger
-    }
-
-    /// - Throws:
-    ///     - `accountDAOGetAllCantDecode` if account data fetched from the db can't be decoded to the `Account` object.
-    ///     - `accountDAOGetAll` if sqlite query fetching account data failed.
-    func getAll() throws -> [AccountEntity] {
-        do {
-            globalDBLock.lock()
-            defer { globalDBLock.unlock() }
-            
-            return try dbProvider.connection()
-                .prepare(table)
-                .map { row -> DbAccount in
-                    do {
-                        return try row.decode()
-                    } catch {
-                        throw ZcashError.accountDAOGetAllCantDecode(error)
-                    }
-                }
-        } catch {
-            if let error = error as? ZcashError {
-                throw error
-            } else {
-                throw ZcashError.accountDAOGetAll(error)
-            }
-        }
-    }
-
-    /// - Throws:
-    ///     - `accountDAOFindByCantDecode` if account data fetched from the db can't be decoded to the `Account` object.
-    ///     - `accountDAOFindBy` if sqlite query fetching account data failed.
-    func findBy(account: Int) throws -> AccountEntity? {
-        let query = table.filter(TableColums.account == account).limit(1)
-        do {
-            globalDBLock.lock()
-            defer { globalDBLock.unlock() }
-
-            return try dbProvider.connection()
-                .prepare(query)
-                .map {
-                    do {
-                        return try $0.decode() as DbAccount
-                    } catch {
-                        throw ZcashError.accountDAOFindByCantDecode(error)
-                    }
-                }
-                .first
-        } catch {
-            if let error = error as? ZcashError {
-                throw error
-            } else {
-                throw ZcashError.accountDAOFindBy(error)
-            }
-        }
-    }
-
-    /// - Throws:
-    ///     - `accountDAOUpdate` if sqlite query updating account failed.
-    ///     - `accountDAOUpdatedZeroRows` if sqlite query updating account pass but it affects 0 rows.
-    func update(_ account: AccountEntity) throws {
-        guard let acc = account as? DbAccount else {
-            throw ZcashError.accountDAOUpdateInvalidAccount
-        }
-
-        let updatedRows: Int
-        do {
-            globalDBLock.lock()
-            defer { globalDBLock.unlock() }
-
-            updatedRows = try dbProvider.connection().run(table.filter(TableColums.account == acc.account).update(acc))
-        } catch {
-            throw ZcashError.accountDAOUpdate(error)
-        }
-
-        if updatedRows == 0 {
-            logger.error("attempted to update pending transactions but no rows were updated")
-            throw ZcashError.accountDAOUpdatedZeroRows
-        }
-    }
-}
-
-class CachingAccountDao: AccountRepository {
-    let dao: AccountRepository
-    lazy var cache: [Int: AccountEntity] = {
-        var accountCache: [Int: AccountEntity] = [:]
-        guard let all = try? dao.getAll() else {
-            return accountCache
-        }
-
-        for acc in all {
-            accountCache[acc.account] = acc
-        }
-
-        return accountCache
-    }()
-    
-    init(dao: AccountRepository) {
-        self.dao = dao
-    }
-    
-    func getAll() throws -> [AccountEntity] {
-        guard cache.isEmpty else {
-            return cache.values.sorted(by: { $0.account < $1.account })
-        }
-
-        let all = try dao.getAll()
-        
-        for acc in all {
-            cache[acc.account] = acc
-        }
-
-        return all
-    }
-    
-    func findBy(account: Int) throws -> AccountEntity? {
-        if let acc = cache[account] {
-            return acc
-        }
-        
-        let acc = try dao.findBy(account: account)
-        cache[account] = acc
-
-        return acc
-    }
-        
-    func update(_ account: AccountEntity) throws {
-        try dao.update(account)
-    }
-}
-
-enum AccountRepositoryBuilder {
-    static func build(dataDbURL: URL, readOnly: Bool = false, caching: Bool = false, logger: Logger) -> AccountRepository {
-        if caching {
-            return CachingAccountDao(
-                dao: AccountSQDAO(
-                    dbProvider: SimpleConnectionProvider(path: dataDbURL.path, readonly: readOnly),
-                    logger: logger
-                )
-            )
-        } else {
-            return AccountSQDAO(
-                dbProvider: SimpleConnectionProvider(path: dataDbURL.path, readonly: readOnly),
-                logger: logger
-            )
-        }
-    }
-}

package/ios/ZCashLightClientKit/Entity/TransactionEntity.swift

@@ -65,6 +65,7 @@ public enum ZcashTransaction {
         public enum Pool {
             case transaparent
             case sapling
+            case orchard
             case other(Int)
             init(rawValue: Int) {
                 switch rawValue {
@@ -72,6 +73,8 @@ public enum ZcashTransaction {
                     self = .transaparent
                 case 2:
                     self = .sapling
+                case 3:
+                    self = .orchard
                 default:
                     self = .other(rawValue)
                 }
@@ -101,8 +104,8 @@ extension ZcashTransaction.Output {
         static let rawID = Expression<Blob>("txid")
         static let pool = Expression<Int>("output_pool")
         static let index = Expression<Int>("output_index")
-        static let toAccount = Expression<Int?>("to_account")
-        static let fromAccount = Expression<Int?>("from_account")
+        static let toAccount = Expression<Int?>("to_account_id")
+        static let fromAccount = Expression<Int?>("from_account_id")
         static let toAddress = Expression<String?>("to_address")
         static let value = Expression<Int64>("value")
         static let isChange = Expression<Bool>("is_change")

package/ios/ZCashLightClientKit/Error/Sourcery/generateErrorCode.sh

@@ -3,7 +3,7 @@
 scriptDir=${0:a:h}
 cd "${scriptDir}"
 
-sourcery_version=2.0.3
+sourcery_version=2.1.7
 
 if which sourcery >/dev/null; then
     if [[ $(sourcery --version) != $sourcery_version ]]; then

package/ios/ZCashLightClientKit/Error/ZcashError.swift

@@ -1,4 +1,4 @@
-// Generated using Sourcery 2.0.3 — https://github.com/krzysztofzablocki/Sourcery
+// Generated using Sourcery 2.1.7 — https://github.com/krzysztofzablocki/Sourcery
 // DO NOT EDIT
 
 /*
@@ -317,6 +317,31 @@ public enum ZcashError: Equatable, Error {
     /// - `progress` value reported
     /// ZRUST0055
     case rustScanProgressOutOfRange(_ progress: String)
+    /// Error from rust layer when calling ZcashRustBackend.getWalletSummary
+    /// - `rustError` contains error generated by the rust layer.
+    /// ZRUST0056
+    case rustGetWalletSummary(_ rustError: String)
+    /// Error from rust layer when calling ZcashRustBackend.
+    /// - `rustError` contains error generated by the rust layer.
+    /// ZRUST0057
+    case rustProposeTransferFromURI(_ rustError: String)
+    /// Error from rust layer when calling ZcashRustBackend.
+    /// - `rustError` contains error generated by the rust layer.
+    /// ZRUST0058
+    case rustListAccounts(_ rustError: String)
+    /// Error from rust layer when calling ZcashRustBackend.rustIsSeedRelevantToAnyDerivedAccount
+    /// - `rustError` contains error generated by the rust layer.
+    /// ZRUST0059
+    case rustIsSeedRelevantToAnyDerivedAccount(_ rustError: String)
+    /// Unable to allocate memory required to write blocks when calling ZcashRustBackend.putOrchardSubtreeRoots
+    /// sourcery: code="ZRUST0060"
+    /// ZRUST0060
+    case rustPutOrchardSubtreeRootsAllocationProblem
+    /// Error from rust layer when calling ZcashRustBackend.putOrchardSubtreeRoots
+    /// - `rustError` contains error generated by the rust layer.
+    /// sourcery: code="ZRUST0061"
+    /// ZRUST0061
+    case rustPutOrchardSubtreeRoots(_ rustError: String)
     /// SQLite query failed when fetching all accounts from the database.
     /// - `sqliteError` is error produced by SQLite library.
     /// ZADAO0001
@@ -562,6 +587,9 @@ public enum ZcashError: Equatable, Error {
     /// Getting the `supportedSyncAlgorithm` failed but it's supposed to always provide some value.
     /// ZCBPEO0021
     case compactBlockProcessorSupportedSyncAlgorithm
+    /// Put Orchard subtree roots to the DB failed.
+    /// ZCBPEO0022
+    case compactBlockProcessorPutOrchardSubtreeRoots(_ error: Error)
     /// The synchronizer is unprepared.
     /// ZSYNCO0001
     case synchronizerNotPrepared
@@ -580,6 +608,12 @@ public enum ZcashError: Equatable, Error {
     /// Indicates that this Synchronizer is disconnected from its lightwalletd server.
     /// ZSYNCO0006
     case synchronizerDisconnected
+    /// The attempt to switch endpoints failed. Check that the hostname and port are correct, and are formatted as <hostname>:<port>.
+    /// ZSYNCO0007
+    case synchronizerServerSwitch
+    /// The spending key does not belong to the wallet.
+    /// ZSYNCO0008
+    case synchronizerSpendingKeyDoesNotBelongToTheWallet
 
     public var message: String {
         switch self {
@@ -665,6 +699,12 @@ public enum ZcashError: Equatable, Error {
         case .rustMaxScannedHeight: return "Error from rust layer when calling ZcashRustBackend.maxScannedHeight"
         case .rustLatestCachedBlockHeight: return "Error from rust layer when calling ZcashRustBackend.latestCachedBlockHeight"
         case .rustScanProgressOutOfRange: return "Rust layer's call ZcashRustBackend.getScanProgress returned values that after computation are outside of allowed range 0-100%."
+        case .rustGetWalletSummary: return "Error from rust layer when calling ZcashRustBackend.getWalletSummary"
+        case .rustProposeTransferFromURI: return "Error from rust layer when calling ZcashRustBackend."
+        case .rustListAccounts: return "Error from rust layer when calling ZcashRustBackend."
+        case .rustIsSeedRelevantToAnyDerivedAccount: return "Error from rust layer when calling ZcashRustBackend.rustIsSeedRelevantToAnyDerivedAccount"
+        case .rustPutOrchardSubtreeRootsAllocationProblem: return "Unable to allocate memory required to write blocks when calling ZcashRustBackend.putOrchardSubtreeRoots"
+        case .rustPutOrchardSubtreeRoots: return "Error from rust layer when calling ZcashRustBackend.putOrchardSubtreeRoots"
         case .accountDAOGetAll: return "SQLite query failed when fetching all accounts from the database."
         case .accountDAOGetAllCantDecode: return "Fetched accounts from SQLite but can't decode them."
         case .accountDAOFindBy: return "SQLite query failed when seaching for accounts in the database."
@@ -743,12 +783,15 @@ public enum ZcashError: Equatable, Error {
         case .compactBlockProcessorPutSaplingSubtreeRoots: return "Put sapling subtree roots to the DB failed."
         case .compactBlockProcessorLastScannedHeight: return "Getting the `lastScannedHeight` failed but it's supposed to always provide some value."
         case .compactBlockProcessorSupportedSyncAlgorithm: return "Getting the `supportedSyncAlgorithm` failed but it's supposed to always provide some value."
+        case .compactBlockProcessorPutOrchardSubtreeRoots: return "Put Orchard subtree roots to the DB failed."
         case .synchronizerNotPrepared: return "The synchronizer is unprepared."
         case .synchronizerSendMemoToTransparentAddress: return "Memos can't be sent to transparent addresses."
         case .synchronizerShieldFundsInsuficientTransparentFunds: return "There is not enough transparent funds to cover fee for the shielding."
         case .synchronizerLatestUTXOsInvalidTAddress: return "LatestUTXOs for the address failed, invalid t-address."
         case .synchronizerRewindUnknownArchorHeight: return "Rewind failed, unknown archor height"
         case .synchronizerDisconnected: return "Indicates that this Synchronizer is disconnected from its lightwalletd server."
+        case .synchronizerServerSwitch: return "The attempt to switch endpoints failed. Check that the hostname and port are correct, and are formatted as <hostname>:<port>."
+        case .synchronizerSpendingKeyDoesNotBelongToTheWallet: return "The spending key does not belong to the wallet."
         }
     }
 
@@ -836,6 +879,12 @@ public enum ZcashError: Equatable, Error {
         case .rustMaxScannedHeight: return .rustMaxScannedHeight
         case .rustLatestCachedBlockHeight: return .rustLatestCachedBlockHeight
         case .rustScanProgressOutOfRange: return .rustScanProgressOutOfRange
+        case .rustGetWalletSummary: return .rustGetWalletSummary
+        case .rustProposeTransferFromURI: return .rustProposeTransferFromURI
+        case .rustListAccounts: return .rustListAccounts
+        case .rustIsSeedRelevantToAnyDerivedAccount: return .rustIsSeedRelevantToAnyDerivedAccount
+        case .rustPutOrchardSubtreeRootsAllocationProblem: return .rustPutOrchardSubtreeRootsAllocationProblem
+        case .rustPutOrchardSubtreeRoots: return .rustPutOrchardSubtreeRoots
         case .accountDAOGetAll: return .accountDAOGetAll
         case .accountDAOGetAllCantDecode: return .accountDAOGetAllCantDecode
         case .accountDAOFindBy: return .accountDAOFindBy
@@ -914,12 +963,15 @@ public enum ZcashError: Equatable, Error {
         case .compactBlockProcessorPutSaplingSubtreeRoots: return .compactBlockProcessorPutSaplingSubtreeRoots
         case .compactBlockProcessorLastScannedHeight: return .compactBlockProcessorLastScannedHeight
         case .compactBlockProcessorSupportedSyncAlgorithm: return .compactBlockProcessorSupportedSyncAlgorithm
+        case .compactBlockProcessorPutOrchardSubtreeRoots: return .compactBlockProcessorPutOrchardSubtreeRoots
         case .synchronizerNotPrepared: return .synchronizerNotPrepared
         case .synchronizerSendMemoToTransparentAddress: return .synchronizerSendMemoToTransparentAddress
         case .synchronizerShieldFundsInsuficientTransparentFunds: return .synchronizerShieldFundsInsuficientTransparentFunds
         case .synchronizerLatestUTXOsInvalidTAddress: return .synchronizerLatestUTXOsInvalidTAddress
         case .synchronizerRewindUnknownArchorHeight: return .synchronizerRewindUnknownArchorHeight
         case .synchronizerDisconnected: return .synchronizerDisconnected
+        case .synchronizerServerSwitch: return .synchronizerServerSwitch
+        case .synchronizerSpendingKeyDoesNotBelongToTheWallet: return .synchronizerSpendingKeyDoesNotBelongToTheWallet
         }
     }
 

package/ios/ZCashLightClientKit/Error/ZcashErrorCode.swift

@@ -1,4 +1,4 @@
-// Generated using Sourcery 2.0.3 — https://github.com/krzysztofzablocki/Sourcery
+// Generated using Sourcery 2.1.7 — https://github.com/krzysztofzablocki/Sourcery
 // DO NOT EDIT
 
 /*
@@ -173,6 +173,18 @@ public enum ZcashErrorCode: String {
     case rustLatestCachedBlockHeight = "ZRUST0054"
     /// Rust layer's call ZcashRustBackend.getScanProgress returned values that after computation are outside of allowed range 0-100%.
     case rustScanProgressOutOfRange = "ZRUST0055"
+    /// Error from rust layer when calling ZcashRustBackend.getWalletSummary
+    case rustGetWalletSummary = "ZRUST0056"
+    /// Error from rust layer when calling ZcashRustBackend.
+    case rustProposeTransferFromURI = "ZRUST0057"
+    /// Error from rust layer when calling ZcashRustBackend.
+    case rustListAccounts = "ZRUST0058"
+    /// Error from rust layer when calling ZcashRustBackend.rustIsSeedRelevantToAnyDerivedAccount
+    case rustIsSeedRelevantToAnyDerivedAccount = "ZRUST0059"
+    /// Unable to allocate memory required to write blocks when calling ZcashRustBackend.putOrchardSubtreeRoots
+    case rustPutOrchardSubtreeRootsAllocationProblem = "ZRUST0060"
+    /// Error from rust layer when calling ZcashRustBackend.putOrchardSubtreeRoots
+    case rustPutOrchardSubtreeRoots = "ZRUST0061"
     /// SQLite query failed when fetching all accounts from the database.
     case accountDAOGetAll = "ZADAO0001"
     /// Fetched accounts from SQLite but can't decode them.
@@ -329,6 +341,8 @@ public enum ZcashErrorCode: String {
     case compactBlockProcessorLastScannedHeight = "ZCBPEO0020"
     /// Getting the `supportedSyncAlgorithm` failed but it's supposed to always provide some value.
     case compactBlockProcessorSupportedSyncAlgorithm = "ZCBPEO0021"
+    /// Put Orchard subtree roots to the DB failed.
+    case compactBlockProcessorPutOrchardSubtreeRoots = "ZCBPEO0022"
     /// The synchronizer is unprepared.
     case synchronizerNotPrepared = "ZSYNCO0001"
     /// Memos can't be sent to transparent addresses.
@@ -341,4 +355,8 @@ public enum ZcashErrorCode: String {
     case synchronizerRewindUnknownArchorHeight = "ZSYNCO0005"
     /// Indicates that this Synchronizer is disconnected from its lightwalletd server.
     case synchronizerDisconnected = "ZSYNCO0006"
+    /// The attempt to switch endpoints failed. Check that the hostname and port are correct, and are formatted as <hostname>:<port>.
+    case synchronizerServerSwitch = "ZSYNCO0007"
+    /// The spending key does not belong to the wallet.
+    case synchronizerSpendingKeyDoesNotBelongToTheWallet = "ZSYNCO0008"
 }

package/ios/ZCashLightClientKit/Error/ZcashErrorCodeDefinition.swift

@@ -344,6 +344,29 @@ enum ZcashErrorDefinition {
     /// - `progress` value reported
     // sourcery: code="ZRUST0055"
     case rustScanProgressOutOfRange(_ progress: String)
+    /// Error from rust layer when calling ZcashRustBackend.getWalletSummary
+    /// - `rustError` contains error generated by the rust layer.
+    // sourcery: code="ZRUST0056"
+    case rustGetWalletSummary(_ rustError: String)
+    /// Error from rust layer when calling ZcashRustBackend.
+    /// - `rustError` contains error generated by the rust layer.
+    // sourcery: code="ZRUST0057"
+    case rustProposeTransferFromURI(_ rustError: String)
+    /// Error from rust layer when calling ZcashRustBackend.
+    /// - `rustError` contains error generated by the rust layer.
+    // sourcery: code="ZRUST0058"
+    case rustListAccounts(_ rustError: String)
+    /// Error from rust layer when calling ZcashRustBackend.rustIsSeedRelevantToAnyDerivedAccount
+    /// - `rustError` contains error generated by the rust layer.
+    // sourcery: code="ZRUST0059"
+    case rustIsSeedRelevantToAnyDerivedAccount(_ rustError: String)
+    /// Unable to allocate memory required to write blocks when calling ZcashRustBackend.putOrchardSubtreeRoots
+    /// sourcery: code="ZRUST0060"
+    case rustPutOrchardSubtreeRootsAllocationProblem
+    /// Error from rust layer when calling ZcashRustBackend.putOrchardSubtreeRoots
+    /// - `rustError` contains error generated by the rust layer.
+    /// sourcery: code="ZRUST0061"
+    case rustPutOrchardSubtreeRoots(_ rustError: String)
 
     // MARK: - Account DAO
 
@@ -638,6 +661,9 @@ enum ZcashErrorDefinition {
     /// Getting the `supportedSyncAlgorithm` failed but it's supposed to always provide some value.
     // sourcery: code="ZCBPEO0021"
     case compactBlockProcessorSupportedSyncAlgorithm
+    /// Put Orchard subtree roots to the DB failed.
+    // sourcery: code="ZCBPEO0022"
+    case compactBlockProcessorPutOrchardSubtreeRoots(_ error: Error)
 
     // MARK: - SDKSynchronizer
     
@@ -659,4 +685,10 @@ enum ZcashErrorDefinition {
     /// Indicates that this Synchronizer is disconnected from its lightwalletd server.
     // sourcery: code="ZSYNCO0006"
     case synchronizerDisconnected
+    /// The attempt to switch endpoints failed. Check that the hostname and port are correct, and are formatted as <hostname>:<port>.
+    // sourcery: code="ZSYNCO0007"
+    case synchronizerServerSwitch
+    /// The spending key does not belong to the wallet.
+    // sourcery: code="ZSYNCO0008"
+    case synchronizerSpendingKeyDoesNotBelongToTheWallet
 }

package/ios/ZCashLightClientKit/Initializer.swift

@@ -111,18 +111,17 @@ public class Initializer {
 
     let container: DIContainer
     let alias: ZcashSynchronizerAlias
-    let endpoint: LightWalletEndpoint
+    var endpoint: LightWalletEndpoint
     let fsBlockDbRoot: URL
     let generalStorageURL: URL
     let dataDbURL: URL
     let spendParamsURL: URL
     let outputParamsURL: URL
     let saplingParamsSourceURL: SaplingParamsSourceURL
-    let lightWalletService: LightWalletService
+    var lightWalletService: LightWalletService
     let transactionRepository: TransactionRepository
-    let accountRepository: AccountRepository
     let storage: CompactBlockRepository
-    let blockDownloaderService: BlockDownloaderService
+    var blockDownloaderService: BlockDownloaderService
     let network: ZcashNetwork
     let logger: Logger
     let rustBackend: ZcashRustBackendWelding
@@ -272,24 +271,14 @@ public class Initializer {
         self.alias = alias
         self.lightWalletService = container.resolve(LightWalletService.self)
         self.transactionRepository = container.resolve(TransactionRepository.self)
-        self.accountRepository = AccountRepositoryBuilder.build(
-            dataDbURL: urls.dataDbURL,
-            readOnly: true,
-            caching: true,
-            logger: container.resolve(Logger.self)
-        )
         self.storage = container.resolve(CompactBlockRepository.self)
         self.blockDownloaderService = container.resolve(BlockDownloaderService.self)
         self.network = network
-        self.walletBirthday = Checkpoint.birthday(with: 0, network: network).height
+        self.walletBirthday = container.resolve(CheckpointSource.self).saplingActivation.height
         self.urlsParsingError = urlsParsingError
         self.logger = container.resolve(Logger.self)
     }
     
-    private static func makeLightWalletServiceFactory(endpoint: LightWalletEndpoint) -> LightWalletServiceFactory {
-        return LightWalletServiceFactory(endpoint: endpoint)
-    }
-    
     // swiftlint:disable:next function_parameter_count
     private static func setup(
         container: DIContainer,
@@ -416,12 +405,14 @@ public class Initializer {
             return .seedRequired
         }
 
-        let checkpoint = Checkpoint.birthday(with: walletBirthday, network: network)
+        let checkpointSource = container.resolve(CheckpointSource.self)
+
+        let checkpoint = checkpointSource.birthday(for: walletBirthday)
 
         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 {
+        if let seed, try await rustBackend.listAccounts().isEmpty {
             var chainTip: UInt32?
             
             if walletMode == .restoreWallet {