Merge pull request #100 from ezzygarmyz/patch-23

Patch 23

.gitignore

@@ -1,20 +1,15 @@
 *.tar.gz
 *.deb
 *.exe
-src/bitcoin
 src/bitcoinzd
 src/bitcoinz-cli
 src/bitcoinz-gtest
 src/bitcoinz-tx
-src/zcashd
-src/zcash-cli
-src/zcash-gtest
-src/zcash-tx
-src/test/test_bitcoin
+src/test/test_bitcoinz
 src/BitcoinZWallet.jar
 
-*zcashTest.pk
-*zcashTest.vk
+*.pk
+*.vk
 
 # autoreconf
 Makefile.in
@@ -36,6 +31,7 @@ build-aux/test-driver
 config.log
 config.status
 configure
+configure~
 libtool
 src/config/bitcoin-config.h
 src/config/bitcoin-config.h.in
@@ -57,7 +53,7 @@ src/univalue/gen
 *.pyc
 *.o
 *.o-*
-.zcash
+.bitcoinz
 *.a
 *.pb.cc
 *.pb.h
@@ -94,10 +90,11 @@ build
 *.gcno
 *.gcda
 /*.info
-test_bitcoin.coverage/
-zcash-gtest.coverage/
+test_bitcoinz.coverage/
+bitcoinz-gtest.coverage/
 total.coverage/
 coverage_percent.txt
+afl-temp
 
 #build tests
 linux-coverage-build
@@ -117,5 +114,11 @@ libzcashconsensus.pc
 contrib/debian/files
 contrib/debian/substvars
 
+src/fuzzing/*/output
+src/fuzz.cpp
+
 .idea/
 *.iml
+
+src/zcash/CreateJoinSplit
+src/zcash/GenerateParams

COPYING

@@ -1,7 +1,7 @@
+Copyright (c) 2018-2024 The BitcoinZ Community
 Copyright (c) 2016-2019 The Zcash developers
 Copyright (c) 2009-2019 The Bitcoin Core developers
 Copyright (c) 2009-2019 Bitcoin Developers
