react-native-zcash 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # React Native Zcash
 
+## 0.3.3 (2023-06-22)
+
+- fixed: Update the Android build.gradle to use the upstream-specified Kotlin version and upstream-specified appcompat library version.
+
+## 0.3.2 (2022-12-20)
+
+- getBirthdayHeight: Remove Android specific network name and use host and port for both platforms
+
 ## 0.3.1 (2022-12-15)
 
 - Add `getBirthdayHeight` method to query blockheight without an active synchronizer

package/android/build.gradle

@@ -1,26 +1,15 @@
 buildscript {
-    ext.versions = [
-      'kotlin': '1.5.0',
-      'zcash': '1.5.0-beta01',
-      'room': '2.3.0'
-    ]
-    repositories {
-        mavenLocal()
-        google()
-        mavenCentral()
-        jcenter()
-        maven {
-            url 'https://jitpack.io'
-        }
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
+  def kotlinVersion = rootProject.ext.has('kotlinVersion')
+    ? rootProject.ext.get('kotlinVersion')
+    : '1.5.20'
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
-    }
+  repositories {
+    mavenCentral()
+    google()
+  }
+  dependencies {
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
+  }
 }
 
 apply plugin: 'com.android.library'
@@ -31,26 +20,11 @@ def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = "28.0.2"
-def DEFAULT_MIN_SDK_VERSION = 19
-def DEFAULT_TARGET_SDK_VERSION = 27
-
 android {
-  compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-  buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8
-  }
+  compileSdkVersion safeExtGet('compileSdkVersion', 32)
   defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-    targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-    versionCode 1
