-Bitcoin Core integration/staging tree
-=====================================
-
-[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)
-
-https://www.bitcoin.org
-
-Copyright (c) 2009-2014 Bitcoin Core Developers
-
-What is Bitcoin?
-----------------
-
-Bitcoin is an experimental new digital currency that enables instant payments to
-anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
-with no central authority: managing transactions and issuing money are carried
-out collectively by the network. Bitcoin Core is the name of open source
-software which enables the use of this currency.
-
-For more information, as well as an immediately useable, binary version of
-the Bitcoin Core software, see https://www.bitcoin.org/en/download.
+<<<<<<< HEAD
+
+Zcash
+=====
+
+https://z.cash/
+
+Where do I begin?
+-----------------
+
+We have a guide for joining the public testnet: https://github.com/zcash/zcash/wiki/Beta-Guide
+
+What is Zcash?
+--------------
+
+Zcash is an implementation of the "Zerocash" protocol. Based on Bitcoin's code, it intends to
+offer a far higher standard of privacy and anonymity through a sophisticiated zero-knowledge
+proving scheme which preserves confidentiality of transaction metadata.
+
+**Zcash is unfinished and highly experimental.** Use at your own risk.
+
+Participation in the Zcash project is subject to a [Code of Conduct](code_of_conduct.md).
+
+=======
+Zcash 1.0.0
+===========
+
+What is Zcash?
+--------------
+
+[Zcash](https://z.cash/) is an implementation of the "Zerocash" protocol.
+Based on Bitcoin's code, it intends to offer a far higher standard of privacy
+and anonymity through a sophisticated zero-knowledge proving scheme that
+preserves confidentiality of transaction metadata. Technical details are
+available in our [Protocol Specification](https://github.com/zcash/zips/raw/master/protocol/protocol.pdf).
+
+This software is the Zcash client. It downloads and stores the entire history
+of Zcash transactions; depending on the speed of your computer and network
+connection, the synchronization process could take a day or more once the
+block chain has reached a significant size.
+
+Security Warnings
+-----------------
+
+See important security warnings in
+[doc/security-warnings.md](doc/security-warnings.md).
License
-------
-
-Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
+
+Zcash is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see http://opensource.org/licenses/MIT.
+
+
+Komodo Specific Notes
+=====================
+
+Dependencies
+------------
+
+```
+#The following packages are needed:
+sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqt4-dev libqrencode-dev libdb++-dev ntp ntpdate
+```
+
+Komodo
+------
+
+```
+git clone https://github.com/jl777/komodo
+cd komodo
+./autogen.sh
+./configure --with-incompatible-bdb --with-gui
+# This command might finish with: configure: error: libgmp headers missing. This can be ignored. so can libsnark directory missing error
+./zcutil/fetch-params.sh
+
+# -j8 uses 8 threads - replace 8 with number of threads you want to use
+./zcutil/build.sh -j8
+#This can take some time.
+```
+
+# to update an existing version, git checkout dPoW if not on that branch already
+
+git pull
+
+./zcutil/fetch-params.sh
+
+./zcutil/build.sh -j8
+
+To reset the blockchain, from ~/.komodo rm -rf blocks chainstate debug.log komodostate db.log
+
+Create komodo.conf
+------------------
+
+```
+cd ~
+mkdir .komodo
+cd .komodo
+pico komodo.conf
+#Add the following lines to the komodo.conf file:
+
+rpcuser=bitcoinrpc
+rpcpassword=password
+txindex=1
+addnode=5.9.102.210
+addnode=78.47.196.146
+addnode=178.63.69.164
+addnode=88.198.65.74
+addnode=5.9.122.241
+addnode=144.76.94.38
+addnode=89.248.166.91
+```
+
+Start mining
+------------
+
+```
+#iguana documentation shows how to get the btcpubkey and wifstrs that need to be used
-Development process
--------------------
-
-Developers work in their own trees, then submit pull requests when they think
-their feature or bug fix is ready.
-
-If it is a simple/trivial/non-controversial change, then one of the Bitcoin
-development team members simply pulls it.
-
-If it is a *more complicated or potentially controversial* change, then the patch
-submitter will be asked to start a discussion (if they haven't already) on the
-[mailing list](http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development).
-
-The patch will be accepted if there is broad consensus that it is a good thing.
-Developers should expect to rework and resubmit patches if the code doesn't
-match the project's coding conventions (see [doc/coding.md](doc/coding.md)) or are
-controversial.
-
-The `master` branch is regularly built and tested, but is not guaranteed to be
-completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
-regularly to indicate new official, stable release versions of Bitcoin.
-
-Testing
--------
-
-Testing and code review is the bottleneck for development; we get more pull
-requests than we can review and test on short notice. Please be patient and help out by testing
-other people's pull requests, and remember this is a security-critical project where any mistake might cost people
-lots of money.
+#bitcoin also need to be installed with txindex=1 and with rpc enabled
-### Automated Testing
+cd ~
+cd komodo
-Developers are strongly encouraged to write unit tests for new code, and to
-submit new unit tests for old code. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: `make check`
-Every pull request is built for both Windows and Linux on a dedicated server,
-and unit and sanity tests are automatically run. The binaries produced may be
-used for manual QA testing — a link to them will appear in a comment on the
-pull request posted by [BitcoinPullTester](https://github.com/BitcoinPullTester). See https://github.com/TheBlueMatt/test-scripts
-for the build/test scripts.
+#This will return your pubkey eg. "0259e137e5594cf8287195d13aed816af75bd5c04ae673296b51f66e7e8346e8d8" for your address
+./src/komodo-cli validateaddress <yourwalletaddres>
-### Manual Quality Assurance (QA) Testing
+#This will give the privkey of your wallet address
+./src/komodo-cli dumpprivkey <yourwalletaddres>
-Large changes should have a test plan, and should be tested by somebody other
-than the developer who wrote the code.
-See https://github.com/bitcoin/QA/ for how to create a test plan.
+#This will import the privkey to be sure the mined coins are placed into your wallet address
+./src/komodo-cli importprivkey <yourwalletprivkey>
-Translations
-------------
+#To stop the daemon:
+./src/komodo-cli stop
-Changes to translations as well as new translations can be submitted to
-[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
+#This starts komodo notary - replace genproclimit with number of threads you want to use and add your pubkey
+./src/komodod -gen -genproclimit=2 -notary -pubkey="0259e137e5594cf8287195d13aed816af75bd5c04ae673296b51f66e7e8346e8d8" &
-Translations are periodically pulled from Transifex and merged into the git repository. See the
-[translation process](doc/translation_process.md) for details on how this works.
+#This will get the stats:
+./src/komodo-cli getinfo
-**Important**: We do not accept translation changes as GitHub pull requests because the next
-pull from Transifex would automatically overwrite them again.
+#To view the process:
+ps -ef | grep komodod
-Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators).
+#To stop the daemon:
+./src/komodo-cli stop
+
+#To view komodod output:
+tail -f ~/.komodo/debug.log
-Development tips and tricks
----------------------------
+#To view all command
+./src/komodo-cli help
+```
-**compiling for debugging**
+=======
-Run configure with the --enable-debug option, then make. Or run configure with
-CXXFLAGS="-g -ggdb -O0" or whatever debug flags you need.
+**Zcash is unfinished and highly experimental.** Use at your own risk.
-**debug.log**
+Where do I begin?
+-----------------
-If the code is behaving strangely, take a look in the debug.log file in the data directory;
-error and debugging message are written there.
+We have a guide for joining the public testnet:
+https://github.com/zcash/zcash/wiki/Beta-Guide
-The -debug=... command-line option controls debugging; running with just -debug will turn
-on all categories (and give you a very large debug.log file).
+### Need Help?
-The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt
-to see it.
+* See the documentation at the [Zcash Wiki](https://github.com/zcash/zcash/wiki)
+ for help and more information.
+* Ask for help on the [Zcash](https://forum.z.cash/) forum.
-**testnet and regtest modes**
+Participation in the Zcash project is subject to a
+[Code of Conduct](code_of_conduct.md).
-Run with the -testnet option to run with "play bitcoins" on the test network, if you
-are testing multi-machine code that needs to operate across the internet.
+Building
+--------
-If you are testing something that can run on one machine, run with the -regtest option.
-In regression test mode blocks can be created on-demand; see qa/rpc-tests/ for tests
-that run in -regest mode.
+Build Zcash along with most dependencies from source by running
+./zcutil/build.sh. Currently only Linux is supported.
-**DEBUG_LOCKORDER**
+License
+-------
-Bitcoin Core is a multithreaded application, and deadlocks or other multithreading bugs
-can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure
-CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of what locks
-are held, and adds warning to the debug.log file if inconsistencies are detected.
+For license information see the file [COPYING](COPYING).