react-native-zcash 0.6.13 → 0.7.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## 0.7.0 (2024-04-22)
+
+- added: Support Orchard pool
+- added: Support ZIP-317 fees
+- changed: (Android) Upgrade zcash-android-sdk to v2.1.0
+- changed: (iOS) Upgrade zcash-swift-wallet-sdk to v2.1.5
+- changed: Updated checkpoints
+
+## 0.6.14 (2024-04-12)
+
+- fixed: Include missing Rust header file.
+
 ## 0.6.13 (2024-04-12)
 
 - fixed: Update the packaging scripts to clean leftover files.

package/android/build.gradle

@@ -45,12 +45,12 @@ dependencies {
   implementation 'com.facebook.react:react-native:+'
 
   // Compiler plugin for Room annotation support:
-  kapt 'androidx.room:room-compiler:2.3.0'
+  kapt 'androidx.room:room-compiler:2.5.1'
 
-  implementation 'androidx.appcompat:appcompat:1.4.1'
+  implementation 'androidx.appcompat:appcompat:1.6.1'
   implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
-  implementation 'cash.z.ecc.android:zcash-android-sdk:2.0.1'
-  implementation 'cash.z.ecc.android:zcash-android-sdk-incubator:2.0.1'
+  implementation 'cash.z.ecc.android:zcash-android-sdk:2.1.0'
+  implementation 'cash.z.ecc.android:zcash-android-sdk-incubator:2.1.0'
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
 }

package/android/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/2470000.json

@@ -0,0 +1,8 @@
+{
+  "network": "main",
+  "height": "2470000",
+  "hash": "000000000075b3a97ae9743e0bd3c08c704260c36a4bbfa6afc4baef1b1a04cb",
+  "time": 1713034443,
+  "saplingTree": "0163c99ed4e459cddcec67a85ea52be38666dd5759e5d335bc56ee26772c5fb81a001a000001483d8ab93ab8d9cd2f59fe85fbc10a173289f44bd23ed9ab0a27f9d7a5ec393b01416578326834c62775610da56b8fce12a2d3de4f9548559689016462f00379630001d831b91c6d25e49e000182144353c256a3ea80496209e496fd9200c487a46e2b01d8f20b7f6c982b7adbdf7a1c5028f760e7123af82bbf7e66542bb7322e3fc92800015ba0bd2b1b6c7bde0dd6a4ffac86bba86abc2938415d57d8cf3c4f70376d902f000001f5b1b613f54794f437ed0a2b77e4fe97ecefb18c2476bf5d3ec87f3c94903d2901067187080be7f0b7273e4331b7505d7c985974c9c461fa602d80cc999289432501e3644c42c5d7ecd832a2c662dcd397824930ebe37b37bc61ec5af84f724c2571000132c525343fc4ebe79ab6515e9d9fceb916d920394bad5926a1afe7f46badef420001d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e",
+  "orchardTree": "01d55eef517b7c62fa57229ff715d585c230dc206a10bc9b1bbbf62d0078f25f1f001f000109a4066c261033c9a8abcf6ad56fca73f2af97b5f35bc26830b934ef728fd31500013aef4b4b3e74e991b27731803a64d511171a12bc4061cc42c1cc95d1d9047c340000000156f8dd022692afceae0cc5507a36dc2b92884a365694bde5ed3dbb696d0c9b000001c46f981379e9f178d47f609374ca4ef05bd411d838bf9e675f6246b0c1da521f010d2fb3b0880ce34e264318a8faeace5e051b47afcbcba1edfab81aa66bd7ff2f00000001be7e4675134c4441539879962acf4c9ce2523471c82f11a2bfe90d910e5ac11901d386508c9fabdc60836bfe3c7251fcbdd4617180a804d40fa29dc25fb9c0aa3401cf3bf92f69798e68555548afcce1648add1fb2548d64fa9a1ec22a3e26e7890101e637281deb58dff0c44ba13149b784a95da1b493005efd057e6f4ac20ef5d81d000001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000"
+}

package/android/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/2480000.json

