react-native-zcash 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # React Native Zcash
 
+## 0.2.2 (2022-06-10)
+
+- Upgrade SDKs to NU5 compatible versions
+  - Android: Upgrade zcash-android-sdk to v1.5.0-beta01
+  - iOS: Upgrade ZcashLightClientKit to v0.14.0-beta
+- iOS: Fix memory leak after stopping synchronizer
+- ANdroid: White space and import cleanups
+
 ## 0.2.1 (2022-03-16)
 
 - Update the ZcashLightClientKit dependency

package/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext.versions = [
       'kotlin': '1.5.0',
-      'zcash': '1.3.0-beta18',
+      'zcash': '1.5.0-beta01',
       'room': '2.3.0'
     ]
     repositories {
@@ -33,7 +33,7 @@ def safeExtGet(prop, fallback) {
 
 def DEFAULT_COMPILE_SDK_VERSION = 28
 def DEFAULT_BUILD_TOOLS_VERSION = "28.0.2"
-def DEFAULT_MIN_SDK_VERSION = 16
+def DEFAULT_MIN_SDK_VERSION = 19
 def DEFAULT_TARGET_SDK_VERSION = 27
 
 android {
@@ -80,4 +80,10 @@ dependencies {
     implementation "androidx.paging:paging-runtime-ktx:2.1.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
+
+    implementation ("androidx.appcompat:appcompat:1.3.1") {
+        version {
+            strictly '1.3.1'
+        }
+    }
 }

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

@@ -1,32 +1,29 @@
 package app.edge.rnzcash;
 
-import androidx.paging.PagedList
 import cash.z.ecc.android.sdk.Initializer
 import cash.z.ecc.android.sdk.SdkSynchronizer
 import cash.z.ecc.android.sdk.Synchronizer
-import cash.z.ecc.android.sdk.Synchronizer.Status.SYNCED
-import cash.z.ecc.android.sdk.block.CompactBlockProcessor
 import cash.z.ecc.android.sdk.db.entity.*
 import cash.z.ecc.android.sdk.ext.*
-import cash.z.ecc.android.sdk.transaction.*
+import cash.z.ecc.android.sdk.internal.transaction.PagedTransactionRepository
+import cash.z.ecc.android.sdk.internal.*
 import cash.z.ecc.android.sdk.type.*
 import cash.z.ecc.android.sdk.tool.DerivationTool
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import java.nio.charset.StandardCharsets
 import kotlin.coroutines.EmptyCoroutineContext
 
 class WalletSynchronizer constructor(val initializer: Initializer)  {
-    
-    val synchronizer: SdkSynchronizer = Synchronizer(
+
+    val synchronizer: SdkSynchronizer = Synchronizer.newBlocking(
         initializer
     ) as SdkSynchronizer
-    val repository = PagedTransactionRepository(initializer.context, 10, initializer.rustBackend, initializer.birthday, initializer.viewingKeys)
+    val repository = runBlocking { PagedTransactionRepository.new(initializer.context, 10, initializer.rustBackend, initializer.birthday, initializer.viewingKeys) }
     var isStarted = false
 }
 
@@ -50,28 +47,32 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
     @ReactMethod
     fun initialize(extfvk: String, extpub: String, birthdayHeight: Int, alias: String, networkName: String = "mainnet", defaultHost: String = "mainnet.lightwalletd.com", defaultPort: Int = 9067, promise: Promise) =
         promise.wrap {
-            Twig.plant(TroubleshootingTwig())
-            var vk = UnifiedViewingKey(extfvk, extpub)
-            if (synchronizerMap[alias] == null) {
-                val initializer = Initializer(reactApplicationContext) { config ->
-                    config.importedWalletBirthday(birthdayHeight)
-                    config.setViewingKeys(vk)
-                    config.setNetwork(networks[networkName] ?: ZcashNetwork.Mainnet, defaultHost, defaultPort)
-                    config.alias = alias
-                }
-                synchronizerMap[alias] = WalletSynchronizer(initializer)
-                val wallet = getWallet(alias)
+          Twig.plant(TroubleshootingTwig())
+          var vk = UnifiedViewingKey(extfvk, extpub)
+          if (synchronizerMap[alias] == null) {
+            runBlocking {
+              Initializer.new(reactApplicationContext) {
+                it.importedWalletBirthday(birthdayHeight)
+                it.setViewingKeys(vk)
+                it.setNetwork(networks[networkName]
+                  ?: ZcashNetwork.Mainnet, defaultHost, defaultPort)
+                it.alias = alias
+              }
+            }.let { initializer ->
+              synchronizerMap[alias] = WalletSynchronizer(initializer)
             }
-            val wallet = getWallet(alias)
-            wallet.synchronizer.hashCode().toString()
-            
+          }
+          val wallet = getWallet(alias)
+          wallet.synchronizer.hashCode().toString()
         }
 
     @ReactMethod
     fun start(alias: String, promise: Promise) = promise.wrap {
         val wallet = getWallet(alias)
         if (!wallet.isStarted) {
-            wallet.synchronizer.prepare()
+            runBlocking {
+              wallet.synchronizer.prepare()
+            }
             wallet.synchronizer.start(moduleScope)
             val scope = wallet.synchronizer.coroutineScope
             wallet.synchronizer.processorInfo.collectWith(scope, { update ->
@@ -83,7 +84,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
                     args.putInt("networkBlockHeight", update.networkBlockHeight)
                 }
             })
-            wallet.synchronizer.status.collectWith(scope, { status -> 
+            wallet.synchronizer.status.collectWith(scope, { status ->
                 sendEvent("StatusEvent") { args ->
                     args.putString("alias", alias)
                     args.putString("name", status.toString())
@@ -104,7 +105,6 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
                     args.putInt("transactionCount", txList.count())
                 }
             })
-            wallet.repository.prepare()
             wallet.isStarted = true
         }
         "success"
@@ -152,7 +152,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun deriveViewingKey(seedBytesHex: String, network: String = "mainnet", promise: Promise) {
-        var keys = DerivationTool.deriveUnifiedViewingKeys(seedBytesHex.fromHex(), networks.getOrDefault(network, ZcashNetwork.Mainnet))[0]
+        var keys = runBlocking { DerivationTool.deriveUnifiedViewingKeys(seedBytesHex.fromHex(), networks.getOrDefault(network, ZcashNetwork.Mainnet))[0] }
         val map = Arguments.createMap()
         map.putString("extfvk", keys.extfvk)
         map.putString("extpub", keys.extpub)
@@ -161,7 +161,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun deriveSpendingKey(seedBytesHex: String, network: String = "mainnet", promise: Promise) = promise.wrap {
-        DerivationTool.deriveSpendingKeys(seedBytesHex.fromHex(), networks.getOrDefault(network, ZcashNetwork.Mainnet))[0]
+        runBlocking { DerivationTool.deriveSpendingKeys(seedBytesHex.fromHex(), networks.getOrDefault(network, ZcashNetwork.Mainnet))[0] }
     }
 
     //
@@ -226,7 +226,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
                 promise.reject("Err", t)
             }
         }
-        
+
     }
 
     //
@@ -235,7 +235,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun deriveShieldedAddress(viewingKey: String, network: String = "mainnet", promise: Promise) = promise.wrap {
-        DerivationTool.deriveShieldedAddress(viewingKey, networks.getOrDefault(network, ZcashNetwork.Mainnet))
+        runBlocking { DerivationTool.deriveShieldedAddress(viewingKey, networks.getOrDefault(network, ZcashNetwork.Mainnet)) }
     }
 
     @ReactMethod
@@ -256,7 +256,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun isValidTransparentAddress(address: String, network: String, promise: Promise) {    
+    fun isValidTransparentAddress(address: String, network: String, promise: Promise) {
         moduleScope.launch {
             promise.wrap {
               var isValid = false
@@ -278,13 +278,13 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
 
     /**
      * Retrieve wallet object from synchronizer map
-     */    
+     */
     private fun getWallet(alias: String): WalletSynchronizer {
         val wallet = synchronizerMap.get(alias)
         if (wallet == null) throw Exception("Wallet not found")
         return wallet
     }
-    
+
 
     /**
      * Wrap the given block of logic in a promise, rejecting for any error.
@@ -314,4 +314,12 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
             "Unable to parse memo."
         }
     }
+
+    inline fun ByteArray.toHexReversed(): String {
+      val sb = StringBuilder(size * 2)
+      var i = size - 1
+      while (i >= 0)
+        sb.append(String.format("%02x", this[i--]))
+      return sb.toString()
+    }
 }

package/ios/RNZcash.swift

@@ -135,6 +135,7 @@ class RNZcash : RCTEventEmitter {
     @objc func stop(_ alias: String, resolver resolve: RCTPromiseResolveBlock, rejecter reject: RCTPromiseRejectBlock) -> Void {
         if let wallet = SynchronizerMap[alias] {
             wallet.synchronizer.stop()
+            SynchronizerMap[alias] = nil
             resolve(nil)
         } else {
             reject("StopError", "Wallet does not exist", genericError)
@@ -327,7 +328,7 @@ class WalletSynchronizer : NSObject {
 
     public func subscribe() {
         // Processor status
-        NotificationCenter.default.addObserver(self, selector: #selector(updateProcessorState(notification:)), name: .blockProcessorUpdated, object: self.synchronizer.blockProcessor)
+        NotificationCenter.default.addObserver(self, selector: #selector(updateProcessorState(notification:)), name: nil, object: self.synchronizer.blockProcessor)
         // Synchronizer Status
         NotificationCenter.default.addObserver(self, selector: #selector(updateSyncStatus(notification:)), name: .synchronizerDisconnected, object: self.synchronizer)
         NotificationCenter.default.addObserver(self, selector: #selector(updateSyncStatus(notification:)), name: .synchronizerStopped, object: self.synchronizer)
@@ -371,17 +372,40 @@ class WalletSynchronizer : NSObject {
     }
     
     @objc public func updateProcessorState(notification: NSNotification) {
-        let status: CompactBlockProgress = notification.userInfo![CompactBlockProcessorNotificationKey.progress] as! CompactBlockProgress
-        if case .download = status {
-            self.processorState.lastDownloadedHeight = status.progressHeight!
-        } else if case .scan = status {
-            self.processorState.lastScannedHeight = status.progressHeight!
-            self.processorState.scanProgress = Int(status.progress * 100)
+        let prevLastDownloadedHeight = self.processorState.lastDownloadedHeight
+        let prevScanProgress = self.processorState.scanProgress
+        let prevLastScannedHeight = self.synchronizer.latestScannedHeight
+        let prevNetworkBlockHeight = self.processorState.lastScannedHeight
+
+        if !self.fullySynced {
+            switch self.synchronizer.status {
+            case .downloading(let status):
+                // The SDK emits all zero values just before emitting a SYNCED status so we need to ignore these
+                if status.targetHeight == 0 {
+                    return
+                }
+                self.processorState.lastDownloadedHeight = status.progressHeight
+                self.processorState.networkBlockHeight = status.targetHeight
+                break
+            case .scanning(let status):
+                self.processorState.scanProgress = Int(floor(status.progress * 100))
+                self.processorState.lastScannedHeight = status.progressHeight
+                self.processorState.networkBlockHeight = status.targetHeight
+            default:
+                return
+            }
         } else {
-            return
+            self.processorState.lastDownloadedHeight = self.synchronizer.latestScannedHeight
+            self.processorState.scanProgress = 100
+            self.processorState.lastScannedHeight = self.synchronizer.latestScannedHeight
+            self.processorState.networkBlockHeight = try! self.synchronizer.latestHeight()
+        }
+
+        if self.processorState.lastDownloadedHeight != prevLastDownloadedHeight || self.processorState.scanProgress != prevScanProgress ||
+            self.processorState.lastScannedHeight != prevLastScannedHeight ||
+            self.processorState.networkBlockHeight != prevNetworkBlockHeight {
+            emit("UpdateEvent", self.processorState.nsDictionary)
         }
-        self.processorState.networkBlockHeight = status.targetHeight!
-        emit("UpdateEvent", self.processorState.nsDictionary)
     }
 
     func initializeProcessorState() {

package/ios/RNZcash.xcodeproj/xcuserdata/Matthew.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>RNZcash.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>28</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>58B511DA1A9E6C8500147676</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zcash",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Zcash library for React Native",
   "homepage": "https://github.com/EdgeApp/react-native-zcash",
   "repository": {
@@ -28,7 +28,6 @@
     "lib",
     "package.json",
     "README.md",
-    "Scripts",
     "src"
   ],
   "main": "lib/rnzcash.rn.js",

package/react-native-zcash.podspec

@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,swift}"
 
  s.dependency "React"
- s.dependency 'ZcashLightClientKit', '0.13.0-beta.2'
+ s.dependency 'ZcashLightClientKit', '0.14.0-beta'
 
 end