-    versionName "1.0"
+    minSdkVersion safeExtGet('minSdkVersion', 23)
+    targetSdkVersion safeExtGet('targetSdkVersion', 32)
   }
   lintOptions {
     abortOnError false
@@ -58,32 +32,22 @@ android {
 }
 
 repositories {
-  mavenLocal()
-  google()
-  jcenter()
-    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
   maven {
-    url("../node_modules/react-native/android")
+    url('../node_modules/react-native/android')
   }
+  google()
+  mavenCentral()
 }
 
 dependencies {
-    // React-Native
-    implementation 'com.facebook.react:react-native:+'
-
-    // Zcash
-    implementation  "cash.z.ecc.android:zcash-android-sdk:${versions.zcash}"
-
-    // Process Room annotations
-    kapt "androidx.room:room-compiler:${versions.room}"
+  implementation 'com.facebook.react:react-native:+'
 
-    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"
+  // Compiler plugin for Room annotation support:
+  kapt 'androidx.room:room-compiler:2.3.0'
 
-    implementation ("androidx.appcompat:appcompat:1.3.1") {
-        version {
-            strictly '1.3.1'
-        }
-    }
+  implementation 'androidx.appcompat:appcompat:1.4.1'
+  implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
+  implementation 'cash.z.ecc.android:zcash-android-sdk:1.5.0-beta01'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
 }

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

@@ -177,12 +177,8 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun getBirthdayHeight(network: String = "mainnet", promise: Promise) = promise.wrap {
-        var networkInt = 1
-        if (network != "mainnet") {
-            networkInt = 0
-        }
-        var lightwalletService = LightWalletGrpcService(reactApplicationContext, ZcashNetwork.from(networkInt))
+    fun getBirthdayHeight(host: String, port: Int, promise: Promise) = promise.wrap {
+        var lightwalletService = LightWalletGrpcService(reactApplicationContext, host, port)
         val height = lightwalletService?.getLatestBlockHeight()
         lightwalletService?.shutdown()
         height

package/lib/rnzcash.rn.js

@@ -41,7 +41,6 @@ function _asyncToGenerator(fn) {
 }
 
 var RNZcash = reactNative.NativeModules.RNZcash;
-var isAndroid = reactNative.Platform.OS === 'android';
 var KeyTool = {
   deriveViewingKey: function () {
     var _deriveViewingKey = _asyncToGenerator(function* (seedBytesHex, network) {
@@ -68,13 +67,12 @@ var KeyTool = {
     return deriveSpendingKey;
   }(),
   getBirthdayHeight: function () {
-    var _getBirthdayHeight = _asyncToGenerator(function* (network, host, port) {
-      var args = isAndroid ? [network] : [host, port];
-      var result = yield RNZcash.getBirthdayHeight.apply(RNZcash, args);
+    var _getBirthdayHeight = _asyncToGenerator(function* (host, port) {
+      var result = yield RNZcash.getBirthdayHeight(host, port);
       return result;
     });
 
-    function getBirthdayHeight(_x5, _x6, _x7) {
+    function getBirthdayHeight(_x5, _x6) {
       return _getBirthdayHeight.apply(this, arguments);
     }
 
@@ -88,7 +86,7 @@ var AddressTool = {
       return result;
     });
 
-    function deriveShieldedAddress(_x8, _x9) {
+    function deriveShieldedAddress(_x7, _x8) {
       return _deriveShieldedAddress.apply(this, arguments);
     }
 
@@ -104,7 +102,7 @@ var AddressTool = {
       return result;
     });
 
-    function isValidShieldedAddress(_x10, _x11) {
+    function isValidShieldedAddress(_x9, _x10) {
       return _isValidShieldedAddress.apply(this, arguments);
     }
 
@@ -120,7 +118,7 @@ var AddressTool = {
       return result;
     });
 
-    function isValidTransparentAddress(_x12, _x13) {
+    function isValidTransparentAddress(_x11, _x12) {
       return _isValidTransparentAddress.apply(this, arguments);
     }
 
@@ -169,7 +167,7 @@ var Synchronizer = /*#__PURE__*/function () {
       yield RNZcash.initialize(initializerConfig.fullViewingKey.extfvk, initializerConfig.fullViewingKey.extpub, initializerConfig.birthdayHeight, initializerConfig.alias, initializerConfig.networkName, initializerConfig.defaultHost, initializerConfig.defaultPort);
     });
 
-    function initialize(_x14) {
+    function initialize(_x13) {
       return _initialize.apply(this, arguments);
     }
 
@@ -182,7 +180,7 @@ var Synchronizer = /*#__PURE__*/function () {
       return result;
     });
 
-    function getLatestNetworkHeight(_x15) {
+    function getLatestNetworkHeight(_x14) {
       return _getLatestNetworkHeight.apply(this, arguments);
     }
 
@@ -208,7 +206,7 @@ var Synchronizer = /*#__PURE__*/function () {
       return result;
     });
 
-    function getTransactions(_x16) {
+    function getTransactions(_x15) {
       return _getTransactions.apply(this, arguments);
     }
 
@@ -225,7 +223,7 @@ var Synchronizer = /*#__PURE__*/function () {
       return result;
     });
 
-    function sendToAddress(_x17) {
+    function sendToAddress(_x16) {
       return _sendToAddress.apply(this, arguments);
     }
 
@@ -269,7 +267,7 @@ var makeSynchronizer = /*#__PURE__*/function () {
     return synchronizer;
   });
 
-  return function makeSynchronizer(_x18) {
+  return function makeSynchronizer(_x17) {
     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  Platform\n} from 'react-native'\n\nimport {\n  BlockRange,\n  ConfirmedTransaction,\n  InitializerConfig,\n  Network,\n  SpendFailure,\n  SpendInfo,\n  SpendSuccess,\n  SynchronizerCallbacks,\n  UnifiedViewingKey,\n  WalletBalance\n} from './types'\n\nconst { RNZcash } = NativeModules\n\ntype Callback = (...args: any[]) => any\n\nconst isAndroid = Platform.OS === 'android'\n\nexport const KeyTool = {\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  deriveSpendingKey: async (\n    seedBytesHex: string,\n    network: Network\n  ): Promise<string> => {\n    const result = await RNZcash.deriveSpendingKey(seedBytesHex, network)\n    return result\n  },\n  getBirthdayHeight: async (\n    network: 'mainnet' | 'testnet',\n    host: string,\n    port: number\n  ): Promise<number> => {\n    const args = isAndroid ? [network] : [host, port]\n    const result = await RNZcash.getBirthdayHeight(...args)\n    return result\n  }\n}\n\nexport const AddressTool = {\n  deriveShieldedAddress: async (\n    viewingKey: string,\n    network: Network\n  ): Promise<string> => {\n    const result = await RNZcash.deriveShieldedAddress(viewingKey, network)\n    return result\n  },\n  isValidShieldedAddress: async (\n    address: string,\n    network: Network = 'mainnet'\n  ): Promise<boolean> => {\n    const result = await RNZcash.isValidShieldedAddress(address, network)\n    return result\n  },\n  isValidTransparentAddress: async (\n    address: string,\n    network: Network = 'mainnet'\n  ): Promise<boolean> => {\n    const result = await RNZcash.isValidTransparentAddress(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 start(): Promise<String> {\n    const result = await RNZcash.start(this.alias)\n    return result\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.fullViewingKey.extfvk,\n      initializerConfig.fullViewingKey.extpub,\n      initializerConfig.birthdayHeight,\n      initializerConfig.alias,\n      initializerConfig.networkName,\n      initializerConfig.defaultHost,\n      initializerConfig.defaultPort\n    )\n  }\n\n  async getLatestNetworkHeight(alias: string): Promise<number> {\n    const result = await RNZcash.getLatestNetworkHeight(alias)\n    return result\n  }\n\n  async getShieldedBalance(): Promise<WalletBalance> {\n    const result = await RNZcash.getShieldedBalance(this.alias)\n    return result\n  }\n\n  async getTransactions(range: BlockRange): Promise<ConfirmedTransaction[]> {\n    const result = await RNZcash.getTransactions(\n      this.alias,\n      range.first,\n      range.last\n    )\n    return result\n  }\n\n  rescan(height: number): void {\n    RNZcash.rescan(this.alias, height)\n  }\n\n  async sendToAddress(\n    spendInfo: SpendInfo\n  ): Promise<SpendSuccess | SpendFailure> {\n    const result = await RNZcash.spendToAddress(\n      this.alias,\n      spendInfo.zatoshi,\n      spendInfo.toAddress,\n      spendInfo.memo,\n      spendInfo.fromAccountIndex,\n      spendInfo.spendingKey\n    )\n    return result\n  }\n\n  // Events\n\n  subscribe({ onStatusChanged, onUpdate }: SynchronizerCallbacks): void {\n    this.setListener('StatusEvent', onStatusChanged)\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","isAndroid","Platform","OS","KeyTool","deriveViewingKey","seedBytesHex","network","result","deriveSpendingKey","getBirthdayHeight","host","port","args","AddressTool","deriveShieldedAddress","viewingKey","isValidShieldedAddress","address","isValidTransparentAddress","Synchronizer","alias","eventEmitter","NativeEventEmitter","subscriptions","start","stop","unsubscribe","initialize","initializerConfig","fullViewingKey","extfvk","extpub","birthdayHeight","networkName","defaultHost","defaultPort","getLatestNetworkHeight","getShieldedBalance","getTransactions","range","first","last","rescan","height","sendToAddress","spendInfo","spendToAddress","zatoshi","toAddress","memo","fromAccountIndex","spendingKey","subscribe","onStatusChanged","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 {\n  EventSubscription,\n  NativeEventEmitter,\n  NativeModules\n} from 'react-native'\n\nimport {\n  BlockRange,\n  ConfirmedTransaction,\n  InitializerConfig,\n  Network,\n  SpendFailure,\n  SpendInfo,\n  SpendSuccess,\n  SynchronizerCallbacks,\n  UnifiedViewingKey,\n  WalletBalance\n} from './types'\n\nconst { RNZcash } = NativeModules\n\ntype Callback = (...args: any[]) => any\n\nexport const KeyTool = {\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  deriveSpendingKey: async (\n    seedBytesHex: string,\n    network: Network\n  ): Promise<string> => {\n    const result = await RNZcash.deriveSpendingKey(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}\n\nexport const AddressTool = {\n  deriveShieldedAddress: async (\n    viewingKey: string,\n    network: Network\n  ): Promise<string> => {\n    const result = await RNZcash.deriveShieldedAddress(viewingKey, network)\n    return result\n  },\n  isValidShieldedAddress: async (\n    address: string,\n    network: Network = 'mainnet'\n  ): Promise<boolean> => {\n    const result = await RNZcash.isValidShieldedAddress(address, network)\n    return result\n  },\n  isValidTransparentAddress: async (\n    address: string,\n    network: Network = 'mainnet'\n  ): Promise<boolean> => {\n    const result = await RNZcash.isValidTransparentAddress(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 start(): Promise<String> {\n    const result = await RNZcash.start(this.alias)\n    return result\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.fullViewingKey.extfvk,\n      initializerConfig.fullViewingKey.extpub,\n      initializerConfig.birthdayHeight,\n      initializerConfig.alias,\n      initializerConfig.networkName,\n      initializerConfig.defaultHost,\n      initializerConfig.defaultPort\n    )\n  }\n\n  async getLatestNetworkHeight(alias: string): Promise<number> {\n    const result = await RNZcash.getLatestNetworkHeight(alias)\n    return result\n  }\n\n  async getShieldedBalance(): Promise<WalletBalance> {\n    const result = await RNZcash.getShieldedBalance(this.alias)\n    return result\n  }\n\n  async getTransactions(range: BlockRange): Promise<ConfirmedTransaction[]> {\n    const result = await RNZcash.getTransactions(\n      this.alias,\n      range.first,\n      range.last\n    )\n    return result\n  }\n\n  rescan(height: number): void {\n    RNZcash.rescan(this.alias, height)\n  }\n\n  async sendToAddress(\n    spendInfo: SpendInfo\n  ): Promise<SpendSuccess | SpendFailure> {\n    const result = await RNZcash.spendToAddress(\n      this.alias,\n      spendInfo.zatoshi,\n      spendInfo.toAddress,\n      spendInfo.memo,\n      spendInfo.fromAccountIndex,\n      spendInfo.spendingKey\n    )\n    return result\n  }\n\n  // Events\n\n  subscribe({ onStatusChanged, onUpdate }: SynchronizerCallbacks): void {\n    this.setListener('StatusEvent', onStatusChanged)\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","KeyTool","deriveViewingKey","seedBytesHex","network","result","deriveSpendingKey","getBirthdayHeight","host","port","AddressTool","deriveShieldedAddress","viewingKey","isValidShieldedAddress","address","isValidTransparentAddress","Synchronizer","alias","eventEmitter","NativeEventEmitter","subscriptions","start","stop","unsubscribe","initialize","initializerConfig","fullViewingKey","extfvk","extpub","birthdayHeight","networkName","defaultHost","defaultPort","getLatestNetworkHeight","getShieldedBalance","getTransactions","range","first","last","rescan","height","sendToAddress","spendInfo","spendToAddress","zatoshi","toAddress","memo","fromAccountIndex","spendingKey","subscribe","onStatusChanged","onUpdate","setListener","eventName","callback","t","push","addListener","arg","forEach","subscription","remove","makeSynchronizer","synchronizer"],"mappings":"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"}

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

@@ -3,7 +3,7 @@ import { BlockRange, ConfirmedTransaction, InitializerConfig, Network, SpendFail
 export declare const KeyTool: {
     deriveViewingKey: (seedBytesHex: string, network: Network) => Promise<UnifiedViewingKey>;
     deriveSpendingKey: (seedBytesHex: string, network: Network) => Promise<string>;
-    getBirthdayHeight: (network: 'mainnet' | 'testnet', host: string, port: number) => Promise<number>;
+    getBirthdayHeight: (host: string, port: number) => Promise<number>;
 };
 export declare const AddressTool: {
     deriveShieldedAddress: (viewingKey: string, network: Network) => Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zcash",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Zcash library for React Native",
   "homepage": "https://github.com/EdgeApp/react-native-zcash",
   "repository": {

package/src/react-native.ts

@@ -1,8 +1,7 @@
 import {
   EventSubscription,
   NativeEventEmitter,
-  NativeModules,
-  Platform
+  NativeModules
 } from 'react-native'
 
 import {
@@ -22,8 +21,6 @@ const { RNZcash } = NativeModules
 
 type Callback = (...args: any[]) => any
 
-const isAndroid = Platform.OS === 'android'
-
 export const KeyTool = {
   deriveViewingKey: async (
     seedBytesHex: string,
@@ -39,13 +36,8 @@ export const KeyTool = {
     const result = await RNZcash.deriveSpendingKey(seedBytesHex, network)
     return result
   },
-  getBirthdayHeight: async (
-    network: 'mainnet' | 'testnet',
-    host: string,
-    port: number
-  ): Promise<number> => {
-    const args = isAndroid ? [network] : [host, port]
-    const result = await RNZcash.getBirthdayHeight(...args)
+  getBirthdayHeight: async (host: string, port: number): Promise<number> => {
+    const result = await RNZcash.getBirthdayHeight(host, port)
     return result
   }
 }

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

@@ -1,22 +0,0 @@
-<?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>