@@ -0,0 +1,8 @@
+{
+  "network": "main",
+  "height": "2480000",
+  "hash": "0000000000c9d82d89812e8dd92035a21014979a15f663fc47a3e36d1e9b5999",
+  "time": 1713789086,
+  "saplingTree": "016764311f2bcdc08178b70c45f2e0036e7415748abae5d283abf678ea993b385b0122147fa534811350be14f8128c36ae9748fe8b9348664d416f51185cc4771b491a01fcad5b9796a4e485473ff204e651721b8d201a07d497af24ee406c6e63b2ac1201b25001f285610ec59bc277e9caa360738d2d184a952358192721d4238f4ad2310148ce5a2c88f987b9c7a2994a046613a6de26f8274cd2037ca0754e6812248736017a705085e7f0d3e22e2e456b53fe3f478110ef8cf03325aa0a58974dbe257a68000105382ab4538fcc9cd96ea85754f12b48c52c0b453b09e97749c4b7559f1fd20101dbca9b9a6301c072b891237ef43a80a59bd9dd9148538b40ffd995f5cc4f9a50000156b0ed98cda39d7e743782d5fa1742982377b9e59e8c67e2231f024d416d596101fafaacfbbd8774b6d01b3ff414e8613c8102c09e4b19162b4e35b8f7b51feb6e01ea04ea034fd3c1b70d410a22e513c055c5483588af5cda888abd76040b8fd12701f5b1b613f54794f437ed0a2b77e4fe97ecefb18c2476bf5d3ec87f3c94903d2901067187080be7f0b7273e4331b7505d7c985974c9c461fa602d80cc999289432501e3644c42c5d7ecd832a2c662dcd397824930ebe37b37bc61ec5af84f724c2571000132c525343fc4ebe79ab6515e9d9fceb916d920394bad5926a1afe7f46badef420001d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e",
+  "orchardTree": "01437c83292178db1c0adb262eab5ce220269f2c55523ee427413bf30a0f594f1a0196022aec683abc3de284a9cc85186347c419610970cf8bf00acbad0924d73d3e1f0196bfd1734a258888c224a7b39c75e44e0d8ccfddb272b65b3cb91cf039a7031401f4e3bf0855258c2752008afb4c7f8334521379087cec2745b810f0a230305e1b000000012e329c7688092669ad8be25844685dee10810959e91e4d01164b8ccd18474a3301ab5bf46915e350066d80126c6ec36ac4c5d09d3afdca9304ee4f6383fece272c01ed5675ead46b058d3a6f4062e88f59500a5ecc9d235c9d33e0da7079d6ebbb0c01c119e15e2a70c3bc260295fe011d91c7d2d263855e253b8b10f181150640803a01ff08f5bb1e2ae3b402ef21e37147c68d743f55b7de2db824185130034e6bf31e00019e4bd7faca983514223540eef98c238cd36e4eb7d81d6273274e8d095611651b000001be7e4675134c4441539879962acf4c9ce2523471c82f11a2bfe90d910e5ac11901d386508c9fabdc60836bfe3c7251fcbdd4617180a804d40fa29dc25fb9c0aa3401cf3bf92f69798e68555548afcce1648add1fb2548d64fa9a1ec22a3e26e7890101e637281deb58dff0c44ba13149b784a95da1b493005efd057e6f4ac20ef5d81d000001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000"
+}

package/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt

