Merge branch 'duke' into dev

Conflicts:
	src/chainparams.cpp
    src/primitives/block.h

depends/Makefile

@@ -146,6 +146,9 @@ install: check-packages $(host_prefix)/share/config.site
 
 download-one: check-sources $(all_sources)
 
+clean:
+	echo "Fake clean"
+
 download-osx:
 	@$(MAKE) -s HOST=x86_64-apple-darwin11 download-one
 download-linux:

depends/README.md

@@ -1,4 +1,4 @@
-### Usage
+### Hush Dependencies
 
 To build dependencies for the current arch+OS:
 
@@ -13,7 +13,7 @@ For example:
     make HOST=x86_64-w64-mingw32 -j4
 
 A prefix will be generated that's suitable for plugging into Bitcoin's
-configure. In the above example, a dir named x86_64-w64-mingw32 will be
+configure. In the above example, a dir named `x86_64-w64-mingw32` will be
 created. To use it for Bitcoin:
 
     ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32

depends/description.md

@@ -1,4 +1,9 @@
-This is a system of building and caching dependencies necessary for building Bitcoin. 
+# Hush Build System
+
+This build systems was originally inherited from Bitcoin and now has various
+customatizations inherited from Zcash and Komodo, with our own additional changes.
+
+This is a system of building and caching dependencies necessary for building Hush. 
 There are several features that make it different from most similar systems:
 
 ### It is designed to be builder and host agnostic
@@ -6,7 +11,7 @@ There are several features that make it different from most similar systems:
 In theory, binaries for any target OS/architecture can be created, from a
 builder running any OS/architecture. In practice, build-side tools must be
 specified when the defaults don't fit, and packages must be amended to work
-on new hosts. For now, a build architecture of x86_64 is assumed, either on
+on new hosts. For now, a build architecture of `x86_64` is assumed, either on
 Linux or OSX.
 
 ### No reliance on timestamps

depends/packages/libsodium.mk

@@ -1,11 +1,10 @@
 package=libsodium
-$(package)_version=1.0.15
-$(package)_download_path=https://github.com/jedisct1/libsodium/releases/download/1.0.15
+$(package)_version=1.0.18
+$(package)_download_path=https://github.com/MyHush/libsodium/releases/download/$($(package)_version)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
+$(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
 $(package)_dependencies=
 $(package)_config_opts=
-
 ifeq ($(build_os),darwin)
 define $(package)_set_vars
   $(package)_build_env=MACOSX_DEPLOYMENT_TARGET="10.11"

depends/packages/utfcpp.mk

@@ -1,5 +1,5 @@
 $(package)_version=3.1
-$(package)_download_path=https://github.com/nemtrif/$(package)/archive/
+$(package)_download_path=https://github.com/MyHush/$(package)/archive/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=v$($(package)_version).tar.gz
 $(package)_sha256_hash=ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096