initial ZEL changes including Acadia naming

.gitignore

@@ -65,47 +65,32 @@ src/univalue/gen
 *.json.h
 *.raw.h
 
-#libtool object files
+# Compiled Object files
+*.slo
 *.lo
-*.la
-
-# Compilation
-Makefile
-
-# Unit-tests
-Makefile.test
-src/test/buildenv.py
-
-# Resources cpp
-qrc_*.cpp
-
-# Mac specific
-.DS_Store
-build
-
-#lcov
-*.gcno
-*.gcda
-/*.info
-test_bitcoin.coverage/
-zcash-gtest.coverage/
-total.coverage/
-coverage_percent.txt
+*.o
+*.obj
 
-#build tests
-linux-coverage-build
-linux-build
-win32-build
-qa/pull-tester/run-bitcoind-for-test.sh
-qa/pull-tester/tests-config.sh
-qa/pull-tester/cache/*
-qa/pull-tester/test.*/*
+# Precompiled Headers
+*.gch
+*.pch
 
-!src/leveldb*/Makefile
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
 
-/doc/doxygen/
+# Fortran module files
+*.mod
+*.smod
 
-libzcashconsensus.pc
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
 
-contrib/debian/files
-contrib/debian/substvars
+# Executables
+*.exe
+*.out
+*.app

COPYING

@@ -1,3 +1,4 @@
+Copyright (c) 2017-2018 The Zelcash developers
 Copyright (c) 2016-2018 The Zcash developers
 Copyright (c) 2009-2018 The Bitcoin Core developers
 Copyright (c) 2009-2018 Bitcoin Developers
@@ -32,7 +33,7 @@ OpenSSL Toolkit (https://www.openssl.org/). This product includes cryptographic
 software written by Eric Young (eay@cryptsoft.com).
 
 
-Although almost all of the Zcash code is licensed under "permissive" open source
+Although almost all of the Zelcash 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, Zelcash depends on Oracle Berkeley DB 6.2.x, which is licensed
 under the GNU Affero General Public License.

INSTALL

@@ -1,5 +1,5 @@
-Building Zcash
+Building Zelcash
 
-See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zcashd,
+See the Zelcash github wiki (https://github.com/zelcash/zelcash/wiki) for instructions on building zelcashd,
 the intended-for-services, no-graphical-interface, reference
-implementation of Zcash.
+implementation of Zelcash.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile.am

@@ -9,11 +9,13 @@ GZIP_ENV="-9n"
 
 if BUILD_BITCOIN_LIBS
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libzcashconsensus.pc
+pkgconfig_DATA = libzelcashconsensus.pc
 endif
 
 BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
+BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
+
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
 
@@ -24,7 +26,7 @@ COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
   leveldb_baseline.info test_bitcoin_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
+  zelcash-gtest.info zelcash-gtest_filtered.info zelcash-gtest_coverage.info
 
 dist-hook:
 	-$(MAKE) -C $(top_distdir)/src/leveldb clean
@@ -101,13 +103,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 $@
+zelcash-gtest.info: baseline_filtered_combined.info
+	$(MAKE) -C src/ zelcash-gtest_check
+	$(LCOV) -c -d $(abs_builddir)/src -t zelcash-gtest -o $@
 	$(LCOV) -z -d $(abs_builddir)/src
 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
 
-zcash-gtest_filtered.info: zcash-gtest.info
+zelcash-gtest_filtered.info: zelcash-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/*" \
@@ -122,41 +124,41 @@ zcash-gtest_filtered.info: zcash-gtest.info
 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 $@
 
-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 $@
+zelcash-gtest_coverage.info: baseline_filtered_combined.info zelcash-gtest_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zelcash-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_bitcoin_filtered.info zelcash-gtest_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zelcash-gtest_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
 test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-zcash-gtest.coverage/.dirstamp:  zcash-gtest_coverage.info
+zelcash-gtest.coverage/.dirstamp:  zelcash-gtest_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-cov-zcash: zcash-gtest.coverage/.dirstamp
+cov-zelcash: zelcash-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_bitcoin.coverage/.dirstamp cov-zelcash total.coverage/.dirstamp
 
 endif
 
 dist_bin_SCRIPTS = zcutil/fetch-params.sh
 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/zcash $(DIST_DOCS) $(BIN_CHECKS)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zelcash $(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)/zelcash-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_bitcoin.coverage/ zelcash-gtest.coverage/ total.coverage/

README.md

@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 Zcash 2.0.2
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
+=======
+<<<<<<< HEAD
+Zcash 1.1.0
+=============
+>>>>>>> adfdef7... initial ZEL changes to Overwinter
 
 What is Zcash?
 --------------
@@ -62,3 +68,58 @@ License
 -------
 
 For license information see the file [COPYING](COPYING).
+=======
+# Zelcash
+INNOVATIVE  INTELLIGENT  INSPIRING
+
+
+Build (Ubuntu 16.04 Tested)
+```
+sudo apt-get update
+```
+```
+sudo apt-get install \
+      build-essential pkg-config libc6-dev m4 g++-multilib \
+      autoconf libtool ncurses-dev unzip git python python-zmq \
+      zlib1g-dev wget bsdmainutils automake curl
+```
+```
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+sudo apt-get update
+sudo apt-get install g++-4.9
+```
+```
+git clone https://github.com/zelcash/zelcash.git
+git clone https://gitlab.com/zcashcommunity/params.git
+```
+```
+cd zelcash
+chmod +x zcutil/build.sh depends/config.guess depends/config.sub autogen.sh share/genbuild.sh src/leveldb/build_detect_platform
+```
+```
+./zcutil/build.sh --disable-rust -j$(nproc)
+```
+```
+cd
+mkdir .zelcash
+mkdir .zelcash-params
+```
+```
+cd .zelcash-params
+cp /root/params/sprout-proving.key .
+cp /root/params/sprout-verifying.key .
+```
+```
+cd
+```
+```
+cd .zelcash
+echo "addnode=node.zel.cash" >~/.zelcash/zelcash.conf
+echo "rpcuser=username" >>~/.zelcash/zelcash.conf
+echo "rpcpassword=`head -c 32 /dev/urandom | base64`" >>~/.zelcash/zelcash.conf
+```
+```
+cd
+./zelcash/src/zelcashd
+```
+>>>>>>> 58446c9... sync init

code_of_conduct.md

@@ -43,13 +43,13 @@ is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an
 incident.
 
-You may send reports to [our Conduct email](mailto:conduct@z.cash).
+You may send reports to [our Conduct email](mailto:conduct@zel.cash).
 
 If you wish to contact specific maintainers directly, the following have made
 themselves available for conduct issues:
 
-- Daira Hopwood (daira at z.cash)
-- Sean Bowe (sean at z.cash)
+- Daira Hopwood (daira at zel.cash)
+- Sean Bowe (sean at zel.cash)
 
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],