-Copyright (c) 2018-2020 The BitcoinZ Community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,18 +22,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-The MIT software license (http://www.opensource.org/licenses/mit-license.php)
-above applies to the code directly included in this source distribution.
-Dependencies downloaded as part of the build process may be covered by other
-open-source licenses. For further details see 'contrib/debian/copyright'.
+The MIT software license (https://www.opensource.org/licenses/mit-license.php)
+above applies to the code directly included in this source distribution, with
+the exception of certain Autoconf macros. Dependencies downloaded as part of
+the build process may be covered by other open-source licenses. The MIT-licensed
+source code is not considered a derived work of these Autoconf macros or of the
+dependencies. For further details see 'contrib/debian/copyright'.
 
 
 This product includes software developed by the OpenSSL Project for use in the
 OpenSSL Toolkit (https://www.openssl.org/). This product includes cryptographic
 software written by Eric Young ([email protected]).
 
 
-Although almost all of the Zcash code is licensed under "permissive" open source
+Although almost all of the BitcoinZ code is licensed under "permissive" open source
 licenses, users and distributors should note that when built using the default
-build options, Zcash depends on Oracle Berkeley DB 6.2.x, which is licensed
+build options, BitcoinZ depends on Oracle Berkeley DB 6.2.x, which is licensed
 under the GNU Affero General Public License.
+
+
+Contributors should understand licensing implications before modifying the
+following files in build-aux/m4 (see https://github.com/zcash/zcash/issues/2827):
+
+ * ax_check_compile_flag.m4
+ * ax_check_link_flag.m4
+ * ax_check_preproc_flag.m4
+ * ax_compiler_vendor.m4
+ * ax_gcc_archflag.m4
+ * ax_gcc_x86_cpuid.m4
+ * ax_openmp.m4
+ * ax_pthread.m4

Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2020 The BitcoinZ community
+# Copyright (c) 2017-2024 The BitcoinZ community
 # Copyright (c) 2016-2019 The Zcash developers
 # Copyright (c) 2013-2019 The Bitcoin Core developers
 # Copyright (c) 2013-2019 Bitcoin Developers
@@ -28,10 +28,10 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
 
 COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
-  leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
+  leveldb_baseline.info test_bitcoinz_filtered.info total_coverage.info \
   baseline_filtered.info \
-  leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
-  zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
+  leveldb_baseline_filtered.info test_bitcoinz_coverage.info test_bitcoinz.info \
+  bitcoinz-gtest.info bitcoinz-gtest_filtered.info bitcoinz-gtest_coverage.info
 
 dist-hook:
 	-$(MAKE) -C $(top_distdir)/src/leveldb clean
@@ -90,13 +90,13 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
 baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
 	$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@
 
-test_bitcoin.info: baseline_filtered_combined.info
-	$(MAKE) -C src/ bitcoin_test_check
-	$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
+test_bitcoinz.info: baseline_filtered_combined.info
+	$(MAKE) -C src/ bitcoinz_test_check
+	$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoinz -o $@
 	$(LCOV) -z -d $(abs_builddir)/src
 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
 
-test_bitcoin_filtered.info: test_bitcoin.info
+test_bitcoinz_filtered.info: test_bitcoinz.info
 	$(LCOV) -r $< "/usr/include/*" \
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
@@ -108,13 +108,13 @@ test_bitcoin_filtered.info: test_bitcoin.info
                       "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
-zcash-gtest.info: baseline_filtered_combined.info
-	$(MAKE) -C src/ zcash-gtest_check
-	$(LCOV) -c -d $(abs_builddir)/src -t zcash-gtest -o $@
+bitcoinz-gtest.info: baseline_filtered_combined.info
+	$(MAKE) -C src/ bitcoinz-gtest_check
+	$(LCOV) -c -d $(abs_builddir)/src -t bitcoinz-gtest -o $@
 	$(LCOV) -z -d $(abs_builddir)/src
 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
 
-zcash-gtest_filtered.info: zcash-gtest.info
+bitcoinz-gtest_filtered.info: bitcoinz-gtest.info
 	$(LCOV) -r $< "/usr/include/*" \
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
@@ -126,30 +126,30 @@ zcash-gtest_filtered.info: zcash-gtest.info
                       "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
-test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
+test_bitcoinz_coverage.info: baseline_filtered_combined.info test_bitcoinz_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoinz_filtered.info -o $@
 
-zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
+bitcoinz-gtest_coverage.info: baseline_filtered_combined.info bitcoinz-gtest_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a bitcoinz-gtest_filtered.info -o $@
 
-total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+total_coverage.info:  baseline_filtered_combined.info test_bitcoinz_filtered.info bitcoinz-gtest_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoinz_filtered.info -a bitcoinz-gtest_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
-test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
+test_bitcoinz.coverage/.dirstamp:  test_bitcoinz_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-zcash-gtest.coverage/.dirstamp:  zcash-gtest_coverage.info
+bitcoinz-gtest.coverage/.dirstamp:  bitcoinz-gtest_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-cov-zcash: zcash-gtest.coverage/.dirstamp
+cov-bitcoinz: bitcoinz-gtest.coverage/.dirstamp
 
 total.coverage/.dirstamp: total_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
+cov: test_bitcoinz.coverage/.dirstamp cov-bitcoinz total.coverage/.dirstamp
 
 endif
 
@@ -159,11 +159,12 @@ dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
 EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/bitcoinz $(DIST_DOCS) $(BIN_CHECKS)
 
 install-exec-hook:
-	mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/zcash-fetch-params
+	mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/bitcoinz-fetch-params
 
 .INTERMEDIATE: $(COVERAGE_INFO)
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-man
 
 clean-local:
-	rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/
+	rm -rf test_bitcoinz.coverage/ bitcoinz-gtest.coverage/ total.coverage/
+	rm -rf afl-temp

README.md

@@ -1,4 +1,4 @@
-# BitcoinZ 2.0.8
+# BitcoinZ 2.0.9-rc2
 **Keep running wallet to strengthen the BitcoinZ network. Backup your wallet in many locations & keep your coins wallet offline.**
 
 ### Ports:
@@ -15,7 +15,7 @@ Install required dependencies:
 ```{r, engine='bash'}
 sudo apt-get install \
       build-essential pkg-config libc6-dev m4 g++-multilib \
-      autoconf libtool ncurses-dev unzip git python \
+      autoconf libtool libncurses-dev unzip git python3 python-is-python3 \
       zlib1g-dev wget bsdmainutils automake
 ```
 
@@ -60,7 +60,7 @@ Install required dependencies:
 apt-get update \
 && apt-get install -y \
     curl build-essential pkg-config libc6-dev m4 g++-multilib autoconf \
-    libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils \
+    libtool libncurses-dev unzip git python3 python-is-python3 zlib1g-dev wget bsdmainutils \
     automake p7zip-full pwgen mingw-w64 cmake
 ```
 

autogen.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2017-2020 The BitcoinZ community
+# Copyright (c) 2017-2024 The BitcoinZ community
 # Copyright (c) 2016-2019 The Zcash developers
 # Copyright (c) 2013-2019 The Bitcoin Core developers
 # Copyright (c) 2013-2019 Bitcoin Developers

build-aux/m4/ax_boost_base.m4

@@ -10,7 +10,7 @@
 #
 #   Test for the Boost C++ libraries of a particular version (or newer)
 #
-#   If no path to the installed boost library is given the macro searchs
+#   If no path to the installed boost library is given the macro searches
 #   under /usr, /usr/local, /opt and /opt/local and evaluates the
 #   $BOOST_ROOT environment variable. Further documentation is available at
 #   <http://randspringer.de/boost/index.html>.
@@ -119,7 +119,7 @@ if test "x$want_boost" = "xyes"; then
     libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs"
 
     dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
+    dnl this location is chosen if boost libraries are installed with the --layout=system option
     dnl or if you install boost with RPM
     if test "$ac_boost_path" != ""; then
         BOOST_CPPFLAGS="-I$ac_boost_path/include"