react-native-zcash 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # React Native Zcash
 
+## 0.2.1 (2022-03-16)
+
+- Update the ZcashLightClientKit dependency
+- Remove unused build scripts
+
 ## 0.2.0 (2022-01-10)
 
 - Add iOS support

package/ios/RNZcash.swift

@@ -430,7 +430,7 @@ func documentsDirectoryHelper() throws -> URL {
 func cacheDbURLHelper(_ alias: String, _ network: ZcashNetwork) throws -> URL {
     try documentsDirectoryHelper()
         .appendingPathComponent(
-            network.constants.DEFAULT_DB_NAME_PREFIX + alias + ZcashSDK.DEFAULT_CACHES_DB_NAME,
+            network.constants.defaultDbNamePrefix + alias + ZcashSDK.defaultCacheDbName,
             isDirectory: false
         )
 }
@@ -438,14 +438,14 @@ func cacheDbURLHelper(_ alias: String, _ network: ZcashNetwork) throws -> URL {
 func dataDbURLHelper(_ alias: String, _ network: ZcashNetwork) throws -> URL {
     try documentsDirectoryHelper()
         .appendingPathComponent(
-            network.constants.DEFAULT_DB_NAME_PREFIX + alias + ZcashSDK.DEFAULT_DATA_DB_NAME,
+            network.constants.defaultDbNamePrefix + alias + ZcashSDK.defaultDataDbName,
             isDirectory: false
         )
 }
 
 func pendingDbURLHelper(_ alias: String, _ network: ZcashNetwork) throws -> URL {
     try documentsDirectoryHelper()
-        .appendingPathComponent(network.constants.DEFAULT_DB_NAME_PREFIX + alias + ZcashSDK.DEFAULT_PENDING_DB_NAME)
+        .appendingPathComponent(network.constants.defaultDbNamePrefix + alias + ZcashSDK.defaultPendingDbName)
 }
 
 func spendParamsURLHelper(_ alias: String) throws -> URL {

package/package.json

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

package/react-native-zcash.podspec

@@ -15,15 +15,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.source       = { :git => "https://github.com/EdgeApp/react-native-zcash.git", :tag => "v#{s.version}" }
   s.source_files = "ios/**/*.{h,m,swift}"
-  s.script_phase = {
-      :name => 'Build generate constants and build librustzcash',
-      :script => 'sh ${PODS_TARGET_SRCROOT}/Scripts/build_librustzcash_xcode.sh',
-      :execution_position => :before_compile
-   }
-   s.prepare_command = <<-CMD
-   sh Scripts/prepare_zcash_sdk.sh
- CMD
 
- s.dependency "React" 
- s.dependency 'ZcashLightClientKit', '0.12.0-beta.5'
+ s.dependency "React"
+ s.dependency 'ZcashLightClientKit', '0.13.0-beta.2'
+
 end

package/Scripts/build_librustzcash.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-BASEPATH="${PWD}"
-TARGET_DIR="target"
-
-
-LIB_PATH="ZcashLightClientKit/$FLAVOR_FOLDER/zcashlc"
-echo "++++ Building librustzcash $NETWORK_TYPE library ++++"
-
-
-if [ -f $TARGET_DIR ]; then
-    rm -rf $TARGET_DIR
-fi
-
-cargo lipo --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml --release
-
-
-if [ -f $LIB_PATH ]; then
-    rm -rf $LIB_PATH
-    mkdir -p $LIB_PATH
-fi
-
-cp -rf $TARGET_DIR/universal/release/* $LIB_PATH

package/Scripts/build_librustzcash_xcode.sh

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-set -x
-
-SCRIPT_COMMONS="${PODS_TARGET_SRCROOT}/Scripts/script_commons.sh"
-if [ ! -f $SCRIPT_COMMONS ]; then
-    echo "Failed to load $SCRIPT_COMMONS"
-    exit 1
-fi
- source $SCRIPT_COMMONS
-
-if [ "$ACTION" = "clean" ]; then
-    echo "CLEAN DETECTED"
-    clean
-    exit 0
-fi
-
-echo "Building Rust backend"
-echo ""
-echo "${PODS_TARGET_SRCROOT}"
-echo "platform name"
-echo $PLATFORM_NAME
-if [ $PLATFORM_NAME = "iphonesimulator" ]; then
-    ZCASH_ACTIVE_ARCHITECTURE="aarch64-apple-ios-sim x86_64-apple-ios"
-    RUSTUP_TOOLCHAIN="nightly-2021-09-24"
-else
-    ZCASH_ACTIVE_ARCHITECTURE="aarch64-apple-ios"
-    RUSTUP_TOOLCHAIN="stable"
-fi
-
-echo "fix 'permission denied issue'"
-chmod -R +w ${PODS_TARGET_SRCROOT}
-
-echo "RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN} cargo build --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml --target $ZCASH_ACTIVE_ARCHITECTURE --release"
-if [[ -n "${DEVELOPER_SDK_DIR:-}" ]]; then
-  # Assume we're in Xcode, which means we're probably cross-compiling.
-  # In this case, we need to add an extra library search path for build scripts and proc-macros,
-  # which run on the host instead of the target.
-  # (macOS Big Sur does not have linkable libraries in /usr/lib/.)
-  echo "export LIBRARY_PATH=\"${DEVELOPER_SDK_DIR}/MacOSX.sdk/usr/lib:${LIBRARY_PATH:-}\""
-  export LIBRARY_PATH="${DEVELOPER_SDK_DIR}/MacOSX.sdk/usr/lib:${LIBRARY_PATH:-}"
-fi
-if [ ! -f ${ZCASH_LIB_RUST_BUILD_PATH}/universal/release/${ZCASH_LIB_RUST_NAME} ]; then
-    RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN} cargo lipo --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml --targets $ZCASH_ACTIVE_ARCHITECTURE --release
-    persist_environment
-fi
-
-
-
-if [ ! -d "${RUST_LIB_PATH}" ]; then 
-    mkdir -p "${RUST_LIB_PATH}"
-fi 
-
-echo "clean up existing artifacts: rm -f ${ZCASH_SDK_RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-rm -f "${ZCASH_SDK_RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-echo "clean up sdk lib path: rm -f ${RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-
-rm -f "${RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-echo "copying artifacts: cp -f ${ZCASH_LIB_RUST_BUILD_PATH}/universal/release/${ZCASH_LIB_RUST_NAME} ${ZCASH_SDK_RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-# ALWAYS SHIP RELEASE NO MATTER WHAT YOUR BUILD IS (FOR NOW AT LEAST)
-cp -f "${ZCASH_LIB_RUST_BUILD_PATH}/universal/release/${ZCASH_LIB_RUST_NAME}" "${ZCASH_SDK_RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-echo "copying artifacts: cp -f ${ZCASH_LIB_RUST_BUILD_PATH}/universal/release/${ZCASH_LIB_RUST_NAME} ${RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-cp -f "${ZCASH_LIB_RUST_BUILD_PATH}/universal/release/${ZCASH_LIB_RUST_NAME}" "${RUST_LIB_PATH}/${ZCASH_LIB_RUST_NAME}"
-

package/Scripts/generate_test_constants.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-#check if env-vars.sh exists
-ENV_VARS_PATH=${PODS_TARGET_SRCROOT}/env-vars.sh
-if [ -f $ENV_VARS_PATH ]; then
-    source $ENV_VARS_PATH
-    echo "importing $ENV_VARS_PATH"
-fi
-
-export ZCASH_TEST_SRC_PATH="${PODS_TARGET_SRCROOT}/ZcashLightClientKitTests"
-if [ ! ${LIGHTWALLETD_ADDRESS} ]; then
-    echo "LIGHTWALLETD_ADDRESS VARIABLE NOT DEFINED"
-    exit 1
-fi
-echo "export ZCASH_TEST_SRC_PATH=$ZCASH_TEST_SRC_PATH"
-#no `else` case needed if the CI works as expected
-sourcery --templates "${ZCASH_TEST_SRC_PATH}/Stencil"  --sources ${ZCASH_TEST_SRC_PATH} --output ${ZCASH_TEST_SRC_PATH} --args addr=$LIGHTWALLETD_ADDRESS

package/Scripts/prepare_zcash_sdk.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-cargo install cargo-lipo
-rustup target add aarch64-apple-ios x86_64-apple-ios
-
-echo "PWD: ${PWD}"
-
-echo "*********************************************"
-echo "* create fake .a so pod install picks it up *"
-echo "*********************************************"
-RUST_LIB_PATH="${PWD}"/lib
-mkdir -p -v $RUST_LIB_PATH
-echo "******************************************************************************"
-echo "   touch $RUST_LIB_PATH/libzcashlc.a   "
-echo "******************************************************************************"
-touch $RUST_LIB_PATH/libzcashlc.a
-
-
-ZCASH_POD_ROOT="${PWD%/*/*}"
-ZCASH_POD_SRCROOT="${ZCASH_POD_ROOT}/ios/Pods/ZcashLightClientKit/ZcashLightClientKit"
-ZCASH_SDK_GENERATED_SOURCES_FOLDER="${ZCASH_POD_SRCROOT}/Generated"
-
-echo "***************************************************************************"
-echo "   touch ${ZCASH_POD_ROOT}/zcashlc/libzcashlc.a" 
-echo "***************************************************************************"
-touch ${ZCASH_POD_SRCROOT}/zcashlc/libzcashlc.a
-
-echo "***************************************************************************"
-echo "   touch ${ZCASH_POD_ROOT}/zcashlc/zcashlc.h" 
-echo "***************************************************************************"
-touch ${ZCASH_POD_SRCROOT}/zcashlc/zcashlc.h

package/Scripts/script_commons.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-export PATH="$HOME/.cargo/bin:$PATH"
-export RUST_LIB_PATH="${PODS_TARGET_SRCROOT}/lib"
-export ZCASH_POD_SCRIPTS="${PODS_TARGET_SRCROOT}/Scripts"
-export ZCASH_LIB_RUST_BUILD_PATH="${PODS_TARGET_SRCROOT%/*/*/*/*}/ZcashLightClientKit/target"
-
-export ZCASH_LIB_RUST_NAME="libzcashlc.a"
-
-export ZCASH_SRC_PATH="${PODS_TARGET_SRCROOT%/*/*/*/*}/ZcashLightClientKit/ZcashLightClientKit"
-export ZCASH_SDK_RUST_LIB_PATH="${ZCASH_SRC_PATH}/zcashlc"
-
-
-function clean {
-    echo "CLEAN DETECTED"
-    cargo clean
-    if [ -d "${RUST_LIB_PATH}" ]; then 
-        rm -rf "${RUST_LIB_PATH}"
-    fi 
-    if [ -d "${ZCASH_LIB_RUST_BUILD_PATH}" ]; then 
-        rm -rf "${ZCASH_LIB_RUST_BUILD_PATH}"
-    fi 
-}

package/Scripts/travis/ZcashLightClientSample_setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -x
-
-APP_DIR=${TRAVIS_BUILD_DIR}/Example/ZcashLightClientSample
-cd ${APP_DIR}
-
-pod install

package/Scripts/travis/rust_setup.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -x
-
-rustup-init --verbose -y
-
-source $HOME/.cargo/env
-
-rustup target add aarch64-apple-ios x86_64-apple-ios
-rustup toolchain add nightly-2021-09-24
-rustup +nightly-2021-09-24 target add aarch64-apple-ios-sim x86_64-apple-ios
-
-cargo install cargo-lipo

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>