Merge branch 'master' into dev

COPYING

@@ -1,4 +1,3 @@
-Copyright (c) 2016-2018 The Komodo developers
 Copyright (c) 2016-2017 The Zcash developers
 Copyright (c) 2009-2017 The Bitcoin Core developers
 Copyright (c) 2018 The VerusCoin developers

README-mac.md

@@ -1,4 +1,3 @@
-
 You will need Apple's Xcode (at least version 7, preferably 8.x) and the Xcode Command Line Tools:
 
 https://itunes.apple.com/us/app/xcode/id497799835?mt=12
@@ -13,44 +12,17 @@ Use the brewfile to install the necessary packages:
 brew bundle
 ```
 
-or 
-
-```shell
-brew tap discoteq/discoteq; brew install flock autoconf autogen automake gcc@6 binutils protobuf coreutils wget
-```
-
 Get all that installed, then run:
 
 ```shell
 git clone https://github.com/VerusCoin/VerusCoin.git
 cd VerusCoin
 ./zcutil/build-mac.sh
-./zcutil/fetch-params.sh
 ```
 
 To build a distributable version of VerusCoin then run the makeReleaseMac.sh script after building. This will fix the dependency references and move the komodod and komodo-cli binaries to the kmd/mac/verus-cli directory along with the 6 libraries required for it to work properly.
 
-When you are done building, you need to create `Komodo.conf` the Mac way. 
-
-```shell
-mkdir ~/Library/Application\ Support/Komodo
-touch ~/Library/Application\ Support/Komodo/Komodo.conf
-nano ~/Library/Application\ Support/Komodo/Komodo.conf
-```
-
-Add the following lines to the Komodo.conf file:
-
-```shell
-rpcuser=dontuseweakusernameoryougetrobbed
-rpcpassword=dontuseweakpasswordoryougetrobbed
-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
-```
+When you are done building, you need to do a few things in the [Configuration](https://github.com/zcash/zcash/wiki/1.0-User-Guide#configuration) section of the Zcash User Guide differently because we are on the Mac. All instances of `~/.zcash` need to be replaced by `~/Library/Application\ Support/Zcash` 
+The fetch-params.sh script, however, has already been altered to fetch the proving keys into the correct directory to conform to Mac specific naming conventions.
 
 Happy Building

README.md

@@ -21,7 +21,7 @@ The wallet downloads and stores the block chain or asset chain of the coin you s
 - Support: [https://support.komodoplatform.com/support/home](https://support.komodoplatform.com/support/home)
 - Knowledgebase & How-to: [https://komodoplatform.atlassian.net/wiki/spaces/KPSD/pages](https://komodoplatform.atlassian.net/wiki/spaces/KPSD/pages)
 - API references: [http://docs.supernet.org/](http://docs.supernet.org/) #Not up to date.
-- Whitepaper: [Komodo Whitepaper](https://komodoplatform.com/wp-content/uploads/2018/06/Komodo-Whitepaper-June-3.pdf)
+- Whitepaper: [Komodo Whitepaper](https://komodoplatform.com/wp-content/uploads/2018/03/2018-03-12-Komodo-White-Paper-Full.pdf)
 - Komodo Platform public material: [Komodo Platform public material](https://docs.google.com/document/d/1AbhWrtagu4vYdkl-vsWz-HSNyNvK-W-ZasHCqe7CZy0)
 
 ## List of Komodo Platform Technologies