@@ -107,29 +107,37 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
                 }
             }
             combine(
-                wallet.transparentBalances,
+                wallet.transparentBalance,
                 wallet.saplingBalances,
-            ) { transparentBalances, saplingBalances ->
-                return@combine mapOf(
-                    "transparentBalances" to transparentBalances,
-                    "saplingBalances" to saplingBalances,
+                wallet.orchardBalances,
+            ) { transparentBalance: Zatoshi?, saplingBalances: WalletBalance?, orchardBalances: WalletBalance? ->
+                return@combine Balances(
+                    transparentBalance = transparentBalance,
+                    saplingBalances = saplingBalances,
+                    orchardBalances = orchardBalances,
                 )
             }.collectWith(scope) { map ->
-                val transparentBalances = map["transparentBalances"]
-                val saplingBalances = map["saplingBalances"]
+                val transparentBalance = map.transparentBalance
+                val saplingBalances = map.saplingBalances
+                val orchardBalances = map.orchardBalances
 
-                val transparentAvailableZatoshi = transparentBalances?.available ?: Zatoshi(0L)
-                val transparentTotalZatoshi = transparentBalances?.total ?: Zatoshi(0L)
+                val transparentAvailableZatoshi = transparentBalance ?: Zatoshi(0L)
+                val transparentTotalZatoshi = transparentBalance ?: Zatoshi(0L)
 
                 val saplingAvailableZatoshi = saplingBalances?.available ?: Zatoshi(0L)
                 val saplingTotalZatoshi = saplingBalances?.total ?: Zatoshi(0L)
 
+                val orchardAvailableZatoshi = orchardBalances?.available ?: Zatoshi(0L)
+                val orchardTotalZatoshi = orchardBalances?.total ?: Zatoshi(0L)
+
                 sendEvent("BalanceEvent") { args ->
                     args.putString("alias", alias)
                     args.putString("transparentAvailableZatoshi", transparentAvailableZatoshi.value.toString())
                     args.putString("transparentTotalZatoshi", transparentTotalZatoshi.value.toString())
                     args.putString("saplingAvailableZatoshi", saplingAvailableZatoshi.value.toString())
                     args.putString("saplingTotalZatoshi", saplingTotalZatoshi.value.toString())
+                    args.putString("orchardAvailableZatoshi", orchardAvailableZatoshi.value.toString())
+                    args.putString("orchardTotalZatoshi", orchardTotalZatoshi.value.toString())
                 }
             }
             return@wrap null
@@ -261,6 +269,34 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun proposeTransfer(
+        alias: String,
+        zatoshi: String,
+        toAddress: String,
+        memo: String = "",
+        promise: Promise,
+    ) {
+        val wallet = getWallet(alias)
+        wallet.coroutineScope.launch {
+            try {
+                val proposal =
+                    wallet.proposeTransfer(
+                        Account.DEFAULT,
+                        toAddress,
+                        Zatoshi(zatoshi.toLong()),
+                        memo,
+                    )
+                val map = Arguments.createMap()
+                map.putInt("transactionCount", proposal.transactionCount())
+                map.putString("totalFee", proposal.totalFeeRequired().value.toString())
+                promise.resolve(map)
+            } catch (t: Throwable) {
+                promise.reject("Err", t)
+            }
+        }
+    }
+
     @ReactMethod
     fun sendToAddress(
         alias: String,
@@ -411,4 +447,10 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
             sb.append(String.format("%02x", this[i--]))
         return sb.toString()
     }
+
+    data class Balances(
+        val transparentBalance: Zatoshi?,
+        val saplingBalances: WalletBalance?,
+        val orchardBalances: WalletBalance?,
+    )
 }

package/ios/RNZcash.m

@@ -36,6 +36,14 @@ resolver:(RCTPromiseResolveBlock)resolve
 rejecter:(RCTPromiseRejectBlock)reject
 )
 
