react-native-zcash 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # React Native Zcash
 
+## 0.6.1 (2023-10-11)
+
+- added: Add `shieldFunds` support
+- changed: Package now exports types
+- deprecated: Balance event fields `availableZatoshi` and `totalZatoshi`
+
+Android
+
+- changed: Various syntax cleanups
+- fixed: Transactions event now returns confirmed and pending (<10 confirmations) transactions
+
 ## 0.6.0 (2023-10-10)
 
 - added: Balances and transactions are no longer queryable and are now emitted as updates are found

package/README.md

@@ -42,11 +42,12 @@ buildscript {
   - `rescan`
   - `getLatestNetworkHeight`
   - `sendToAddress`
+  - `shieldFunds`
   - `deriveUnifiedAddress`
 
 `Tools` contains methods that don't require a running synchronizer (with one exception, `isValidAddress` on Android which does requires any synchronizer connected to the requested network). In addition to the methods above, the following events can be subscribed to:
 
-- `BalanceEvent`- aggregate total and available balances
+- `BalanceEvent`- available and total transparent and shielded balances
 - `StatusEvent` - current synchronizer activity (`STOPPED`, `DISCONNECTED`, `SYNCING`, and `SYNCED`)
 - `TransactionEvent`- confirmed transactions
 - `UpdateEvent` - syncing progress and network height

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

@@ -15,16 +15,14 @@ import co.electriccoin.lightwallet.client.model.Response
 import co.electriccoin.lightwallet.client.new
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
-import kotlinx.coroutines.async
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 
 class RNZcashModule(private val reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
-
     /**
      * Scope for anything that out-lives the synchronizer, meaning anything that can be used before
      * the synchronizer starts or after it stops. Everything else falls within the scope of the
@@ -38,144 +36,176 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
     override fun getName() = "RNZcash"
 
     @ReactMethod
-    fun initialize(seed: String, birthdayHeight: Int, alias: String, networkName: String = "mainnet", defaultHost: String = "mainnet.lightwalletd.com", defaultPort: Int = 9067, newWallet: Boolean, promise: Promise) =
-        moduleScope.launch {
-            promise.wrap {
-                val network = networks.getOrDefault(networkName, ZcashNetwork.Mainnet)
-                val endpoint = LightWalletEndpoint(defaultHost, defaultPort, true)
-                val seedPhrase = SeedPhrase.new(seed)
-                val initMode = if (newWallet) WalletInitMode.NewWallet else WalletInitMode.ExistingWallet
-                if (!synchronizerMap.containsKey(alias)) {
-                    synchronizerMap[alias] = Synchronizer.new(reactApplicationContext, network, alias, endpoint, seedPhrase.toByteArray(), BlockHeight.new(network, birthdayHeight.toLong()), initMode) as SdkSynchronizer
-                }
-                val wallet = getWallet(alias)
-                val scope = wallet.coroutineScope
-                combine(wallet.progress, wallet.networkHeight) { progress, networkHeight ->
-                    return@combine mapOf("progress" to progress, "networkHeight" to networkHeight)
-                }.collectWith(scope) { map ->
-                    val progress = map["progress"] as PercentDecimal
-                    var networkBlockHeight = map["networkHeight"] as BlockHeight?
-                    if (networkBlockHeight == null) networkBlockHeight = BlockHeight.new(wallet.network, birthdayHeight.toLong())
+    fun initialize(
+        seed: String,
+        birthdayHeight: Int,
+        alias: String,
+        networkName: String = "mainnet",
+        defaultHost: String = "mainnet.lightwalletd.com",
+        defaultPort: Int = 9067,
+        newWallet: Boolean,
+        promise: Promise,
+    ) = moduleScope.launch {
+        promise.wrap {
+            val network = networks.getOrDefault(networkName, ZcashNetwork.Mainnet)
+            val endpoint = LightWalletEndpoint(defaultHost, defaultPort, true)
+            val seedPhrase = SeedPhrase.new(seed)
+            val initMode = if (newWallet) WalletInitMode.NewWallet else WalletInitMode.ExistingWallet
+            if (!synchronizerMap.containsKey(alias)) {
+                synchronizerMap[alias] =
+                    Synchronizer.new(
+                        reactApplicationContext, network, alias, endpoint, seedPhrase.toByteArray(),
+                        BlockHeight.new(network, birthdayHeight.toLong()), initMode,
+                    ) as SdkSynchronizer
+            }
+            val wallet = getWallet(alias)
+            val scope = wallet.coroutineScope
+            combine(wallet.progress, wallet.networkHeight) { progress, networkHeight ->
+                return@combine mapOf("progress" to progress, "networkHeight" to networkHeight)
+            }.collectWith(scope) { map ->
+                val progress = map["progress"] as PercentDecimal
+                var networkBlockHeight = map["networkHeight"] as BlockHeight?
+                if (networkBlockHeight == null) networkBlockHeight = BlockHeight.new(wallet.network, birthdayHeight.toLong())
 
-                    sendEvent("UpdateEvent") { args ->
-                        args.putString("alias", alias)
-                        args.putInt(
-                            "scanProgress",
-                            progress.toPercentage()
-                        )
-                        args.putInt("networkBlockHeight", networkBlockHeight.value.toInt())
-                    }
+                sendEvent("UpdateEvent") { args ->
+                    args.putString("alias", alias)
+                    args.putInt(
+                        "scanProgress",
+                        progress.toPercentage(),
+                    )
+                    args.putInt("networkBlockHeight", networkBlockHeight.value.toInt())
                 }
-                wallet.status.collectWith(scope) { status ->
-                    sendEvent("StatusEvent") { args ->
-                        args.putString("alias", alias)
-                        args.putString("name", status.toString())
-                    }
+            }
+            wallet.status.collectWith(scope) { status ->
+                sendEvent("StatusEvent") { args ->
+                    args.putString("alias", alias)
+                    args.putString("name", status.toString())
                 }
-                wallet.transactions.collectWith(scope) { txList ->
-                    scope.launch {
-                        val nativeArray = Arguments.createArray()
-                        txList.filter { tx -> tx.transactionState == TransactionState.Confirmed }.map { tx -> launch {
+            }
+            wallet.transactions.collectWith(scope) { txList ->
+                scope.launch {
+                    val nativeArray = Arguments.createArray()
+                    txList.filter { tx -> tx.transactionState != TransactionState.Expired }.map { tx ->
+                        launch {
                             val parsedTx = parseTx(wallet, tx)
                             nativeArray.pushMap(parsedTx)
-                        } }.forEach { it.join() }
-
-                        sendEvent("TransactionEvent") { args ->
-                            args.putString("alias", alias)
-                            args.putArray(
-                                "transactions",
-                                nativeArray
-                            )
                         }
+                    }.forEach { it.join() }
+
+                    sendEvent("TransactionEvent") { args ->
+                        args.putString("alias", alias)
+                        args.putArray(
+                            "transactions",
+                            nativeArray,
+                        )
                     }
                 }
-                combine(wallet.transparentBalances, wallet.saplingBalances, wallet.orchardBalances) { transparentBalances, saplingBalances, orchardBalances ->
-                    return@combine mapOf("transparentBalances" to transparentBalances, "saplingBalances" to saplingBalances, "orchardBalances" to orchardBalances)
-                }.collectWith(scope) { map ->
-                    val transparentBalances = map["transparentBalances"]
-                    val saplingBalances = map["saplingBalances"]
-                    val orchardBalances = map["orchardBalances"]
-
-                    var availableZatoshi = Zatoshi(0L)
-                    var totalZatoshi = Zatoshi(0L)
-
-                    availableZatoshi = availableZatoshi.plus(transparentBalances?.available ?: Zatoshi(0L))
-                    totalZatoshi = totalZatoshi.plus(transparentBalances?.total ?: Zatoshi(0L))
+            }
+            combine(
+                wallet.transparentBalances,
+                wallet.saplingBalances,
+            ) { transparentBalances, saplingBalances ->
+                return@combine mapOf(
+                    "transparentBalances" to transparentBalances,
+                    "saplingBalances" to saplingBalances,
+                )
+            }.collectWith(scope) { map ->
+                val transparentBalances = map["transparentBalances"]
+                val saplingBalances = map["saplingBalances"]
 
-                    availableZatoshi = availableZatoshi.plus(saplingBalances?.available ?: Zatoshi(0L))
-                    totalZatoshi = totalZatoshi.plus(saplingBalances?.total ?: Zatoshi(0L))
+                val transparentAvailableZatoshi = transparentBalances?.available ?: Zatoshi(0L)
+                val transparentTotalZatoshi = transparentBalances?.total ?: Zatoshi(0L)
 
-                    availableZatoshi = availableZatoshi.plus(orchardBalances?.available ?: Zatoshi(0L))
-                    totalZatoshi = totalZatoshi.plus(orchardBalances?.total ?: Zatoshi(0L))
+                val saplingAvailableZatoshi = saplingBalances?.available ?: Zatoshi(0L)
+                val saplingTotalZatoshi = saplingBalances?.total ?: Zatoshi(0L)
 
-                    sendEvent("BalanceEvent") { args ->
-                        args.putString("alias", alias)
-                        args.putString(
-                            "totalZatoshi",
-                            totalZatoshi.value.toString()
-                        )
-                        args.putString(
-                            "availableZatoshi",
-                            availableZatoshi.value.toString()
-                        )
-                    }
+                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())
                 }
-                return@wrap null
             }
+            return@wrap null
         }
+    }
 
     @ReactMethod
-    fun stop(alias: String, promise: Promise) {
+    fun stop(
+        alias: String,
+        promise: Promise,
+    ) {
         val wallet = getWallet(alias)
         wallet.close()
         synchronizerMap.remove(alias)
         promise.resolve(null)
     }
 
-    private suspend fun parseTx(wallet: SdkSynchronizer, tx: TransactionOverview): WritableMap {
+    private suspend fun parseTx(
+        wallet: SdkSynchronizer,
+        tx: TransactionOverview,
+    ): WritableMap {
         val map = Arguments.createMap()
-        val job = wallet.coroutineScope.launch {
-            map.putString("value", tx.netValue.value.toString())
-            if (tx.feePaid != null) {
-                map.putString("fee", tx.feePaid!!.value.toString())
-            }
-            map.putInt("minedHeight", tx.minedHeight!!.value.toInt())
-            map.putInt("blockTimeInSeconds", tx.blockTimeEpochSeconds!!.toInt())
-            map.putString("rawTransactionId", tx.rawId.byteArray.toHexReversed())
-            if (tx.raw != null) {
-                map.putString("raw", tx.raw!!.byteArray.toHex())
-            }
-            if (tx.isSentTransaction) {
-                val recipient = wallet.getRecipients(tx).first()
-                if (recipient is TransactionRecipient.Address) {
-                    map.putString("toAddress", recipient.addressValue)
+        val job =
+            wallet.coroutineScope.launch {
+                map.putString("value", tx.netValue.value.toString())
+                if (tx.feePaid != null) {
+                    map.putString("fee", tx.feePaid!!.value.toString())
+                }
+                map.putInt("minedHeight", tx.minedHeight?.value?.toInt() ?: 0)
+                map.putInt("blockTimeInSeconds", tx.blockTimeEpochSeconds?.toInt() ?: 0)
+                map.putString("rawTransactionId", tx.rawId.byteArray.toHexReversed())
+                if (tx.raw != null) {
+                    map.putString("raw", tx.raw!!.byteArray.toHex())
+                }
+                if (tx.isSentTransaction) {
+                    try {
+                        val recipient = wallet.getRecipients(tx).first()
+                        if (recipient is TransactionRecipient.Address) {
+                            map.putString("toAddress", recipient.addressValue)
+                        }
+                    } catch (t: Throwable) {
+                        // Error is OK. SDK limitation means we cannot find recipient for shielding transactions
+                    }
+                }
+                if (tx.memoCount > 0) {
+                    val memos = wallet.getMemos(tx).take(tx.memoCount).toList()
+                    map.putArray("memos", Arguments.fromList(memos))
+                } else {
+                    map.putArray("memos", Arguments.createArray())
                 }
             }
-            if (tx.memoCount > 0) {
-                val memos = wallet.getMemos(tx).take(tx.memoCount).toList()
-                map.putArray("memos", Arguments.fromList(memos))
-            } else {
-                map.putArray("memos", Arguments.createArray())
-            }
-        }
         job.join()
         return map
     }
 
     @ReactMethod
-    fun rescan(alias: String, promise: Promise) {
+    fun rescan(
+        alias: String,
+        promise: Promise,
+    ) {
         val wallet = getWallet(alias)
         wallet.coroutineScope.launch {
-            wallet.coroutineScope.async { wallet.rewindToNearestHeight(wallet.latestBirthdayHeight) }.await()
+            wallet.rewindToNearestHeight(wallet.latestBirthdayHeight)
             promise.resolve(null)
         }
     }
 
     @ReactMethod
-    fun deriveViewingKey(seed: String, network: String = "mainnet", promise: Promise) {
+    fun deriveViewingKey(
+        seed: String,
+        network: String = "mainnet",
+        promise: Promise,
+    ) {
         val seedPhrase = SeedPhrase.new(seed)
         moduleScope.launch {
-            val keys = moduleScope.async { DerivationTool.getInstance().deriveUnifiedFullViewingKeys(seedPhrase.toByteArray(), networks.getOrDefault(network, ZcashNetwork.Mainnet), DerivationTool.DEFAULT_NUMBER_OF_ACCOUNTS)[0] }.await()
+            val keys =
+                DerivationTool.getInstance().deriveUnifiedFullViewingKeys(
+                    seedPhrase.toByteArray(),
+                    networks.getOrDefault(network, ZcashNetwork.Mainnet),
+                    DerivationTool.DEFAULT_NUMBER_OF_ACCOUNTS,
+                )[0]
             promise.resolve(keys.encoding)
         }
     }
@@ -185,13 +215,20 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
     //
 
     @ReactMethod
-    fun getLatestNetworkHeight(alias: String, promise: Promise) = promise.wrap {
+    fun getLatestNetworkHeight(
+        alias: String,
+        promise: Promise,
+    ) = promise.wrap {
         val wallet = getWallet(alias)
         return@wrap wallet.latestHeight
     }
 
     @ReactMethod
-    fun getBirthdayHeight(host: String, port: Int, promise: Promise) {
+    fun getBirthdayHeight(
+        host: String,
+        port: Int,
+        promise: Promise,
+    ) {
         moduleScope.launch {
             promise.wrap {
                 val endpoint = LightWalletEndpoint(host, port, true)
@@ -213,7 +250,6 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
         }
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @ReactMethod
     fun sendToAddress(
         alias: String,
@@ -226,14 +262,15 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
         val wallet = getWallet(alias)
         wallet.coroutineScope.launch {
             val seedPhrase = SeedPhrase.new(seed)
-            val usk = wallet.coroutineScope.async { DerivationTool.getInstance().deriveUnifiedSpendingKey(seedPhrase.toByteArray(), wallet.network, Account.DEFAULT) }.await()
+            val usk = DerivationTool.getInstance().deriveUnifiedSpendingKey(seedPhrase.toByteArray(), wallet.network, Account.DEFAULT)
             try {
-                val internalId = wallet.sendToAddress(
-                    usk,
-                    Zatoshi(zatoshi.toLong()),
-                    toAddress,
-                    memo,
-                )
+                val internalId =
+                    wallet.sendToAddress(
+                        usk,
+                        Zatoshi(zatoshi.toLong()),
+                        toAddress,
+                        memo,
+                    )
                 val tx = wallet.coroutineScope.async { wallet.transactions.first().first() }.await()
                 val map = Arguments.createMap()
                 map.putString("txId", tx.rawId.byteArray.toHexReversed())
@@ -245,28 +282,67 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun shieldFunds(
+        alias: String,
+        seed: String,
+        memo: String,
+        threshold: String,
+        promise: Promise,
+    ) {
+        val wallet = getWallet(alias)
+        wallet.coroutineScope.launch {
+            val seedPhrase = SeedPhrase.new(seed)
+            val usk = DerivationTool.getInstance().deriveUnifiedSpendingKey(seedPhrase.toByteArray(), wallet.network, Account.DEFAULT)
+            try {
+                val internalId =
+                    wallet.shieldFunds(
+                        usk,
+                        memo,
+                    )
+                val tx = wallet.coroutineScope.async { wallet.transactions.first().first() }.await()
+                val parsedTx = parseTx(wallet, tx)
+
+                // Hack: Memos aren't ready to be queried right after broadcast
+                val memos = Arguments.createArray()
+                memos.pushString(memo)
+                parsedTx.putArray("memos", memos)
+                promise.resolve(parsedTx)
+            } catch (t: Throwable) {
+                promise.reject("Err", t)
+            }
+        }
+    }
+
     //
     // AddressTool
     //
 
     @ReactMethod
-    fun deriveUnifiedAddress(alias: String, promise: Promise) {
+    fun deriveUnifiedAddress(
+        alias: String,
+        promise: Promise,
+    ) {
         val wallet = getWallet(alias)
         wallet.coroutineScope.launch {
-                val unifiedAddress = wallet.coroutineScope.async { wallet.getUnifiedAddress(Account(0)) }.await()
-                val saplingAddress = wallet.coroutineScope.async { wallet.getSaplingAddress(Account(0)) }.await()
-                val transparentAddress = wallet.coroutineScope.async { wallet.getTransparentAddress(Account(0)) }.await()
+            val unifiedAddress = wallet.getUnifiedAddress(Account(0))
+            val saplingAddress = wallet.getSaplingAddress(Account(0))
+            val transparentAddress = wallet.getTransparentAddress(Account(0))
 
-                val map = Arguments.createMap()
-                map.putString("unifiedAddress", unifiedAddress)
-                map.putString("saplingAddress", saplingAddress)
-                map.putString("transparentAddress", transparentAddress)
-                promise.resolve(map)
+            val map = Arguments.createMap()
+            map.putString("unifiedAddress", unifiedAddress)
+            map.putString("saplingAddress", saplingAddress)
+            map.putString("transparentAddress", transparentAddress)
+            promise.resolve(map)
         }
     }
 
     @ReactMethod
-    fun isValidAddress(address: String, network: String, promise: Promise) {
+    fun isValidAddress(
+        address: String,
+        network: String,
+        promise: Promise,
+    ) {
         moduleScope.launch {
             promise.wrap {
                 var isValid = false
@@ -304,7 +380,10 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
         }
     }
 
-    private fun sendEvent(eventName: String, putArgs: (WritableMap) -> Unit) {
+    private fun sendEvent(
+        eventName: String,
+        putArgs: (WritableMap) -> Unit,
+    ) {
         val args = Arguments.createMap()
         putArgs(args)
         reactApplicationContext

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

@@ -12,6 +12,5 @@ class RNZcashPackage : ReactPackage {
             RNZcashModule(reactContext),
         )
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
-        emptyList()
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> = emptyList()
 }

package/ios/RNZcash.m

@@ -45,6 +45,14 @@ resolver:(RCTPromiseResolveBlock)resolve
 rejecter:(RCTPromiseRejectBlock)reject
 )
 
+RCT_EXTERN_METHOD(shieldFunds:(NSString *)alias
+:(NSString *)seed
+:(NSString *)memo
+:(NSString *)threshold
+resolver:(RCTPromiseResolveBlock)resolve
+rejecter:(RCTPromiseRejectBlock)reject
+)
+
 RCT_EXTERN_METHOD(rescan:(NSString *)alias
 resolver:(RCTPromiseResolveBlock)resolve
 rejecter:(RCTPromiseRejectBlock)reject

package/ios/RNZcash.swift

@@ -13,7 +13,7 @@ struct ConfirmedTx {
   var blockTimeInSeconds: Int
   var value: String
   var fee: String?
-  var memos: Array<String>?
+  var memos: [String]?
   var dictionary: [String: Any?] {
     return [
       "minedHeight": minedHeight,
@@ -32,12 +32,16 @@ struct ConfirmedTx {
 }
 
 struct TotalBalances {
-  var availableZatoshi: String
-  var totalZatoshi: String
+  var transparentAvailableZatoshi: Zatoshi
+  var transparentTotalZatoshi: Zatoshi
+  var saplingAvailableZatoshi: Zatoshi
+  var saplingTotalZatoshi: Zatoshi
   var dictionary: [String: Any] {
     return [
-      "availableZatoshi": availableZatoshi,
-      "totalZatoshi": totalZatoshi,
+      "transparentAvailableZatoshi": String(transparentAvailableZatoshi.amount),
+      "transparentTotalZatoshi": String(transparentTotalZatoshi.amount),
+      "saplingAvailableZatoshi": String(saplingAvailableZatoshi.amount),
+      "saplingTotalZatoshi": String(saplingTotalZatoshi.amount),
     ]
   }
   var nsDictionary: NSDictionary {
@@ -81,7 +85,8 @@ class RNZcash: RCTEventEmitter {
   // Synchronizer
   @objc func initialize(
     _ seed: String, _ birthdayHeight: Int, _ alias: String, _ networkName: String,
-    _ defaultHost: String, _ defaultPort: Int, _ newWallet: Bool, resolver resolve: @escaping RCTPromiseResolveBlock,
+    _ defaultHost: String, _ defaultPort: Int, _ newWallet: Bool,
+    resolver resolve: @escaping RCTPromiseResolveBlock,
     rejecter reject: @escaping RCTPromiseRejectBlock
   ) {
     Task {
@@ -234,6 +239,43 @@ class RNZcash: RCTEventEmitter {
     }
   }
 
+  @objc func shieldFunds(
+    _ alias: String, _ seed: String, _ memo: String, _ threshold: String,
+    resolver resolve: @escaping RCTPromiseResolveBlock,
+    rejecter reject: @escaping RCTPromiseRejectBlock
+  ) {
+    Task {
+      if let wallet = SynchronizerMap[alias] {
+        if !wallet.fullySynced {
+          reject("shieldFunds", "Wallet is not synced", genericError)
+          return
+        }
+
+        do {
+          let spendingKey = try deriveUnifiedSpendingKey(seed, wallet.synchronizer.network)
+          let sdkMemo = try Memo(string: memo)
+          let shieldingThreshold = Int64(threshold) ?? 10000
+
+          let tx = try await wallet.synchronizer.shieldFunds(
+            spendingKey: spendingKey,
+            memo: sdkMemo,
+            shieldingThreshold: Zatoshi(shieldingThreshold)
+          )
+
+          var confTx = await wallet.parseTx(tx: tx)
+
+          // Hack: Memos aren't ready to be queried right after broadcast
+          confTx.memos = [memo]
+          resolve(confTx.nsDictionary)
+        } catch {
+          reject("shieldFunds", "Failed to shield funds", genericError)
+        }
+      } else {
+        reject("shieldFunds", "Wallet does not exist", genericError)
+      }
+    }
+  }
+
   @objc func rescan(
     _ alias: String, resolver resolve: @escaping RCTPromiseResolveBlock,
     rejecter reject: @escaping RCTPromiseRejectBlock
@@ -315,11 +357,12 @@ class RNZcash: RCTEventEmitter {
         do {
           let unifiedAddress = try await wallet.synchronizer.getUnifiedAddress(accountIndex: 0)
           let saplingAddress = try await wallet.synchronizer.getSaplingAddress(accountIndex: 0)
-          let transparentAddress = try await wallet.synchronizer.getTransparentAddress(accountIndex: 0)
+          let transparentAddress = try await wallet.synchronizer.getTransparentAddress(
+            accountIndex: 0)
           let addresses: NSDictionary = [
             "unifiedAddress": unifiedAddress.stringEncoded,
             "saplingAddress": saplingAddress.stringEncoded,
-            "transparentAddress": transparentAddress.stringEncoded
+            "transparentAddress": transparentAddress.stringEncoded,
           ]
           resolve(addresses)
           return
@@ -379,7 +422,11 @@ class WalletSynchronizer: NSObject {
       scanProgress: 0,
       networkBlockHeight: 0
     )
-    self.balances = TotalBalances(availableZatoshi: "0", totalZatoshi: "0")
+    self.balances = TotalBalances(
+      transparentAvailableZatoshi: Zatoshi(0),
+      transparentTotalZatoshi: Zatoshi(0),
+      saplingAvailableZatoshi: Zatoshi(0),
+      saplingTotalZatoshi: Zatoshi(0))
   }
 
   public func subscribe() {
@@ -393,19 +440,19 @@ class WalletSynchronizer: NSObject {
     self.synchronizer.eventStream
       .sink { SynchronizerEvent in
         switch SynchronizerEvent {
-          case .minedTransaction(let transaction):
-              self.emitTxs(transactions: [transaction])
-          case .foundTransactions(let transactions, _):
-              self.emitTxs(transactions: transactions)
-          default:
-              return
-          }
+        case .minedTransaction(let transaction):
+          self.emitTxs(transactions: [transaction])
+        case .foundTransactions(let transactions, _):
+          self.emitTxs(transactions: transactions)
+        default:
+          return
+        }
       }
       .store(in: &cancellables)
   }
 
   func updateSyncStatus(event: SynchronizerState) {
-    
+
     if !self.fullySynced {
       switch event.internalSyncStatus {
       case .syncing:
@@ -441,10 +488,18 @@ class WalletSynchronizer: NSObject {
       return
     }
 
-    if (scanProgress == self.processorState.scanProgress && event.latestBlockHeight == self.processorState.networkBlockHeight) { return }
+    if scanProgress == self.processorState.scanProgress
+      && event.latestBlockHeight == self.processorState.networkBlockHeight
+    {
+      return
+    }
 
-    self.processorState = ProcessorState(scanProgress: scanProgress, networkBlockHeight: event.latestBlockHeight)
-    let data: NSDictionary = ["alias": self.alias, "scanProgress": self.processorState.scanProgress, "networkBlockHeight": self.processorState.networkBlockHeight]
+    self.processorState = ProcessorState(
+      scanProgress: scanProgress, networkBlockHeight: event.latestBlockHeight)
+    let data: NSDictionary = [
+      "alias": self.alias, "scanProgress": self.processorState.scanProgress,
+      "networkBlockHeight": self.processorState.networkBlockHeight,
+    ]
     emit("UpdateEvent", data)
     updateBalanceState(event: event)
   }
@@ -454,68 +509,86 @@ class WalletSynchronizer: NSObject {
       scanProgress: 0,
       networkBlockHeight: 0
     )
-    self.balances = TotalBalances(availableZatoshi: "0", totalZatoshi: "0")
+    self.balances = TotalBalances(
+      transparentAvailableZatoshi: Zatoshi(0),
+      transparentTotalZatoshi: Zatoshi(0),
+      saplingAvailableZatoshi: Zatoshi(0),
+      saplingTotalZatoshi: Zatoshi(0))
   }
 
   func updateBalanceState(event: SynchronizerState) {
     let transparentBalance = event.transparentBalance
     let shieldedBalance = event.shieldedBalance
 
-    let availableTransparentBalance = transparentBalance.verified
-    let totalTransparentBalance = transparentBalance.total
-
-    let availableShieldedBalance = shieldedBalance.verified
-    let totalShieldedBalance = shieldedBalance.total
+    let transparentAvailableZatoshi = transparentBalance.verified
+    let transparentTotalZatoshi = transparentBalance.total
 
-    let availableZatoshi = String((availableShieldedBalance + availableTransparentBalance).amount)
-    let totalZatoshi = String((totalShieldedBalance + totalTransparentBalance).amount)
+    let saplingAvailableZatoshi = shieldedBalance.verified
+    let saplingTotalZatoshi = shieldedBalance.total
 
-    if (availableZatoshi == self.balances.availableZatoshi && totalZatoshi == self.balances.totalZatoshi) { return }
+    if transparentAvailableZatoshi == self.balances.transparentAvailableZatoshi
+      && transparentTotalZatoshi == self.balances.transparentTotalZatoshi
+      && saplingAvailableZatoshi == self.balances.saplingAvailableZatoshi
+      && saplingTotalZatoshi == self.balances.saplingTotalZatoshi
+    {
+      return
+    }
 
-    self.balances = TotalBalances(availableZatoshi: availableZatoshi, totalZatoshi: totalZatoshi)
-    let data: NSDictionary = ["alias": self.alias, "availableZatoshi": self.balances.availableZatoshi, "totalZatoshi": self.balances.totalZatoshi]
+    self.balances = TotalBalances(
+      transparentAvailableZatoshi: transparentAvailableZatoshi,
+      transparentTotalZatoshi: transparentTotalZatoshi,
+      saplingAvailableZatoshi: saplingAvailableZatoshi,
+      saplingTotalZatoshi: saplingTotalZatoshi
+    )
+    let data = NSMutableDictionary(dictionary: self.balances.nsDictionary)
+    data["alias"] = self.alias
     emit("BalanceEvent", data)
   }
 
+  func parseTx(tx: ZcashTransaction.Overview) async -> ConfirmedTx {
+    var confTx = ConfirmedTx(
+      minedHeight: tx.minedHeight ?? 0,
+      rawTransactionId: (tx.rawID.toHexStringTxId()),
+      blockTimeInSeconds: Int(tx.blockTime ?? 0),
+      value: String(describing: abs(tx.value.amount))
+    )
+    if tx.raw != nil {
+      confTx.raw = tx.raw!.hexEncodedString()
+    }
+    if tx.fee != nil {
+      confTx.fee = String(describing: abs(tx.value.amount))
+    }
+    if tx.isSentTransaction {
+      let recipients = await self.synchronizer.getRecipients(for: tx)
+      if recipients.count > 0 {
+        let addresses = recipients.compactMap {
+          if case let .address(address) = $0 {
+            return address
+          } else {
+            return nil
+          }
+        }
+        if addresses.count > 0 {
+          confTx.toAddress = addresses.first!.stringEncoded
+        }
+      }
+    }
+    if tx.memoCount > 0 {
+      let memos = (try? await self.synchronizer.getMemos(for: tx)) ?? []
+      let textMemos = memos.compactMap {
+        return $0.toString()
+      }
+      confTx.memos = textMemos
+    }
+    return confTx
+  }
+
   func emitTxs(transactions: [ZcashTransaction.Overview]) {
     Task {
       var out: [NSDictionary] = []
       for tx in transactions {
-        if (tx.isExpiredUmined ?? false) { continue }
-        var confTx = ConfirmedTx(
-          minedHeight: tx.minedHeight!,
-          rawTransactionId: (tx.rawID.toHexStringTxId()),
-          blockTimeInSeconds: Int(tx.blockTime!),
-          value: String(describing: abs(tx.value.amount))
-        )
-        if tx.raw != nil {
-          confTx.raw = tx.raw!.hexEncodedString()
-        }
-        if tx.fee != nil {
-          confTx.fee = String(describing: abs(tx.value.amount))
-        }
-        if tx.isSentTransaction {
-          let recipients = await self.synchronizer.getRecipients(for: tx)
-          if recipients.count > 0 {
-            let addresses = recipients.compactMap {
-              if case let .address(address) = $0 {
-                return address
-              } else {
-                return nil
-              }
-            }
-            if addresses.count > 0 {
-              confTx.toAddress = addresses.first!.stringEncoded
-            }
-          }
-        }
-        if tx.memoCount > 0 {
-          let memos = (try? await self.synchronizer.getMemos(for: tx)) ?? []
-          let textMemos = memos.compactMap {
-            return $0.toString()
-          }
-          confTx.memos = textMemos
-        }
+        if tx.isExpiredUmined ?? false { continue }
+        let confTx = await parseTx(tx: tx)
         out.append(confTx.nsDictionary)
       }
 

package/ios/libzcashlc.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libzcashlc.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libzcashlc.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libzcashlc.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libzcashlc.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/lib/rnzcash.rn.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var biggystring = require('biggystring');
 var reactNative = require('react-native');
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -160,6 +161,19 @@ var Synchronizer = /*#__PURE__*/function () {
     }
 
     return sendToAddress;
+  }();
+
+  _proto.shieldFunds = /*#__PURE__*/function () {
+    var _shieldFunds = _asyncToGenerator(function* (shieldFundsInfo) {
+      var result = yield RNZcash.shieldFunds(this.alias, shieldFundsInfo.seed, shieldFundsInfo.memo, shieldFundsInfo.threshold);
+      return result;
+    });
+
+    function shieldFunds(_x10) {
+      return _shieldFunds.apply(this, arguments);
+    }
+
+    return shieldFunds;
   }() // Events
   ;
 
@@ -168,7 +182,15 @@ var Synchronizer = /*#__PURE__*/function () {
         onStatusChanged = _ref.onStatusChanged,
         onTransactionsChanged = _ref.onTransactionsChanged,
         onUpdate = _ref.onUpdate;
-    this.setListener('BalanceEvent', onBalanceChanged);
+    this.setListener('BalanceEvent', function (event) {
+      var transparentAvailableZatoshi = event.transparentAvailableZatoshi,
+          transparentTotalZatoshi = event.transparentTotalZatoshi,
+          saplingAvailableZatoshi = event.saplingAvailableZatoshi,
+          saplingTotalZatoshi = event.saplingTotalZatoshi;
+      event.availableZatoshi = biggystring.add(transparentAvailableZatoshi, saplingAvailableZatoshi);
+      event.totalZatoshi = biggystring.add(transparentTotalZatoshi, saplingTotalZatoshi);
+      onBalanceChanged(event);
+    });
     this.setListener('StatusEvent', onStatusChanged);
     this.setListener('TransactionEvent', onTransactionsChanged);
     this.setListener('UpdateEvent', onUpdate);
@@ -203,7 +225,7 @@ var makeSynchronizer = /*#__PURE__*/function () {
     return synchronizer;
   });
 
-  return function makeSynchronizer(_x10) {
+  return function makeSynchronizer(_x11) {
     return _ref2.apply(this, arguments);
   };
 }();

package/lib/rnzcash.rn.js.map

@@ -1 +1 @@
-{"version":3,"file":"rnzcash.rn.js","sources":["../src/react-native.ts"],"sourcesContent":["import {\n  EventSubscription,\n  NativeEventEmitter,\n  NativeModules\n} from 'react-native'\n\nimport {\n  Addresses,\n  InitializerConfig,\n  Network,\n  SpendFailure,\n  SpendInfo,\n  SpendSuccess,\n  SynchronizerCallbacks,\n  UnifiedViewingKey\n} from './types'\n\nconst { RNZcash } = NativeModules\n\ntype Callback = (...args: any[]) => any\n\nexport const Tools = {\n  deriveViewingKey: async (\n    seedBytesHex: string,\n    network: Network\n  ): Promise<UnifiedViewingKey> => {\n    const result = await RNZcash.deriveViewingKey(seedBytesHex, network)\n    return result\n  },\n  getBirthdayHeight: async (host: string, port: number): Promise<number> => {\n    const result = await RNZcash.getBirthdayHeight(host, port)\n    return result\n  },\n  isValidAddress: async (\n    address: string,\n    network: Network = 'mainnet'\n  ): Promise<boolean> => {\n    const result = await RNZcash.isValidAddress(address, network)\n    return result\n  }\n}\n\nexport class Synchronizer {\n  eventEmitter: NativeEventEmitter\n  subscriptions: EventSubscription[]\n  alias: string\n  network: Network\n\n  constructor(alias: string, network: Network) {\n    this.eventEmitter = new NativeEventEmitter(RNZcash)\n    this.subscriptions = []\n    this.alias = alias\n    this.network = network\n  }\n\n  async stop(): Promise<String> {\n    this.unsubscribe()\n    const result = await RNZcash.stop(this.alias)\n    return result\n  }\n\n  async initialize(initializerConfig: InitializerConfig): Promise<void> {\n    await RNZcash.initialize(\n      initializerConfig.mnemonicSeed,\n      initializerConfig.birthdayHeight,\n      initializerConfig.alias,\n      initializerConfig.networkName,\n      initializerConfig.defaultHost,\n      initializerConfig.defaultPort,\n      initializerConfig.newWallet\n    )\n  }\n\n  async deriveUnifiedAddress(): Promise<Addresses> {\n    const result = await RNZcash.deriveUnifiedAddress(this.alias)\n    return result\n  }\n\n  async getLatestNetworkHeight(alias: string): Promise<number> {\n    const result = await RNZcash.getLatestNetworkHeight(alias)\n    return result\n  }\n\n  rescan(): void {\n    RNZcash.rescan(this.alias)\n  }\n\n  async sendToAddress(\n    spendInfo: SpendInfo\n  ): Promise<SpendSuccess | SpendFailure> {\n    const result = await RNZcash.sendToAddress(\n      this.alias,\n      spendInfo.zatoshi,\n      spendInfo.toAddress,\n      spendInfo.memo,\n      spendInfo.mnemonicSeed\n    )\n    return result\n  }\n\n  // Events\n\n  subscribe({\n    onBalanceChanged,\n    onStatusChanged,\n    onTransactionsChanged,\n    onUpdate\n  }: SynchronizerCallbacks): void {\n    this.setListener('BalanceEvent', onBalanceChanged)\n    this.setListener('StatusEvent', onStatusChanged)\n    this.setListener('TransactionEvent', onTransactionsChanged)\n    this.setListener('UpdateEvent', onUpdate)\n  }\n\n  private setListener<T>(\n    eventName: string,\n    callback: Callback = (t: any) => null\n  ): void {\n    this.subscriptions.push(\n      this.eventEmitter.addListener(eventName, arg =>\n        arg.alias === this.alias ? callback(arg) : null\n      )\n    )\n  }\n\n  unsubscribe(): void {\n    this.subscriptions.forEach(subscription => {\n      subscription.remove()\n    })\n  }\n}\n\nexport const makeSynchronizer = async (\n  initializerConfig: InitializerConfig\n): Promise<Synchronizer> => {\n  const synchronizer = new Synchronizer(\n    initializerConfig.alias,\n    initializerConfig.networkName\n  )\n  await synchronizer.initialize(initializerConfig)\n  return synchronizer\n}\n"],"names":["RNZcash","NativeModules","Tools","deriveViewingKey","seedBytesHex","network","result","getBirthdayHeight","host","port","isValidAddress","address","Synchronizer","alias","eventEmitter","NativeEventEmitter","subscriptions","stop","unsubscribe","initialize","initializerConfig","mnemonicSeed","birthdayHeight","networkName","defaultHost","defaultPort","newWallet","deriveUnifiedAddress","getLatestNetworkHeight","rescan","sendToAddress","spendInfo","zatoshi","toAddress","memo","subscribe","onBalanceChanged","onStatusChanged","onTransactionsChanged","onUpdate","setListener","eventName","callback","t","push","addListener","arg","forEach","subscription","remove","makeSynchronizer","synchronizer"],"mappings":"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"}
+{"version":3,"file":"rnzcash.rn.js","sources":["../src/react-native.ts"],"sourcesContent":["import { add } from 'biggystring'\nimport {\n  EventSubscription,\n  NativeEventEmitter,\n  NativeModules\n} from 'react-native'\n\nimport {\n  Addresses,\n  InitializerConfig,\n  Network,\n  ShieldFundsInfo,\n  SpendFailure,\n  SpendInfo,\n  SpendSuccess,\n  SynchronizerCallbacks,\n  Transaction,\n  UnifiedViewingKey\n} from './types'\nexport * from './types'\n\nconst { RNZcash } = NativeModules\n\ntype Callback = (...args: any[]) => any\n\nexport const Tools = {\n  deriveViewingKey: async (\n    seedBytesHex: string,\n    network: Network\n  ): Promise<UnifiedViewingKey> => {\n    const result = await RNZcash.deriveViewingKey(seedBytesHex, network)\n    return result\n  },\n  getBirthdayHeight: async (host: string, port: number): Promise<number> => {\n    const result = await RNZcash.getBirthdayHeight(host, port)\n    return result\n  },\n  isValidAddress: async (\n    address: string,\n    network: Network = 'mainnet'\n  ): Promise<boolean> => {\n    const result = await RNZcash.isValidAddress(address, network)\n    return result\n  }\n}\n\nexport class Synchronizer {\n  eventEmitter: NativeEventEmitter\n  subscriptions: EventSubscription[]\n  alias: string\n  network: Network\n\n  constructor(alias: string, network: Network) {\n    this.eventEmitter = new NativeEventEmitter(RNZcash)\n    this.subscriptions = []\n    this.alias = alias\n    this.network = network\n  }\n\n  async stop(): Promise<string> {\n    this.unsubscribe()\n    const result = await RNZcash.stop(this.alias)\n    return result\n  }\n\n  async initialize(initializerConfig: InitializerConfig): Promise<void> {\n    await RNZcash.initialize(\n      initializerConfig.mnemonicSeed,\n      initializerConfig.birthdayHeight,\n      initializerConfig.alias,\n      initializerConfig.networkName,\n      initializerConfig.defaultHost,\n      initializerConfig.defaultPort,\n      initializerConfig.newWallet\n    )\n  }\n\n  async deriveUnifiedAddress(): Promise<Addresses> {\n    const result = await RNZcash.deriveUnifiedAddress(this.alias)\n    return result\n  }\n\n  async getLatestNetworkHeight(alias: string): Promise<number> {\n    const result = await RNZcash.getLatestNetworkHeight(alias)\n    return result\n  }\n\n  rescan(): void {\n    RNZcash.rescan(this.alias)\n  }\n\n  async sendToAddress(\n    spendInfo: SpendInfo\n  ): Promise<SpendSuccess | SpendFailure> {\n    const result = await RNZcash.sendToAddress(\n      this.alias,\n      spendInfo.zatoshi,\n      spendInfo.toAddress,\n      spendInfo.memo,\n      spendInfo.mnemonicSeed\n    )\n    return result\n  }\n\n  async shieldFunds(shieldFundsInfo: ShieldFundsInfo): Promise<Transaction> {\n    const result = await RNZcash.shieldFunds(\n      this.alias,\n      shieldFundsInfo.seed,\n      shieldFundsInfo.memo,\n      shieldFundsInfo.threshold\n    )\n    return result\n  }\n\n  // Events\n\n  subscribe({\n    onBalanceChanged,\n    onStatusChanged,\n    onTransactionsChanged,\n    onUpdate\n  }: SynchronizerCallbacks): void {\n    this.setListener('BalanceEvent', event => {\n      const {\n        transparentAvailableZatoshi,\n        transparentTotalZatoshi,\n        saplingAvailableZatoshi,\n        saplingTotalZatoshi\n      } = event\n\n      event.availableZatoshi = add(\n        transparentAvailableZatoshi,\n        saplingAvailableZatoshi\n      )\n      event.totalZatoshi = add(transparentTotalZatoshi, saplingTotalZatoshi)\n      onBalanceChanged(event)\n    })\n    this.setListener('StatusEvent', onStatusChanged)\n    this.setListener('TransactionEvent', onTransactionsChanged)\n    this.setListener('UpdateEvent', onUpdate)\n  }\n\n  private setListener<T>(\n    eventName: string,\n    callback: Callback = (t: any) => null\n  ): void {\n    this.subscriptions.push(\n      this.eventEmitter.addListener(eventName, arg =>\n        arg.alias === this.alias ? callback(arg) : null\n      )\n    )\n  }\n\n  unsubscribe(): void {\n    this.subscriptions.forEach(subscription => {\n      subscription.remove()\n    })\n  }\n}\n\nexport const makeSynchronizer = async (\n  initializerConfig: InitializerConfig\n): Promise<Synchronizer> => {\n  const synchronizer = new Synchronizer(\n    initializerConfig.alias,\n    initializerConfig.networkName\n  )\n  await synchronizer.initialize(initializerConfig)\n  return synchronizer\n}\n"],"names":["RNZcash","NativeModules","Tools","deriveViewingKey","seedBytesHex","network","result","getBirthdayHeight","host","port","isValidAddress","address","Synchronizer","alias","eventEmitter","NativeEventEmitter","subscriptions","stop","unsubscribe","initialize","initializerConfig","mnemonicSeed","birthdayHeight","networkName","defaultHost","defaultPort","newWallet","deriveUnifiedAddress","getLatestNetworkHeight","rescan","sendToAddress","spendInfo","zatoshi","toAddress","memo","shieldFunds","shieldFundsInfo","seed","threshold","subscribe","onBalanceChanged","onStatusChanged","onTransactionsChanged","onUpdate","setListener","event","transparentAvailableZatoshi","transparentTotalZatoshi","saplingAvailableZatoshi","saplingTotalZatoshi","availableZatoshi","add","totalZatoshi","eventName","callback","t","push","addListener","arg","forEach","subscription","remove","makeSynchronizer","synchronizer"],"mappings":"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"}

package/lib/src/react-native.d.ts

@@ -1,5 +1,6 @@
 import { EventSubscription, NativeEventEmitter } from 'react-native';
-import { Addresses, InitializerConfig, Network, SpendFailure, SpendInfo, SpendSuccess, SynchronizerCallbacks, UnifiedViewingKey } from './types';
+import { Addresses, InitializerConfig, Network, ShieldFundsInfo, SpendFailure, SpendInfo, SpendSuccess, SynchronizerCallbacks, Transaction, UnifiedViewingKey } from './types';
+export * from './types';
 export declare const Tools: {
     deriveViewingKey: (seedBytesHex: string, network: Network) => Promise<UnifiedViewingKey>;
     getBirthdayHeight: (host: string, port: number) => Promise<number>;
@@ -11,12 +12,13 @@ export declare class Synchronizer {
     alias: string;
     network: Network;
     constructor(alias: string, network: Network);
-    stop(): Promise<String>;
+    stop(): Promise<string>;
     initialize(initializerConfig: InitializerConfig): Promise<void>;
     deriveUnifiedAddress(): Promise<Addresses>;
     getLatestNetworkHeight(alias: string): Promise<number>;
     rescan(): void;
     sendToAddress(spendInfo: SpendInfo): Promise<SpendSuccess | SpendFailure>;
+    shieldFunds(shieldFundsInfo: ShieldFundsInfo): Promise<Transaction>;
     subscribe({ onBalanceChanged, onStatusChanged, onTransactionsChanged, onUpdate }: SynchronizerCallbacks): void;
     private setListener;
     unsubscribe(): void;

package/lib/src/types.d.ts

@@ -14,6 +14,11 @@ export interface SpendInfo {
     memo?: string;
     mnemonicSeed: string;
 }
+export interface ShieldFundsInfo {
+    seed: string;
+    memo: string;
+    threshold: string;
+}
 export interface SpendSuccess {
     txId: string;
     raw: string;
@@ -27,6 +32,11 @@ export interface UnifiedViewingKey {
     extpub: string;
 }
 export interface BalanceEvent {
+    transparentAvailableZatoshi: string;
+    transparentTotalZatoshi: string;
+    saplingAvailableZatoshi: string;
+    saplingTotalZatoshi: string;
+    /** @deprecated */
     availableZatoshi: string;
     totalZatoshi: string;
 }
@@ -35,7 +45,7 @@ export interface StatusEvent {
     name: 'STOPPED' /** Indicates that [stop] has been called on this Synchronizer and it will no longer be used. */ | 'DISCONNECTED' /** Indicates that this Synchronizer is disconnected from its lightwalletd server. When set, a UI element may want to turn red. */ | 'SYNCING' /** Indicates that this Synchronizer is actively downloading and scanning new blocks */ | 'SYNCED'; /** Indicates that this Synchronizer is fully up to date and ready for all wallet functions. When set, a UI element may want to turn green. In this state, the balance can be trusted. */
 }
 export interface TransactionEvent {
-    transactions: ConfirmedTransaction[];
+    transactions: Transaction[];
 }
 export interface UpdateEvent {
     alias: string;
@@ -52,7 +62,7 @@ export interface BlockRange {
     first: number;
     last: number;
 }
-export interface ConfirmedTransaction {
+export interface Transaction {
     rawTransactionId: string;
     raw?: string;
     blockTimeInSeconds: number;
@@ -62,6 +72,8 @@ export interface ConfirmedTransaction {
     toAddress?: string;
     memos: string[];
 }
+/** @deprecated Renamed `Transaction` because the package can now return unconfirmed shielding transactions */
+export declare type ConfirmedTransaction = Transaction;
 export interface Addresses {
     unifiedAddress: string;
     saplingAddress: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zcash",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Zcash library for React Native",
   "homepage": "https://github.com/EdgeApp/react-native-zcash",
   "repository": {
@@ -45,6 +45,7 @@
     "*.{js,ts}": "eslint"
   },
   "dependencies": {
+    "biggystring": "^4.1.3",
     "rfc4648": "^1.3.0"
   },
   "devDependencies": {

package/src/react-native.ts

@@ -1,3 +1,4 @@
+import { add } from 'biggystring'
 import {
   EventSubscription,
   NativeEventEmitter,
@@ -8,12 +9,15 @@ import {
   Addresses,
   InitializerConfig,
   Network,
+  ShieldFundsInfo,
   SpendFailure,
   SpendInfo,
   SpendSuccess,
   SynchronizerCallbacks,
+  Transaction,
   UnifiedViewingKey
 } from './types'
+export * from './types'
 
 const { RNZcash } = NativeModules
 
@@ -53,7 +57,7 @@ export class Synchronizer {
     this.network = network
   }
 
-  async stop(): Promise<String> {
+  async stop(): Promise<string> {
     this.unsubscribe()
     const result = await RNZcash.stop(this.alias)
     return result
@@ -98,6 +102,16 @@ export class Synchronizer {
     return result
   }
 
+  async shieldFunds(shieldFundsInfo: ShieldFundsInfo): Promise<Transaction> {
+    const result = await RNZcash.shieldFunds(
+      this.alias,
+      shieldFundsInfo.seed,
+      shieldFundsInfo.memo,
+      shieldFundsInfo.threshold
+    )
+    return result
+  }
+
   // Events
 
   subscribe({
@@ -106,7 +120,21 @@ export class Synchronizer {
     onTransactionsChanged,
     onUpdate
   }: SynchronizerCallbacks): void {
-    this.setListener('BalanceEvent', onBalanceChanged)
+    this.setListener('BalanceEvent', event => {
+      const {
+        transparentAvailableZatoshi,
+        transparentTotalZatoshi,
+        saplingAvailableZatoshi,
+        saplingTotalZatoshi
+      } = event
+
+      event.availableZatoshi = add(
+        transparentAvailableZatoshi,
+        saplingAvailableZatoshi
+      )
+      event.totalZatoshi = add(transparentTotalZatoshi, saplingTotalZatoshi)
+      onBalanceChanged(event)
+    })
     this.setListener('StatusEvent', onStatusChanged)
     this.setListener('TransactionEvent', onTransactionsChanged)
     this.setListener('UpdateEvent', onUpdate)

package/src/types.ts

@@ -17,6 +17,12 @@ export interface SpendInfo {
   mnemonicSeed: string
 }
 
+export interface ShieldFundsInfo {
+  seed: string
+  memo: string
+  threshold: string
+}
+
 export interface SpendSuccess {
   txId: string
   raw: string
@@ -33,6 +39,12 @@ export interface UnifiedViewingKey {
 }
 
 export interface BalanceEvent {
+  transparentAvailableZatoshi: string
+  transparentTotalZatoshi: string
+  saplingAvailableZatoshi: string
+  saplingTotalZatoshi: string
+
+  /** @deprecated */
   availableZatoshi: string
   totalZatoshi: string
 }
@@ -47,7 +59,7 @@ export interface StatusEvent {
 }
 
 export interface TransactionEvent {
-  transactions: ConfirmedTransaction[]
+  transactions: Transaction[]
 }
 
 export interface UpdateEvent {
@@ -68,7 +80,7 @@ export interface BlockRange {
   last: number
 }
 
-export interface ConfirmedTransaction {
+export interface Transaction {
   rawTransactionId: string
   raw?: string
   blockTimeInSeconds: number
@@ -79,6 +91,9 @@ export interface ConfirmedTransaction {
   memos: string[]
 }
 
+/** @deprecated Renamed `Transaction` because the package can now return unconfirmed shielding transactions */
+export type ConfirmedTransaction = Transaction
+
 export interface Addresses {
   unifiedAddress: string
   saplingAddress: string