resolved PR #13 merge conflicts

COPYING

@@ -1,4 +1,6 @@
-Copyright (c) 2016-2017 The Zcash developers
+Copyright (c) 2017 The Bitcoin Private developers
+Copyright (c) 2016-2017 The ZClassic developers
+Copyright (c) 2016-2017 The ZCash developers
 Copyright (c) 2009-2017 The Bitcoin Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

INSTALL

@@ -1,4 +1,4 @@
-Building Zcash
+Building Bitcoin Private
 
 See the Bitcoin Private github wiki (https://github.com/BTCPrivate/BitcoinPrivate/wiki) for instructions on building btcpd,
 the intended-for-services, no-graphical-interface, reference

README.md

@@ -59,7 +59,7 @@ brew install gcc5 --without-multilib
 Install
 ```{r, engine='bash'}
 # Build
-./btcputil/build-mac.sh -j$(nproc)
+./btcputil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
 # fetch key
 ./btcputil/fetch-params.sh
 # Run
@@ -120,7 +120,7 @@ Building
 --------
 
 Build Zcash along with most dependencies from source by running
-./btcputil/build.sh. Currently only Linux is officially supported.
+`./btcputil/build.sh`. Currently only Linux is officially supported.
 
 License
 -------

btcputil/fetch-params.sh

@@ -75,10 +75,11 @@ function main() {
     || exit_locked_error
 
     cat <<EOF
-Zcash - fetch-params.sh
+BTCPrivate - fetch-params.sh
 
-This script will fetch the Zcash zkSNARK parameters and verify their
-integrity with sha256sum.
+This script will fetch the BTCPrivate zkSNARK parameters and verify their
+integrity with sha256sum. These parameters are identical to those for
+both ZClassic and ZCash.
 
 If they already exist locally, it will exit now and do nothing else.
 EOF
@@ -89,7 +90,7 @@ EOF
         mkdir -p "$PARAMS_DIR"
         README_PATH="$PARAMS_DIR/README"
         cat >> "$README_PATH" <<EOF
-This directory stores common Zcash zkSNARK parameters. Note that it is
+This directory stores common BTCPrivate zkSNARK parameters. Note that it is
 distinct from the daemon's -datadir argument because the parameters are
 large and may be shared across multiple distinct -datadir's such as when
 setting up test networks.

configure.ac

@@ -8,7 +8,7 @@ define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLI
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2017)
-AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
+AC_INIT([BTCPrivate],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/btcprivate/bitcoinprivate/issues],[zcash])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

doc/authors.md

@@ -1,4 +1,4 @@
-Zcash Contributors
+BTCPrivate Contributors
 ==================
 
 Jack Grigg (428)

libzcashconsensus.pc.in

@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: Zcash consensus library
-Description: Library for the Zcash consensus protocol.
+Name: BTCPrivate consensus library
+Description: Library for the BTCPrivate consensus protocol.
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lzcashconsensus
 Cflags: -I${includedir}

zclassic.conf

@@ -0,0 +1,2 @@
+rpcuser=zclassicrpc 
+rpcpassword=218531267725253134861120826249243328285113422649527856318442522022330