+RCT_EXTERN_METHOD(proposeTransfer:(NSString *)alias
+:(NSString *)zatoshi
+:(NSString *)toAddress
+:(NSString *)memo
+resolver:(RCTPromiseResolveBlock)resolve
+rejecter:(RCTPromiseRejectBlock)reject
+)
+
 RCT_EXTERN_METHOD(sendToAddress:(NSString *)alias
 :(NSString *)zatoshi
 :(NSString *)toAddress

package/ios/RNZcash.swift

@@ -36,12 +36,16 @@ struct TotalBalances {
   var transparentTotalZatoshi: Zatoshi
   var saplingAvailableZatoshi: Zatoshi
   var saplingTotalZatoshi: Zatoshi
+  var orchardAvailableZatoshi: Zatoshi
+  var orchardTotalZatoshi: Zatoshi
   var dictionary: [String: Any] {
     return [
       "transparentAvailableZatoshi": String(transparentAvailableZatoshi.amount),
       "transparentTotalZatoshi": String(transparentTotalZatoshi.amount),
       "saplingAvailableZatoshi": String(saplingAvailableZatoshi.amount),
       "saplingTotalZatoshi": String(saplingTotalZatoshi.amount),
+      "orchardAvailableZatoshi": String(orchardAvailableZatoshi.amount),
+      "orchardTotalZatoshi": String(orchardTotalZatoshi.amount),
     ]
   }
   var nsDictionary: NSDictionary {
@@ -199,6 +203,50 @@ class RNZcash: RCTEventEmitter {
     }
   }
 
+  @objc func proposeTransfer(
+    _ alias: String, _ zatoshi: String, _ toAddress: String, _ memo: String,
+    resolver resolve: @escaping RCTPromiseResolveBlock,
+    rejecter reject: @escaping RCTPromiseRejectBlock
+  ) {
+    Task {
+      if let wallet = SynchronizerMap[alias] {
+        let amount = Int64(zatoshi)
+        if amount == nil {
+          reject("ProposeTransferError", "Amount is invalid", genericError)
+          return
+        }
+
+        do {
+          var sdkMemo: Memo? = nil
+          if memo != "" {
+            sdkMemo = try Memo(string: memo)
+          }
+          let proposal = try await wallet.synchronizer.proposeTransfer(
+            accountIndex: 0,
+            recipient: Recipient(toAddress, network: wallet.synchronizer.network.networkType),
+            amount: Zatoshi(amount!),
+            memo: sdkMemo
+          )
+
+          let out: NSMutableDictionary = [
+            "transactionCount": proposal.transactionCount(),
+            "totalFee": String(proposal.totalFeeRequired().amount),
+          ]
+          resolve(out)
+        } catch let error as ZcashError {
+          if case .rustCreateToAddress(let message) = error {
+            // error message with amounts
+            reject("proposeTransferError", message, error)
+          } else {
+            reject("proposeTransferError", "Failed to propose transfer", error)
+          }
+        }
+      } else {
+        reject("ProposeTransferError", "Wallet does not exist", genericError)
+      }
+    }
+  }
+
   @objc func sendToAddress(
     _ alias: String, _ zatoshi: String, _ toAddress: String, _ memo: String, _ seed: String,
     resolver resolve: @escaping RCTPromiseResolveBlock,
@@ -426,7 +474,9 @@ class WalletSynchronizer: NSObject {
       transparentAvailableZatoshi: Zatoshi(0),
       transparentTotalZatoshi: Zatoshi(0),
       saplingAvailableZatoshi: Zatoshi(0),
-      saplingTotalZatoshi: Zatoshi(0))
+      saplingTotalZatoshi: Zatoshi(0),
+      orchardAvailableZatoshi: Zatoshi(0),
+      orchardTotalZatoshi: Zatoshi(0))
   }
 
   public func subscribe() {
@@ -516,32 +566,32 @@ class WalletSynchronizer: NSObject {
       transparentAvailableZatoshi: Zatoshi(0),
       transparentTotalZatoshi: Zatoshi(0),
       saplingAvailableZatoshi: Zatoshi(0),
-      saplingTotalZatoshi: Zatoshi(0))
+      saplingTotalZatoshi: Zatoshi(0),
+      orchardAvailableZatoshi: Zatoshi(0),
+      orchardTotalZatoshi: Zatoshi(0))
   }
 
   func updateBalanceState(event: SynchronizerState) {
-    let transparentBalance = event.transparentBalance
-    let shieldedBalance = event.shieldedBalance
+    let transparentBalance = event.accountBalance?.unshielded ?? Zatoshi(0)
+    let shieldedBalance = event.accountBalance?.saplingBalance ?? PoolBalance.zero
+    let orchardBalance = event.accountBalance?.orchardBalance ?? PoolBalance.zero
 
-    let transparentAvailableZatoshi = transparentBalance.verified
-    let transparentTotalZatoshi = transparentBalance.total
+    let transparentAvailableZatoshi = transparentBalance
+    let transparentTotalZatoshi = transparentBalance
 
-    let saplingAvailableZatoshi = shieldedBalance.verified
-    let saplingTotalZatoshi = shieldedBalance.total
+    let saplingAvailableZatoshi = shieldedBalance.spendableValue
+    let saplingTotalZatoshi = shieldedBalance.total()
 
-    if transparentAvailableZatoshi == self.balances.transparentAvailableZatoshi
-      && transparentTotalZatoshi == self.balances.transparentTotalZatoshi
-      && saplingAvailableZatoshi == self.balances.saplingAvailableZatoshi
-      && saplingTotalZatoshi == self.balances.saplingTotalZatoshi
-    {
-      return
-    }
+    let orchardAvailableZatoshi = orchardBalance.spendableValue
+    let orchardTotalZatoshi = orchardBalance.total()
 
     self.balances = TotalBalances(
       transparentAvailableZatoshi: transparentAvailableZatoshi,
       transparentTotalZatoshi: transparentTotalZatoshi,
       saplingAvailableZatoshi: saplingAvailableZatoshi,
-      saplingTotalZatoshi: saplingTotalZatoshi
+      saplingTotalZatoshi: saplingTotalZatoshi,
+      orchardAvailableZatoshi: orchardAvailableZatoshi,
+      orchardTotalZatoshi: orchardTotalZatoshi
     )
     let data = NSMutableDictionary(dictionary: self.balances.nsDictionary)
     data["alias"] = self.alias

package/ios/ZCashLightClientKit/Block/Actions/DownloadAction.swift

@@ -9,7 +9,7 @@ import Foundation
 
 final class DownloadAction {
     let configProvider: CompactBlockProcessor.ConfigProvider
-    let downloader: BlockDownloader
+    var downloader: BlockDownloader
     let transactionRepository: TransactionRepository
     let logger: Logger
 

package/ios/ZCashLightClientKit/Block/Actions/EnhanceAction.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 final class EnhanceAction {
-    let blockEnhancer: BlockEnhancer
+    var blockEnhancer: BlockEnhancer
     let configProvider: CompactBlockProcessor.ConfigProvider
     let logger: Logger
     
@@ -88,6 +88,8 @@ extension EnhanceAction: Action {
             if let transactions {
                 await didUpdate(.foundTransactions(transactions, enhanceRange))
             }
+        } else {
+            logger.sync("Action called but skipped for not enough blocks scanned from the last time.")
         }
 
         return await decideWhatToDoNext(context: context, lastScannedHeight: lastScannedHeight)

package/ios/ZCashLightClientKit/Block/Actions/FetchUTXOsAction.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 final class FetchUTXOsAction {
-    let utxoFetcher: UTXOFetcher
+    var utxoFetcher: UTXOFetcher
     let logger: Logger
 
     init(container: DIContainer) {

package/ios/ZCashLightClientKit/Block/Actions/ProcessSuggestedScanRangesAction.swift

@@ -9,13 +9,15 @@ import Foundation
 
 final class ProcessSuggestedScanRangesAction {
     let rustBackend: ZcashRustBackendWelding
-    let service: LightWalletService
+    var service: LightWalletService
     let logger: Logger
+    let metrics: SDKMetrics
     
     init(container: DIContainer) {
         service = container.resolve(LightWalletService.self)
         rustBackend = container.resolve(ZcashRustBackendWelding.self)
         logger = container.resolve(Logger.self)
+        metrics = container.resolve(SDKMetrics.self)
     }
 }
 
@@ -23,10 +25,17 @@ extension ProcessSuggestedScanRangesAction: Action {
     var removeBlocksCacheWhenFailed: Bool { false }
 
     func run(with context: ActionContext, didUpdate: @escaping (CompactBlockProcessor.Event) async -> Void) async throws -> ActionContext {
-        logger.info("Getting the suggested scan ranges from the wallet database.")
+        logger.debug("Getting the suggested scan ranges from the wallet database.")
         let scanRanges = try await rustBackend.suggestScanRanges()
 
+        logger.sync("CALL suggestScanRanges \(scanRanges)")
+        
+        for scanRange in scanRanges {
+            metrics.actionDetail("range \(scanRange.priority) \(scanRange.range)", for: .processSuggestedScanRanges)
+        }
+        
         if let firstRange = scanRanges.first {
+            logger.sync("PROCESSING range \(firstRange.priority) \(firstRange.range)")
             let rangeStartExclusive = firstRange.range.lowerBound - 1
             let rangeEndInclusive = firstRange.range.upperBound - 1
             

package/ios/ZCashLightClientKit/Block/Actions/RewindAction.swift

@@ -8,9 +8,9 @@
 import Foundation
 
 final class RewindAction {
-    let downloader: BlockDownloader
+    var downloader: BlockDownloader
     let rustBackend: ZcashRustBackendWelding
-    let downloaderService: BlockDownloaderService
+    var downloaderService: BlockDownloaderService
     let logger: Logger
 
     init(container: DIContainer) {

package/ios/ZCashLightClientKit/Block/Actions/ScanAction.swift

@@ -8,11 +8,16 @@
 import Foundation
 
 final class ScanAction {
+    enum Constants {
+        static let reportDelay = 5
+    }
+    
     let configProvider: CompactBlockProcessor.ConfigProvider
     let blockScanner: BlockScanner
     let rustBackend: ZcashRustBackendWelding
-    let latestBlocksDataProvider: LatestBlocksDataProvider
+    var latestBlocksDataProvider: LatestBlocksDataProvider
     let logger: Logger
+    var progressReportReducer = 0
 
     init(container: DIContainer, configProvider: CompactBlockProcessor.ConfigProvider) {
         self.configProvider = configProvider
@@ -50,23 +55,33 @@ extension ScanAction: Action {
         let batchRange = batchRangeStart...batchRangeEnd
         
         logger.debug("Starting scan blocks with range: \(batchRange.lowerBound)...\(batchRange.upperBound)")
-        
+        logger.sync("Starting scan blocks with range \(batchRange.lowerBound)...\(batchRange.upperBound)")
+
         do {
             try await blockScanner.scanBlocks(at: batchRange) { [weak self] lastScannedHeight, increment in
                 let processedHeight = await context.processedHeight
-                let incrementedprocessedHeight = processedHeight + BlockHeight(increment)
-                await context.update(processedHeight: incrementedprocessedHeight)
+                let incrementedProcessedHeight = processedHeight + BlockHeight(increment)
+                await context.update(processedHeight: incrementedProcessedHeight)
                 await self?.latestBlocksDataProvider.updateScannedData()
-                
+
+                // ScanAction is controlled locally so it must report back the updated scanned height
+                await context.update(lastScannedHeight: lastScannedHeight)
+            }
+            
+            // This is a simple change that reduced the synchronization time significantly while affecting the UX only a bit.
+            // The frequency of UI progress update is lowered x5 times.
+            // Proper solution is handled in
+            // TODO: [#1353] Advanced progress reporting, https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk/issues/1353
+            if progressReportReducer == 0 {
                 // report scan progress only if it's available
-                if let scanProgress = try? await self?.rustBackend.getScanProgress() {
+                if let scanProgress = try? await rustBackend.getWalletSummary()?.scanProgress {
                     let progress = try scanProgress.progress()
-                    self?.logger.debug("progress: \(progress)")
+                    logger.debug("progress: \(progress)")
                     await didUpdate(.syncProgress(progress))
                 }
-                
-                // ScanAction is controlled locally so it must report back the updated scanned height
-                await context.update(lastScannedHeight: lastScannedHeight)
+                progressReportReducer = Constants.reportDelay
+            } else {
+                progressReportReducer -= 1
             }
         } catch ZcashError.rustScanBlocks(let errorMsg) {
             if isContinuityError(errorMsg) {
@@ -83,7 +98,9 @@ extension ScanAction: Action {
         return await update(context: context)
     }
 
-    func stop() async { }
+    func stop() async { 
+        progressReportReducer = 0
+    }
 }
 
 private extension ScanAction {

package/ios/ZCashLightClientKit/Block/Actions/UpdateChainTipAction.swift

@@ -9,9 +9,9 @@ import Foundation
 
 final class UpdateChainTipAction {
     let rustBackend: ZcashRustBackendWelding
-    let downloader: BlockDownloader
-    let service: LightWalletService
-    let latestBlocksDataProvider: LatestBlocksDataProvider
+    var downloader: BlockDownloader
+    var service: LightWalletService
+    var latestBlocksDataProvider: LatestBlocksDataProvider
     let logger: Logger
     
     init(container: DIContainer) {
@@ -25,7 +25,7 @@ final class UpdateChainTipAction {
     func updateChainTip(_ context: ActionContext, time: TimeInterval) async throws {
         let latestBlockHeight = try await service.latestBlockHeight()
         
-        logger.info("Latest block height is \(latestBlockHeight)")
+        logger.debug("Latest block height is \(latestBlockHeight)")
         try await rustBackend.updateChainTip(height: Int32(latestBlockHeight))
         await context.update(lastChainTipUpdateTime: time)
         await latestBlocksDataProvider.update(latestBlockHeight)

package/ios/ZCashLightClientKit/Block/Actions/UpdateSubtreeRootsAction.swift

@@ -10,7 +10,7 @@ import Foundation
 final class UpdateSubtreeRootsAction {
     let configProvider: CompactBlockProcessor.ConfigProvider
     let rustBackend: ZcashRustBackendWelding
-    let service: LightWalletService
+    var service: LightWalletService
     let logger: Logger
     
     init(container: DIContainer, configProvider: CompactBlockProcessor.ConfigProvider) {
@@ -28,29 +28,58 @@ extension UpdateSubtreeRootsAction: Action {
         var request = GetSubtreeRootsArg()
         request.shieldedProtocol = .sapling
         
-        logger.info("Attempt to get subtree roots, this may fail because lightwalletd may not support Spend before Sync.")
+        logger.debug("Attempt to get subtree roots, this may fail because lightwalletd may not support Spend before Sync.")
         let stream = service.getSubtreeRoots(request)
         
-        var roots: [SubtreeRoot] = []
+        var saplingRoots: [SubtreeRoot] = []
         
         do {
             for try await subtreeRoot in stream {
-                roots.append(subtreeRoot)
+                saplingRoots.append(subtreeRoot)
             }
         } catch ZcashError.serviceSubtreeRootsStreamFailed(LightWalletServiceError.timeOut) {
             throw ZcashError.serviceSubtreeRootsStreamFailed(LightWalletServiceError.timeOut)
         }
 
-        logger.info("Sapling tree has \(roots.count) subtrees")
+        logger.debug("Sapling tree has \(saplingRoots.count) subtrees")
         do {
-            try await rustBackend.putSaplingSubtreeRoots(startIndex: UInt64(request.startIndex), roots: roots)
+            try await rustBackend.putSaplingSubtreeRoots(startIndex: UInt64(request.startIndex), roots: saplingRoots)
             
             await context.update(state: .updateChainTip)
         } catch {
             logger.debug("putSaplingSubtreeRoots failed with error \(error.localizedDescription)")
             throw ZcashError.compactBlockProcessorPutSaplingSubtreeRoots(error)
         }
-        
+
+        if !saplingRoots.isEmpty {
+            logger.debug("Found Sapling subtree roots, SbS supported, fetching Orchard subtree roots")
+
+            var orchardRequest = GetSubtreeRootsArg()
+            orchardRequest.shieldedProtocol = .orchard
+
+            let stream = service.getSubtreeRoots(orchardRequest)
+
+            var orchardRoots: [SubtreeRoot] = []
+
+            do {
+                for try await subtreeRoot in stream {
+                    orchardRoots.append(subtreeRoot)
+                }
+            } catch ZcashError.serviceSubtreeRootsStreamFailed(LightWalletServiceError.timeOut) {
+                throw ZcashError.serviceSubtreeRootsStreamFailed(LightWalletServiceError.timeOut)
+            }
+
+            logger.debug("Orchard tree has \(orchardRoots.count) subtrees")
+            do {
+                try await rustBackend.putOrchardSubtreeRoots(startIndex: UInt64(orchardRequest.startIndex), roots: orchardRoots)
+
+                await context.update(state: .updateChainTip)
+            } catch {
+                logger.debug("putOrchardSubtreeRoots failed with error \(error.localizedDescription)")
+                throw ZcashError.compactBlockProcessorPutOrchardSubtreeRoots(error)
+            }
+        }
+
         return context
     }
 

package/ios/ZCashLightClientKit/Block/Actions/ValidateServerAction.swift

@@ -10,7 +10,7 @@ import Foundation
 final class ValidateServerAction {
     let configProvider: CompactBlockProcessor.ConfigProvider
     let rustBackend: ZcashRustBackendWelding
-    let service: LightWalletService
+    var service: LightWalletService
 
     init(container: DIContainer, configProvider: CompactBlockProcessor.ConfigProvider) {
         self.configProvider = configProvider