Merge pull request #4 from jl777/jl777

merge latest jl777
2019-03-02 10:54:37 +01:00
parent 8edff10be2 72c2649727
commit 84b30e4698
801 changed files with 116441 additions and 15459 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.tar.gz
 *.deb
-*.exe
 src/bitcoin
 src/zcashd
 src/zcash-cli
@@ -8,15 +7,11 @@ src/zcash-gtest
 src/zcash-tx
 src/test/test_bitcoin

-# Zcash utilities
-src/zcash/GenerateParams
-src/zcash/CreateJoinSplit
-
 *zcashTest.pk
 *zcashTest.vk

 # autoreconf
-Makefile.in
+#Makefile.in
 aclocal.m4
 autom4te.cache/
 build-aux/config.guess
@@ -34,7 +29,7 @@ build-aux/compile
 build-aux/test-driver
 config.log
 config.status
-configure
+#configure
 libtool
 src/config/bitcoin-config.h
 src/config/bitcoin-config.h.in
@@ -47,6 +42,7 @@ src/univalue/gen

 .deps
 .dirstamp
+.idea
 .libs
 .*.swp
 *.*~*
@@ -121,3 +117,40 @@ src/komodod
 src/komodo-tx
 src/komodo-test
 src/wallet-utility
+src/komodo-cli.exe
+src/komodod.exe
+src/komodo-tx.exe
+
+#output during builds, symbol tables?
+*.dSYM
+
+
+src/cryptoconditions/compile
+
+src/cc/rogue/rogue
+
+src/cc/rogue/rogue.so
+
+src/cc/rogue/test.zip
+
+src/rogue.530623577502174316.0
+
+src/rogue.530623577502174316.pack
+
+src/rogue.530623577502174316.player
+
+src/checkfile
+
+src/log
+
+src/foo.zip
+
+src/cc/rogue/config.h
+
+src/cc/rogue/config.h
+
+src/ROGUE.conf
+
+src/rogue.scr
+
+src/cc/rogue/confdefs.h
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,164 @@
+stages:
+- build
+- test
+########################################################################################################################
+####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
+########################################################################################################################
+variables:
+  PACKAGE_DIR_LINUX: linux64
+  PACKAGE_DIR_WINDOWS: win64
+  PACKAGE_DIR_MACOS: macos
+  AGAMA_ARTIFACTS_LINUX: ${PACKAGE_DIR_LINUX}.tar.gz
+  AGAMA_ARTIFACTS_WINDOWS: ${PACKAGE_DIR_WINDOWS}.zip
+  AGAMA_ARTIFACTS_MACOS: ${PACKAGE_DIR_MACOS}.tar.gz
+  AGAMA_ARTIFACTS_LINUX_CHECKSUM: ${AGAMA_ARTIFACTS_LINUX}.md5
+  AGAMA_ARTIFACTS_WINDOWS_CHECKSUM: ${AGAMA_ARTIFACTS_WINDOWS}.md5
+  AGAMA_ARTIFACTS_MACOS_CHECKSUM: ${AGAMA_ARTIFACTS_MACOS}.md5
+  ARTIFACT_EXPIRATION: 1 week
+
+########################################################################################################################
+####END####                                        PROJECT LEVEL VARIABLES                                   ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####          Build Stage: compile and package komodo binaries for the Agama Wallet.             ####START#####
+########################################################################################################################
+########################################################################################################################
+####START####                                            LINUX                                             ####START####
+########################################################################################################################
+build:ubuntu:
+  stage: build
+  image: ca333/komodo-builders:komodo-ubuntu
+  variables:
+    DOCKER_DRIVER: overlay2
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}
+    paths:
+    - depends/
+  script:
+  - zcutil/build.sh -j$(nproc)
+  - mkdir ${PACKAGE_DIR_LINUX}
+  - cp src/komodod
+    src/komodo-cli
+    ${PACKAGE_DIR_LINUX}
+  - chmod +x ${PACKAGE_DIR_LINUX}/komodod
+  - chmod +x ${PACKAGE_DIR_LINUX}/komodo-cli
+  - tar -czvf ${AGAMA_ARTIFACTS_LINUX} ${PACKAGE_DIR_LINUX}
+  - md5sum ${AGAMA_ARTIFACTS_LINUX} > ${AGAMA_ARTIFACTS_LINUX_CHECKSUM}
+  artifacts:
+    paths:
+    - ${AGAMA_ARTIFACTS_LINUX}
+    - ${AGAMA_ARTIFACTS_LINUX_CHECKSUM}
+    expire_in: 1 week
+
+########################################################################################################################
+####END####                                              LINUX                                               ####END####
+########################################################################################################################
+####START####                                           WINDOWS                                            ####START####
+########################################################################################################################
+build:windows:
+  stage: build
+  image:  ca333/komodo-builders:komodo-windows
+  variables:
+    DOCKER_DRIVER: overlay2
+  cache:
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
+    paths:
+    - depends/built
+  script:
+  - zcutil/build-win.sh -j$(nproc)
+  - mkdir ${PACKAGE_DIR_WINDOWS}
+  - cp src/komodod.exe
+    src/komodo-cli.exe
+    src/komodo-tx.exe
+    ${PACKAGE_DIR_WINDOWS}
+  - zip -r ${PACKAGE_DIR_WINDOWS}.zip ${PACKAGE_DIR_WINDOWS}
+  - md5sum ${AGAMA_ARTIFACTS_WINDOWS} > ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM}
+  artifacts:
+    paths:
+    - ${AGAMA_ARTIFACTS_WINDOWS}
+    - ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM}
+    expire_in: 1 week
+########################################################################################################################
+####END####                                             WINDOWS                                              ####END####
+########################################################################################################################
+####START####                                            MACOS                                             ####START####
+########################################################################################################################
+build:macos:
+  stage: build
+  tags: ["High Sierra"]
+  cache:
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
+    paths:
+    - depends/built
+  script:
+  - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
+  - ./makeRelease.sh ${PACKAGE_DIR_MACOS}
+  - tar -czvf ${AGAMA_ARTIFACTS_MACOS} ${PACKAGE_DIR_MACOS}
+  - md5sum ${AGAMA_ARTIFACTS_MACOS} > ${AGAMA_ARTIFACTS_MACOS_CHECKSUM}
+  artifacts:
+    paths:
+    - ${AGAMA_ARTIFACTS_MACOS}
+    - ${AGAMA_ARTIFACTS_MACOS_CHECKSUM}
+    expire_in: 1 week
+########################################################################################################################
+####END####                                              MACOS                                               ####END####
+########################################################################################################################
+########################################################################################################################
+####END####                                           Build Stage                                            ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####     Test stage: Produce code quality  and static application security test reports.          ####START####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####                                        Code Quality                                          ####START####
+########################################################################################################################
+code_quality:
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+  - docker:stable-dind
+  script:
+  - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+  - docker run
+      --env SOURCE_CODE="$PWD"
+      --volume "$PWD":/code
+      --volume /var/run/docker.sock:/var/run/docker.sock
+      "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [gl-code-quality-report.json]
+########################################################################################################################
+####END####                                          Code Quality                                            ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                              Static Application Security Tests                               ####START####
+########################################################################################################################
+sast:
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+  - docker:stable-dind
+  script:
+  - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+  - docker run
+      --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+      --volume "$PWD:/code"
+      --volume /var/run/docker.sock:/var/run/docker.sock
+      "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    paths: [gl-sast-report.json]
+########################################################################################################################
+####END####                                Static Application Security Tests                                 ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####END####                                         Test stage                                               ####END####
+########################################################################################################################
+########################################################################################################################
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,22 +5,32 @@ matrix:
    - os: linux
      dist: xenial
      sudo: required
+      env: LINUX_DEPLOY="true" OSX_DEPLOY="false" $TRAVIS_OS_NAME="linux"
    - os: osx
-      osx_image: xcode8      
+      osx_image: xcode8
+      env: OSX_DEPLOY="true" LINUX_DEPLOY="false" $TRAVIS_OS_NAME="osx"
+branches:
+  only:
+    - master
+    - dev
+    - cctests
 compiler:
- gcc
+  - gcc
 before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libgnutls28-dev; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm '/usr/local/include/c++'; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc@6; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --overwrite gcc@6; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libgnutls28-dev; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm '/usr/local/include/c++'; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc@6; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --overwrite gcc@6; fi
 script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./zcutil/build.sh -j 5; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./zcutil/build-mac.sh -j 5; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./zcutil/build.sh -j 5; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar cvfz komodo_linux_$TRAVIS_BRANCH.tar.gz src/komodod src/komodo-cli; fi 
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./zcutil/build-mac.sh -j 5; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./makeRelease.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then tar cvfz komodo_osx_$TRAVIS_BRANCH.tar.gz src/komodod src/komodo-cli src/libgcc_s.1.dylib src/libgomp.1.dylib src/libstdc++.6.dylib; fi 
 notifications:
  irc:
    channels:
@@ -32,15 +42,50 @@ notifications:
    - 'Change view : %{compare_url}'
    - 'Build details : %{build_url}'
 before_deploy:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git tag "linux-$(date +'%Y%m%d%H%M')-$(git log --format=%h -1)"; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git tag "osx-$(date +'%Y%m%d%H%M')-$(git log --format=%h -1)"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git tag "$TRAVIS_BRANCH-linux-$(date +'%Y%m%d%H%M')-$(git log --format=%h -1)"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git tag "$TRAVIS_BRANCH-osx-$(date +'%Y%m%d%H%M')-$(git log --format=%h -1)"; fi
 deploy:
-  provider: releases
-  api_key:
-    secure: Jms7dz5GMZmuXUCHl5u6iZUtAybv86oW3x36DCJfdzbDiO4B9EWB04z7zA0qvoomefyujHTmQUHxyOKfd4h9/rVMFFv9hgmUxWkrcg7KyLNisOQRaovVOuNtu2lRNXTOSF16Cy+xFGkVh1ObBRhAoMsVKPhMl6PCDiKhNWIekRR9pBtjafKsClQ2ieknUYfqhuvgj7zmqCedeyVaVQyt2W/J65leD0BkfCUESTpANSprHs4bQB65VuQIKKMi+URKx2VgpDdUcWJySt9jAHVPIbI5cT5maAT6RUMnE4oha7Ca1Ox8StBqjQ/hkkMyDbN0keIlN7RjZlwdZQf/qUnT/dPQhsyUCdPXOxmEJ2jekezEK/LGr4Fb+v+vjd9dhLNkD5nVn9zp36biGSCjiMpffQ3fjMeM0YGmVEVRP9kZXLWVRYQoVKrzjyzg5dY8iChbiQEfYpTeBuU+e2rqj4mns+Jvy0zjUbMy6Tyva+iqdZ/PdsBDbiB7c+FIgB1IUTVOD+GgKx6dhCtBZEccn5EyWFwZF9IdQJHZCYV4PA7nuzfm1Ol9SDdZkGHd2OgRCqK/sTwyfTHv8exNqZ1k+epGJp2a0q4IOEknc9aPCAF+m9pHahk7s7VO5gmhO6pvbvuKoeEtEXRZHRzCkGkXfzJlBk+23X5gBexKb6inRdBlj6M=
-  file: 
-    - src/komodod
-    - src/komodo-cli
-  skip_cleanup: true
-  on:
-    repo: KomodoPlatform/komodo
+  - provider: releases
+    api_key:
+      secure: id69KBVsY0p41WFlqd5cGrAIksJAkUempmdrQwHtfqIbB6es7MVfXuxfmTxk7lZNEItSvLGilYtqhBMNVAVjRRPvk90hveGDMkbpjFz3XBbFEFqtrAr2GdIcpGtII2T3T/TG7j11TMtJ6GvBVt4OcatHFVsKBCFDIx0fB0fd1oLrEAwgRdBO2Jq7bMzoLdzGx3mVtdW5dSRBQzG/Z0yvx+R9mQHSvyPGh6oNPD6mvXPzEaCeRW6Y8g8y1SW/6zDJR6sSdOKA0jsHkr/hM8st3Qkr5Cu3roEbL8598uvfBahjxVHVT8+lu/nJnQyrvtWZKu/uUefybqgZl7UpGvZVFxbNwAB/ZNn0pBKIpZlX/kh6rdGF0XrAG7g+Ths6iklh7wDefYP2JeGwHWJ38YcdF8T/VcSdOXz7EiWwEeZO5sGcTRSl5Ql8mcU3YyyB7BTdViYNTHf5VFFJ/baLZG+shZ/0tb1Ntx5mLDbV8vcYXJpUNTJcXbhcUDSF3QuSz04ftkzgpcsODzcTzD6+2sezV1vlOAlxK04C+zzxG96Md/TegvZYYns78RSgrP/UH1qwEbgxTo3xpErGllzntzZfHJ887Goez+DeB9ga7pUBc5AXGpfRhYqJP66wR10zqfWuWYvjAwRBRNySjr3pUvaA3T1iSZ5HLrpKBfcHXJOTg8M=
+    name: komodo_linux-$TRAVIS_BRANCH
+    prerelease: true
+    file: komodo_linux_$TRAVIS_BRANCH.tar.gz
+    skip_cleanup: true
+    on:
+      repo: KomodoPlatform/komodo
+      branch: master
+      condition: $LINUX_DEPLOY = "true"
+  - provider: releases
+    api_key:
+      secure: id69KBVsY0p41WFlqd5cGrAIksJAkUempmdrQwHtfqIbB6es7MVfXuxfmTxk7lZNEItSvLGilYtqhBMNVAVjRRPvk90hveGDMkbpjFz3XBbFEFqtrAr2GdIcpGtII2T3T/TG7j11TMtJ6GvBVt4OcatHFVsKBCFDIx0fB0fd1oLrEAwgRdBO2Jq7bMzoLdzGx3mVtdW5dSRBQzG/Z0yvx+R9mQHSvyPGh6oNPD6mvXPzEaCeRW6Y8g8y1SW/6zDJR6sSdOKA0jsHkr/hM8st3Qkr5Cu3roEbL8598uvfBahjxVHVT8+lu/nJnQyrvtWZKu/uUefybqgZl7UpGvZVFxbNwAB/ZNn0pBKIpZlX/kh6rdGF0XrAG7g+Ths6iklh7wDefYP2JeGwHWJ38YcdF8T/VcSdOXz7EiWwEeZO5sGcTRSl5Ql8mcU3YyyB7BTdViYNTHf5VFFJ/baLZG+shZ/0tb1Ntx5mLDbV8vcYXJpUNTJcXbhcUDSF3QuSz04ftkzgpcsODzcTzD6+2sezV1vlOAlxK04C+zzxG96Md/TegvZYYns78RSgrP/UH1qwEbgxTo3xpErGllzntzZfHJ887Goez+DeB9ga7pUBc5AXGpfRhYqJP66wR10zqfWuWYvjAwRBRNySjr3pUvaA3T1iSZ5HLrpKBfcHXJOTg8M=
+    name: komodo_linux-$TRAVIS_BRANCH
+    prerelease: true
+    file: komodo_linux_$TRAVIS_BRANCH.tar.gz
+    skip_cleanup: true
+    on:
+      repo: KomodoPlatform/komodo
+      branch: dev
+      condition: $LINUX_DEPLOY = "true"
+  - provider: releases
+    api_key:
+      secure: id69KBVsY0p41WFlqd5cGrAIksJAkUempmdrQwHtfqIbB6es7MVfXuxfmTxk7lZNEItSvLGilYtqhBMNVAVjRRPvk90hveGDMkbpjFz3XBbFEFqtrAr2GdIcpGtII2T3T/TG7j11TMtJ6GvBVt4OcatHFVsKBCFDIx0fB0fd1oLrEAwgRdBO2Jq7bMzoLdzGx3mVtdW5dSRBQzG/Z0yvx+R9mQHSvyPGh6oNPD6mvXPzEaCeRW6Y8g8y1SW/6zDJR6sSdOKA0jsHkr/hM8st3Qkr5Cu3roEbL8598uvfBahjxVHVT8+lu/nJnQyrvtWZKu/uUefybqgZl7UpGvZVFxbNwAB/ZNn0pBKIpZlX/kh6rdGF0XrAG7g+Ths6iklh7wDefYP2JeGwHWJ38YcdF8T/VcSdOXz7EiWwEeZO5sGcTRSl5Ql8mcU3YyyB7BTdViYNTHf5VFFJ/baLZG+shZ/0tb1Ntx5mLDbV8vcYXJpUNTJcXbhcUDSF3QuSz04ftkzgpcsODzcTzD6+2sezV1vlOAlxK04C+zzxG96Md/TegvZYYns78RSgrP/UH1qwEbgxTo3xpErGllzntzZfHJ887Goez+DeB9ga7pUBc5AXGpfRhYqJP66wR10zqfWuWYvjAwRBRNySjr3pUvaA3T1iSZ5HLrpKBfcHXJOTg8M=
+    name: komodo_osx-$TRAVIS_BRANCH
+    prerelease: true
+    file: komodo_osx_$TRAVIS_BRANCH.tar.gz
+    skip_cleanup: true
+    on:
+      repo: KomodoPlatform/komodo
+      branch: master
+      condition: $OSX_DEPLOY = "true"
+  - provider: releases
+    api_key:
+      secure: id69KBVsY0p41WFlqd5cGrAIksJAkUempmdrQwHtfqIbB6es7MVfXuxfmTxk7lZNEItSvLGilYtqhBMNVAVjRRPvk90hveGDMkbpjFz3XBbFEFqtrAr2GdIcpGtII2T3T/TG7j11TMtJ6GvBVt4OcatHFVsKBCFDIx0fB0fd1oLrEAwgRdBO2Jq7bMzoLdzGx3mVtdW5dSRBQzG/Z0yvx+R9mQHSvyPGh6oNPD6mvXPzEaCeRW6Y8g8y1SW/6zDJR6sSdOKA0jsHkr/hM8st3Qkr5Cu3roEbL8598uvfBahjxVHVT8+lu/nJnQyrvtWZKu/uUefybqgZl7UpGvZVFxbNwAB/ZNn0pBKIpZlX/kh6rdGF0XrAG7g+Ths6iklh7wDefYP2JeGwHWJ38YcdF8T/VcSdOXz7EiWwEeZO5sGcTRSl5Ql8mcU3YyyB7BTdViYNTHf5VFFJ/baLZG+shZ/0tb1Ntx5mLDbV8vcYXJpUNTJcXbhcUDSF3QuSz04ftkzgpcsODzcTzD6+2sezV1vlOAlxK04C+zzxG96Md/TegvZYYns78RSgrP/UH1qwEbgxTo3xpErGllzntzZfHJ887Goez+DeB9ga7pUBc5AXGpfRhYqJP66wR10zqfWuWYvjAwRBRNySjr3pUvaA3T1iSZ5HLrpKBfcHXJOTg8M=
+    name: komodo_osx-$TRAVIS_BRANCH
+    prerelease: true
+    file: komodo_osx_$TRAVIS_BRANCH.tar.gz
+    skip_cleanup: true
+    on:
+      repo: KomodoPlatform/komodo
+      branch: dev
+      condition: $OSX_DEPLOY = "true"
--- a/AUTH_KEY.json.enc
+++ b/AUTH_KEY.json.enc
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+tap "discoteq/discoteq"
+tap "homebrew/bundle"
+tap "homebrew/cask"
+tap "homebrew/cask-versions"
+tap "homebrew/core"
+brew "autoconf"
+brew "autogen"
+brew "automake"
+brew "binutils"
+brew "cmake"
+brew "coreutils"
+brew "gcc@6"
+brew "leveldb"
+brew "nanomsg"
+brew "protobuf"
+brew "wget"
+brew "discoteq/discoteq/flock"
--- a/350
+++ b/350
@@ -1,6 +1,8 @@
-Copyright (c) 2016-2018 The Komodo developers
-Copyright (c) 2016-2017 The Zcash developers
 Copyright (c) 2009-2017 The Bitcoin Core developers
+Copyright (c) 2009-2018 Bitcoin Developers
+Copyright (c) 2016-2017 The Zcash developers
+Copyright (c) 2016-2019 The Komodo developers
+Copyright (c) 2018 The VerusCoin developers

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +34,349 @@ 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 Zcash/Komodo/VerusCoin 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
 under the GNU Affero General Public License.
+
+SuperNET COPYING terms:
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License.  (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer
+to distribute corresponding source code.  (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+<one line to give the program's name and a brief idea of what it does.>
+Copyright (C) <year>  <name of author>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+Gnomovision version 69, Copyright (C) year name of author
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+This is free software, and you are welcome to redistribute it
+under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+`Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+<signature of Ty Coon>, 1 April 1989
+Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,14 @@ pkgconfig_DATA = libzcashconsensus.pc
 endif


-BITCOIND_BIN=$(top_builddir)/src/zcashd$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/zcash-cli$(EXEEXT)
+BITCOIND_BIN=$(top_builddir)/src/komodod$(EXEEXT)
+BITCOIN_CLI_BIN=$(top_builddir)/src/komodo-cli$(EXEEXT)
 #WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

 if TARGET_DARWIN
-OSX_APP=Bitcoin-Qt.app
-OSX_DMG=Bitcoin-Core.dmg
+OSX_APP=Agama.app
+OSX_DMG=Agama.dmg
 OSX_BACKGROUND_IMAGE=background.tiff
 OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
--- a/README-mac.md
+++ b/README-mac.md
@@ -1,6 +1,5 @@
-## Install for Mac OS X

-First off you need Apple's Xcode (at least version 7, preferably 8.x or later) and the Xcode Command Line Tools:
+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

@@ -8,16 +7,10 @@ And Homebrew:

 http://brew.sh/

-And this is the list of brew packages you'll need installed:
+Use the brewfile to install the necessary packages:

 ```shell
-brew tap discoteq/discoteq; brew install flock
-brew install autoconf autogen automake
-brew install gcc@6
-brew install binutils
-brew install protobuf
-brew install coreutils
-brew install wget
+brew bundle
 ```

 or 
@@ -29,13 +22,13 @@ brew tap discoteq/discoteq; brew install flock autoconf autogen automake gcc@6 b
 Get all that installed, then run:

 ```shell
-git clone https://github.com/jl777/komodo.git
-cd komodo
+git clone https://github.com/VerusCoin/VerusCoin.git
+cd VerusCoin
 ./zcutil/build-mac.sh
 ./zcutil/fetch-params.sh
 ```

-To build a distributable version of komodo then run the makeDistrib.sh script after building.
+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. 

--- a/README.md
+++ b/README.md
@@ -23,23 +23,23 @@ This is the official Komodo sourcecode repository based on https://github.com/jl

 ## List of Komodo Platform Technologies

- Delayed Proof of Work (dPoW) - Additional security layer and Komodos own consensus algorithm.
- zk-SNARKs - Komodo Platform's privacy technology for shielded transactions
- Tokens/Assets Technology - create "colored coins" on the Komodo Platform and use them as a layer for securites
- Reward API - Komodo CC technology for securities
- CC - Crypto Conditions to realize "smart contract" logic on top of the Komodo Platform
- Jumblr - Decentralized tumbler for KMD and other cryptocurrencies
- Assetchains - Create your own Blockchain that inherits all Komodo Platform functionalities and blockchain interoperability
- Pegged Assets - Chains that maintain a peg to fiat currencies
- Peerchains - Scalability solution where sibling chains form a network of blockchains
- More in depth covered [here](https://docs.google.com/document/d/1AbhWrtagu4vYdkl-vsWz-HSNyNvK-W-ZasHCqe7CZy0)
- Also note you receive 5% APR on your holdings.
-[See this article for more details](https://komodoplatform.atlassian.net/wiki/spaces/KPSD/pages/20480015/Claim+KMD+Interest+in+Agama)
+- Delayed Proof of Work (dPoW) - Additional security layer and Komodos own consensus algorithm  
+- zk-SNARKs - Komodo Platform's privacy technology for shielded transactions  
+- Tokens/Assets Technology - create "colored coins" on the Komodo Platform and use them as a layer for securites  
+- Reward API - Komodo CC technology for securities  
+- CC - Crypto Conditions to realize "smart contract" logic on top of the Komodo Platform  
+- Jumblr - Decentralized tumbler for KMD and other cryptocurrencies  
+- Assetchains - Create your own Blockchain that inherits all Komodo Platform functionalities and blockchain interoperability  
+- Pegged Assets - Chains that maintain a peg to fiat currencies  
+- Peerchains - Scalability solution where sibling chains form a network of blockchains  
+- More in depth covered [here](https://docs.google.com/document/d/1AbhWrtagu4vYdkl-vsWz-HSNyNvK-W-ZasHCqe7CZy0)  
+- Also note you receive 5% Active User Reward on your balance.  
+[See this article for more details](https://support.komodoplatform.com/en/support/solutions/articles/29000024515-how-to-claim-the-kmd-active-user-reward-in-agama)

 ## Tech Specification
- Max Supply: 200 million KMD.
- Block Time: 1M 2s
- Block Reward: 3KMD
+- Max Supply: 200 million KMD
+- Block Time: 1m 2s
+- Block Reward: 3 KMD
 - Mining Algorithm: Equihash

 ## About this Project
@@ -51,7 +51,7 @@ Komodo is based on Zcash and has been extended by our innovative consensus algor

 ```shell
 #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 python-zmq zlib1g-dev wget libcurl4-openssl-dev bsdmainutils automake curl
+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 libcurl4-gnutls-dev bsdmainutils automake curl
 ```

 ### Build Komodo
@@ -72,8 +72,12 @@ cd komodo
 ```

 #### OSX
-Ensure you have [brew](https://brew.sh) and the command line tools installed (comes automatically with XCode) and run:
+Ensure you have [brew](https://brew.sh) and Command Line Tools installed.
 ```shell
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+# installs brew
+xcode-select --install 
+# opens a pop-up window to install CLT without installing the entire Xcode package
 brew update && brew install gcc@6
 git clone https://github.com/komodoplatform/komodo --branch master --single-branch
 cd komodo
@@ -86,7 +90,11 @@ cd komodo
 #### Windows
 Use a debian cross-compilation setup with mingw for windows and run:
 ```shell
-git clone https://github.com/komodoplatform/komodo --branch master --single-branch
+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 libcurl4-gnutls-dev bsdmainutils automake curl cmake mingw-w64
+curl https://sh.rustup.rs -sSf | sh
+source $HOME/.cargo/env
+rustup target add x86_64-pc-windows-gnu
+git clone https://github.com/jl777/komodo --branch master --single-branch
 cd komodo
 ./zcutil/fetch-params.sh
 # -j8 = using 8 threads for the compilation - replace 8 with number of threads you want to use
@@ -146,10 +154,10 @@ There is a small chance that an outbound transaction will give an error due to m

 **To change modes:**

-a) backup all privkeys (launch komodod with `-exportdir=<path>` and `dumpwallet`)
-b) start a totally new sync including `wallet.dat`, launch with same `exportdir`
-c) stop it before it gets too far and import all the privkeys from a) using `komodo-cli importwallet filename`
-d) resume sync till it gets to chaintip
+a) backup all privkeys (launch komodod with `-exportdir=<path>` and `dumpwallet`)  
+b) start a totally new sync including `wallet.dat`, launch with same `exportdir`  
+c) stop it before it gets too far and import all the privkeys from a) using `komodo-cli importwallet filename`  
+d) resume sync till it gets to chaintip  

 For example:
 ```shell
--- a/code_of_conduct.md
+++ b/code_of_conduct.md
@@ -24,7 +24,9 @@ Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
 that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+threatening, offensive, or harmful. Note that contributors may be volunteers
+who do not represent Zcash Company. They are free to express their own
+opinions so long as they adhere to these guidelines.

 By adopting this Code of Conduct, project maintainers commit themselves to
 fairly and consistently applying these principles to every aspect of managing
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,22 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 1)
+define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 15)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_BUILD, 26)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2017)
-AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
+define(_COPYRIGHT_YEAR, 2018)
+AC_INIT([Verus-CLI],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/VerusCoin/VerusCoin/issues],[verus-cli])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])

-BITCOIN_DAEMON_NAME=zcashd
-BITCOIN_CLI_NAME=zcash-cli
-BITCOIN_TX_NAME=zcash-tx
+BITCOIN_DAEMON_NAME=komodod
+BITCOIN_CLI_NAME=komodo-cli
+BITCOIN_TX_NAME=komodo-tx

 dnl Unless the user specified ARFLAGS, force it to be cr
 AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
@@ -96,12 +96,6 @@ AC_ARG_ENABLE([mining],
  [enable_mining=$enableval],
  [enable_mining=yes])

-AC_ARG_ENABLE([rust],
-  [AS_HELP_STRING([--enable-rust],
-  [enable rust (default is yes)])],
-  [enable_rust=$enableval],
-  [enable_rust=yes])
-
 AC_ARG_ENABLE([proton],
  [AS_HELP_STRING([--disable-proton],
  [disable Proton (AMQP messaging)])],
@@ -232,15 +226,15 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"

 AC_ARG_WITH([utils],
  [AS_HELP_STRING([--with-utils],
-  [build zcash-cli zcash-tx wallet-utility (default=yes)])],
+  [build komodo-cli komodo-tx wallet-utility (default=yes)])],
  [build_bitcoin_utils=$withval],
  [build_bitcoin_utils=yes])

 AC_ARG_WITH([libs],
  [AS_HELP_STRING([--with-libs],
-  [build libraries (default=yes)])],
+  [build libraries (default=no)])],
  [build_bitcoin_libs=$withval],
-  [build_bitcoin_libs=yes])
+  [build_bitcoin_libs=no])

 AC_ARG_WITH([daemon],
  [AS_HELP_STRING([--with-daemon],
@@ -772,15 +766,20 @@ fi
 #AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing))
 #AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx])

-RUST_LIBS=""
-if test x$enable_rust != xno; then
-  RUST_LIBS="-lrustzcash"
-fi
+RUST_LIBS="-lrustzcash"
+case $host in
+  *mingw*)
+    ;;
+  *)
+    RUST_LIBS="$RUST_LIBS -ldl"
+    ;;
+esac

 dnl Check for OpenMP support
 AX_OPENMP(
  [AC_DEFINE(HAVE_OPENMP, 1, [Define if OpenMP is enabled])
   AM_CONDITIONAL([HAVE_OPENMP], [true])
+   CPPFLAGS="$CPPFLAGS -DMULTICORE"
   CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"],
  [AC_MSG_WARN([OpenMP not supported, disabling multithreading])
   AC_DEFINE(HAVE_OPENMP, 0, [Define if OpenMP is enabled])
@@ -799,13 +798,13 @@ AX_CHECK_COMPILE_FLAG([-fwrapv],[CXXFLAGS="$CXXFLAGS -fwrapv"])
 AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],[CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"])
 AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -Wno-builtin-declaration-mismatch"],,[[$CXXFLAG_WERROR]])

-LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system -lcrypto -lsodium $RUST_LIBS"
+LIBZCASH_LIBS="-lgmp -lgmpxx $BOOST_SYSTEM_LIB -lcrypto -lsodium $RUST_LIBS"

 AC_MSG_CHECKING([whether to build bitcoind])
 AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
 AC_MSG_RESULT($build_bitcoind)

-AC_MSG_CHECKING([whether to build utils (zcash-cli zcash-tx wallet-utility)])
+AC_MSG_CHECKING([whether to build utils (komodo-cli komodo-tx wallet-utility)])
 AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
 AC_MSG_RESULT($build_bitcoin_utils)

@@ -859,16 +858,6 @@ else
  AC_MSG_RESULT(no)
 fi

-dnl enable rust
-AC_MSG_CHECKING([if rust should be enabled])
-if test x$enable_rust != xno; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(ENABLE_RUST, 1, [Define to 1 to enable Rust language dependent functions])
-
-else
-  AC_MSG_RESULT(no)
-fi
-
 AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"])

 AM_CONDITIONAL([ENABLE_PROTON], [test "x$use_proton" = "xyes"])
@@ -895,10 +884,10 @@ fi

 AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
 AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
+AM_CONDITIONAL([TARGET_LINUX], [test x$TARGET_OS = xlinux])
 AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
 AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
 AM_CONDITIONAL([ENABLE_MINING],[test x$enable_mining = xyes])
-AM_CONDITIONAL([ENABLE_RUST],[test x$enable_rust = xyes])
 AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
 AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
 AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
@@ -991,7 +980,6 @@ esac
 echo 
 echo "Options used to compile and link:"
 echo "  with wallet   = $enable_wallet"
-echo "  with rust     = $enable_rust"
 echo "  with proton   = $use_proton"
 echo "  with zmq      = $use_zmq"
 echo "  with test     = $use_tests"
--- a/contrib/ci-workers/README.md
+++ b/contrib/ci-workers/README.md
@@ -5,29 +5,29 @@ installation for use as a Buildbot worker in Zcash's CI.

 # Criteria for Adding Workers

-a. Don't add workers until users complain about a problem on a platform
-   that doesn't yet have workers or if we anticipate many users will use
-   a platform, we may pre-emptively add an unsupported worker for it.
+a. Don't add workers until users complain about a problem on a platform that
+   doesn't yet have workers. However, if we anticipate many users will use a
+   platform, we may pre-emptively add an unsupported worker for it.

 b. Prioritize the platforms that seem to have the most users.

-c. When adding workers start by adding workers for the "most common"
-   variant of any distro, then if users later encounter problems with a
-   sub-variant, we can consider adding new workers at that point.
-   Example: add Ubuntu Desktop before Xubuntu, on the assumption the
-   former has a larger population base.
+c. When adding workers, start by adding workers for the "most common" variant of
+   any distro. Then if users later encounter problems with a sub-variant, we can
+   consider adding new workers at that point. Example: add Ubuntu Desktop before
+   Xubuntu, on the assumption the former has a larger population base, and the
+   latter only materially differs in the GUI.

 # Setting up a latent worker on Amazon EC2

- Add a regular (non-latent) worker to the master.cfg for dev-ci.z.cash, and
-  deploy the changes.
+1. Add a regular (non-latent) worker to the master.cfg for dev-ci.z.cash, and
+   deploy the changes.
  - This enables the Ansible playbook to run to completion, ending in the worker
    connecting to the master.

- Start a basic EC2 instance using the template AMI for the target OS.
+2. Start a basic EC2 instance using the template AMI for the target OS.
  - Choose the smallest instance size, it won't be used for building Zcash.

- Figure out which user to log into the instance with.
+3. Figure out which user to log into the instance with.
  - E.g. for the Ubuntu template, use "ubuntu" instead of "root"
  - If you get an Ansible error later with a message like "Failed to connect to
    the host via ssh: Received message too long 1349281121\r\n", that means the
@@ -35,28 +35,28 @@ c. When adding workers start by adding workers for the "most common"
    Ansible protocol is balking. Try manually logging in with the same
    credentials to diagnose.

- Create `inventory/hosts` containing the following:
+4. Create `inventory/hosts` containing the following:

    [zcash-ci-worker-unix]
    some-name ansible_host=<INSTANCE_IP> ansible_ssh_user=<USERNAME>

- Run `ansible-playbook -e buildbot_worker_host_template=templates/host.ec2.j2 -i inventory/hosts unix.yml`,
-  passing in the worker's Buildbot name and password.
+5. Run `ansible-playbook -e buildbot_worker_host_template=templates/host.ec2.j2 -i inventory/hosts unix.yml`,
+   passing in the worker's Buildbot name and password.
  - After a successful run, the worker should be connected to dev-ci.z.cash and
    visible in its worker list.

- Create an AMI from the instance. This is the worker AMI to put into the
-  master.cfg for dev-ci.z.cash.
+6. Create an AMI from the instance. This is the worker AMI to put into the
+   master.cfg for dev-ci.z.cash.
  - 16 GB of storage should be sufficient.

- SSH into the instance, and edit the worker config to connect to ci.z.cash.
+7. SSH into the instance, and edit the worker config to connect to ci.z.cash.

- Create an AMI from the instance. This is the worker AMI to put into the
-  master.cfg for ci.z.cash.
+8. Create an AMI from the instance. This is the worker AMI to put into the
+   master.cfg for ci.z.cash.
  - 16 GB of storage should be sufficient.

- Delete the instance (it is no longer needed).
+9. Delete the instance (it is no longer needed).

- Edit the master.cfg to turn the new worker into a latent (using the new AMI
-  IDs), add it to the appropriate worker groups, set up new builders etc.
+10. Edit the master.cfg to turn the new worker into a latent (using the new AMI
+    IDs), add it to the appropriate worker groups, set up new builders etc.
  - Deploy this via the normal PR review process.
--- a/contrib/ci-workers/files/bashrc
+++ b/contrib/ci-workers/files/bashrc
@@ -0,0 +1,2 @@
+export PATH=$HOME/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export EDITOR=vim
--- a/contrib/ci-workers/tasks/install-brew.yml
+++ b/contrib/ci-workers/tasks/install-brew.yml
@@ -0,0 +1,10 @@
+---
+- name: Check if brew is installed
+  stat:
+    path: /usr/local/bin/brew
+  register: brew_check
+
+- name: Fail if brew is unavailable
+  fail:
+    msg: 'brew is not installed! Please install Homebrew: https://docs.brew.sh/Installation.html'
+  when: not brew_check.stat.exists
--- a/contrib/ci-workers/templates/buildbot-worker.plist.j2
+++ b/contrib/ci-workers/templates/buildbot-worker.plist.j2
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>net.buildbot.worker</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>{{ buildbot_worker_dir }}/venv/bin/buildbot-worker</string>
+		<string>start</string>
+		<string>{{ buildbot_worker_name }}</string>
+	</array>
+	<key>WorkingDirectory</key>
+	<string>{{ buildbot_worker_dir }}</string>
+	<key>UserName</key>
+	<string>{{ buildbot_worker_user }}</string>
+	<key>KeepAlive</key>
+	<dict>
+		<key>NetworkState</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
--- a/contrib/ci-workers/templates/buildbot-worker.service.j2
+++ b/contrib/ci-workers/templates/buildbot-worker.service.j2
@@ -5,11 +5,11 @@ After=network.target

 [Service]
 Type=forking
-PIDFile=/home/{{ buildbot_worker_user }}/{{ buildbot_worker_name }}/twistd.pid
-WorkingDirectory=/home/{{ buildbot_worker_user }}
-ExecStart={{ pip_bin_dir }}/buildbot-worker start {{ buildbot_worker_name }}
-ExecReload={{ pip_bin_dir }}/buildbot-worker restart {{ buildbot_worker_name }}
-ExecStop={{ pip_bin_dir }}/buildbot-worker stop {{ buildbot_worker_name }}
+PIDFile={{ buildbot_worker_dir }}/{{ buildbot_worker_name }}/twistd.pid
+WorkingDirectory={{ buildbot_worker_dir }}
+ExecStart={{ buildbot_worker_dir }}/venv/bin/buildbot-worker start {{ buildbot_worker_name }}
+ExecReload={{ buildbot_worker_dir }}/venv/bin/buildbot-worker restart {{ buildbot_worker_name }}
+ExecStop={{ buildbot_worker_dir }}/venv/bin/buildbot-worker stop {{ buildbot_worker_name }}
 Restart=always
 User={{ buildbot_worker_user }}

--- a/contrib/ci-workers/templates/host.j2
+++ b/contrib/ci-workers/templates/host.j2
@@ -1,3 +1,3 @@
 OS: {{ ansible_distribution }} {{ ansible_distribution_version }}
 Memory: {{ ansible_memtotal_mb }} MB
-CPU: {{ ansible_processor[1] }}
+CPU: {{ ansible_processor if ansible_processor is string else ansible_processor[1] }} ({{ ansible_processor_cores }} cores)
--- a/contrib/ci-workers/unix.yml
+++ b/contrib/ci-workers/unix.yml
@@ -50,6 +50,7 @@

    - name: Gathering Facts
      setup:
+      tags: deps

    - name: Fail if Python is the wrong version
      fail:
@@ -66,34 +67,44 @@
            - "vars/{{ ansible_distribution }}.yml"
            - "vars/{{ ansible_os_family }}.yml"
          skip: true
+      tags: deps

    - name: Collate dependencies
      set_fact:
        package_deps: "{{ buildbot_deps + fetch_deps + conf_deps + build_deps + link_deps + dist_deps }}"
        python_modules: "{{ buildbot_modules + rpc_test_modules }}"
+      tags: deps
+
+    - name: Install Homebrew [MacOSX]
+      include: tasks/install-brew.yml
+      when: ansible_distribution == 'MacOSX'
+      tags: deps

    - name: Update rolling release [Arch Linux]
      pacman:
        update_cache: yes
        upgrade: yes
      when: ansible_distribution == 'Archlinux'
+      tags: deps

    - name: Install required packages
      package:
        name: "{{ item }}"
        state: present
      with_items: "{{ package_deps }}"
+      become_user: "{{ ansible_ssh_user if ansible_distribution == 'MacOSX' else 'root' }}"
+      tags: deps

-    - name: Install pip [CentOS]
+    - name: Install pip [CentOS, MacOSX]
      include: tasks/install-pip.yml
-      when: ansible_distribution == 'CentOS'
+      when: ansible_distribution in ['CentOS', 'MacOSX']

-    - name: Install required Python modules
+    - name: Install required Python system modules
      pip:
        name: "{{ item }}"
        state: latest
-      with_items: "{{ python_modules }}"
-      notify: restart buildbot-worker
+        executable: "{{ '/usr/local/bin/pip' if ansible_distribution == 'MacOSX' else omit }}"
+      with_items: "{{ system_modules }}"

    - name: Set up the Buildbot worker user
      user:
@@ -102,9 +113,28 @@
        shell: /bin/bash
        state: present

+    - name: Get absolute path to Buildbot worker home directory
+      command: echo ~
+      register: homedir
+      become_user: "{{ buildbot_worker_user }}"
+
+    - name: Save absolute path to Buildbot worker home directory
+      set_fact:
+        buildbot_worker_dir: "{{ homedir.stdout }}"
+
+    - name: Install required Python modules
+      pip:
+        name: "{{ item }}"
+        state: latest
+        virtualenv: "~{{ buildbot_worker_user }}/venv"
+        virtualenv_command: "{{ '/usr/local/bin/virtualenv' if ansible_distribution == 'MacOSX' else omit }}"
+      with_items: "{{ python_modules }}"
+      become_user: "{{ buildbot_worker_user }}"
+      notify: restart buildbot-worker
+
    - name: Create Buildbot worker
      command: >
-        buildbot-worker create-worker ~/{{ buildbot_worker_name }}
+        ~{{ buildbot_worker_user }}/venv/bin/buildbot-worker create-worker ~/{{ buildbot_worker_name }}
        {{ buildbot_master_host }}:{{ buildbot_master_port }}
        {{ buildbot_worker_name|quote }} {{ buildbot_worker_password|quote }}
      args:
@@ -116,7 +146,7 @@
        content: "{{ buildbot_worker_admin }}"
        dest: "~{{ buildbot_worker_user }}/{{ buildbot_worker_name }}/info/admin"
        owner: "{{ buildbot_worker_user }}"
-        group: "{{ buildbot_worker_user }}"
+        group: "{{ omit if ansible_distribution == 'MacOSX' else buildbot_worker_user }}"
        mode: "0644"

    - name: Set host details for Buildbot worker
@@ -124,7 +154,15 @@
        src: "{{ buildbot_worker_host_template }}"
        dest: "~{{ buildbot_worker_user }}/{{ buildbot_worker_name }}/info/host"
        owner: "{{ buildbot_worker_user }}"
-        group: "{{ buildbot_worker_user }}"
+        group: "{{ omit if ansible_distribution == 'MacOSX' else buildbot_worker_user }}"
+        mode: "0644"
+
+    - name: Install custom bashrc for virtualenv
+      copy:
+        src: bashrc
+        dest: "~{{ buildbot_worker_user }}/.bashrc"
+        owner: "{{ buildbot_worker_user }}"
+        group: "{{ omit if ansible_distribution == 'MacOSX' else buildbot_worker_user }}"
        mode: "0644"

    - name: Copy Buildbot worker systemd service unit
@@ -134,13 +172,32 @@
        owner: root
        group: root
        mode: "0644"
+      when: ansible_distribution != 'MacOSX'
      notify: reload systemd

-    - name: Start Buildbot worker.
+    - name: Copy Buildbot worker launchd service unit
+      template:
+        src: templates/buildbot-worker.plist.j2
+        dest: "/Library/LaunchDaemons/net.buildbot.worker.plist"
+        owner: root
+        group: wheel
+        mode: "0644"
+      when: ansible_distribution == 'MacOSX'
+
+    - name: Start Buildbot worker
      service:
        name: buildbot-worker
        state: started
        enabled: yes
+      when: ansible_distribution != 'MacOSX'
+
+    - name: Load Buildbot worker service [MacOSX]
+      command: launchctl load /Library/LaunchDaemons/net.buildbot.worker.plist
+      when: ansible_distribution == 'MacOSX'
+
+    - name: Start Buildbot worker [MacOSX]
+      command: launchctl start net.buildbot.worker
+      when: ansible_distribution == 'MacOSX'

  handlers:
    - name: restart buildbot-worker
--- a/contrib/ci-workers/vars/Archlinux.yml
+++ b/contrib/ci-workers/vars/Archlinux.yml
@@ -2,6 +2,6 @@
 buildbot_deps:
  - python2-pip
 build_deps:
+  - cmake
  - multilib/gcc
  - make
-pip_bin_dir: /usr/bin
--- a/contrib/ci-workers/vars/CentOS.yml
+++ b/contrib/ci-workers/vars/CentOS.yml
@@ -2,6 +2,7 @@
 buildbot_deps: [] # Empty to remove python-pip
 build_deps:
  - bzip2
+  - cmake
  - gcc
  - gcc-c++
  - make
@@ -10,4 +11,3 @@ dist_deps:
  - pkgconfig # Required until b556beda264308e040f8d88aca4f2f386a0183d9 is pulled in
  - python-devel
  - redhat-rpm-config
-pip_bin_dir: /usr/bin
--- a/contrib/ci-workers/vars/Debian.yml
+++ b/contrib/ci-workers/vars/Debian.yml
@@ -1,6 +1,6 @@
 ---
 build_deps:
  - build-essential # Depends on g++, libc6-dev, make
+  - cmake
 dist_deps:
-  - pkg-config # Required until b556beda264308e040f8d88aca4f2f386a0183d9 is pulled in
  - python-dev
--- a/contrib/ci-workers/vars/Fedora.yml
+++ b/contrib/ci-workers/vars/Fedora.yml
@@ -1,5 +1,6 @@
 ---
 build_deps:
+  - cmake
  - gcc
  - gcc-c++
  - make
--- a/contrib/ci-workers/vars/FreeBSD.yml
+++ b/contrib/ci-workers/vars/FreeBSD.yml
@@ -2,6 +2,7 @@
 buildbot_deps:
  - py27-pip
 build_deps:
+  - cmake
  - gcc
  - gmake
 dist_deps:
--- a/contrib/ci-workers/vars/MacOSX.yml
+++ b/contrib/ci-workers/vars/MacOSX.yml
@@ -0,0 +1,6 @@
+---
+buildbot_deps:
+  - coreutils # For gnproc etc.
+# Most are already installed
+build_deps:
+  - cmake
--- a/contrib/ci-workers/vars/Ubuntu.yml
+++ b/contrib/ci-workers/vars/Ubuntu.yml
@@ -1,5 +1,4 @@
 ---
 build_deps:
  - build-essential # Depends on g++, libc6-dev, make
-dist_deps:
-  - pkg-config # Required until b556beda264308e040f8d88aca4f2f386a0183d9 is pulled in
+  - cmake
--- a/contrib/ci-workers/vars/default.yml
+++ b/contrib/ci-workers/vars/default.yml
@@ -7,6 +7,7 @@ buildbot_deps:

 # Dependencies required to download files
 fetch_deps:
+  - curl # For depends/
  - git
  - wget # For zcutil/fetch-params.sh

@@ -15,9 +16,11 @@ conf_deps:
  - autoconf
  - automake
  - m4
+  - pkg-config

 # Dependencies required to compile Zcash
 build_deps:
+  - cmake
  - g++
  - gcc
  - make
@@ -34,6 +37,10 @@ grind_deps:
  - lcov
  - valgrind

+# Python modules required on the system
+system_modules:
+  - virtualenv
+
 # Python modules required for a Zcash Buildbot worker
 buildbot_modules:
  - pip # Needs to be updated first so Buildbot installs
@@ -44,6 +51,3 @@ buildbot_modules:
 rpc_test_modules:
  - pyblake2
  - pyzmq
-
-# Environment variables
-pip_bin_dir: /usr/local/bin
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,69 @@
+zcash (2.0.1) stable; urgency=medium
+
+  * 2.0.1 release.
+
+ -- Zcash Company <team@z.cash>  Sun, 14 Oct 2018 13:40:30 -0700
+
+zcash (2.0.1~rc1) stable; urgency=medium
+
+  * 2.0.1-rc1 release.
+
+ -- Zcash Company <team@z.cash>  Mon, 08 Oct 2018 12:40:54 -0700
+
+zcash (2.0.0) stable; urgency=medium
+
+  * 2.0.0 release.
+
+ -- Zcash Company <team@z.cash>  Wed, 15 Aug 2018 17:57:50 -0700
+
+zcash (2.0.0~rc1) stable; urgency=medium
+
+  * 2.0.0-rc1 release.
+
+ -- Zcash Company <team@z.cash>  Thu, 09 Aug 2018 16:56:56 +0000
+
+zcash (1.1.2) stable; urgency=medium
+
+  * 1.1.2 release.
+
+ -- Zcash Company <team@z.cash>  Sun, 01 Jul 2018 20:12:33 -0700
+
+zcash (1.1.2~rc1) stable; urgency=medium
+
+  * 1.1.2-rc1 release.
+
+ -- Zcash Company <team@z.cash>  Fri, 22 Jun 2018 17:03:41 -0700
+
+zcash (1.1.1) stable; urgency=medium
+
+  * 1.1.1 release.
+
+ -- Zcash Company <team@z.cash>  Fri, 25 May 2018 15:49:34 +1200
+
+zcash (1.1.1~rc2) stable; urgency=medium
+
+  * 1.1.1-rc2 release.
+
+ -- Zcash Company <team@z.cash>  Wed, 23 May 2018 09:28:50 -0700
+
+zcash (1.1.1~rc1) stable; urgency=medium
+
+  * 1.1.1-rc1 release.
+
+ -- Zcash Company <team@z.cash>  Sat, 19 May 2018 10:16:14 +1200
+
+zcash (1.1.0) stable; urgency=medium
+
+  * 1.1.0 release.
+
+ -- Zcash Company <team@z.cash>  Wed, 11 Apr 2018 20:15:29 -0600
+
+zcash (1.1.0~rc1) stable; urgency=medium
+
+  * 1.1.0-rc1 release.
+
+ -- Zcash Company <team@z.cash>  Thu, 05 Apr 2018 03:26:17 +0100
+
 zcash (1.0.15) stable; urgency=medium

  * 1.0.15 release.
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -1,21 +1,22 @@
-Source: zcash
+Source: VerusCoin
 Section: utils
 Priority: optional
-Maintainer: Zcash Company <team@z.cash>
-Homepage: https://z.cash
+Maintainer: VerusCoin <team@z.cash>
+Homepage: https://veruscoin.io
 Build-Depends: autoconf, automake, bsdmainutils, build-essential,
 git, g++-multilib, libc6-dev, libtool,
 m4, ncurses-dev, pkg-config, python,
 unzip, wget, zlib1g-dev
-Vcs-Git: https://github.com/zcash/zcash.git
-Vcs-Browser: https://github.com/zcash/zcash
+Vcs-Git: https://github.com/VeruscCoin/VerusCoin.git
+Vcs-Browser: https://github.com/VerusCoin/VerusCoin

-Package: zcash
+Package: Verus-CLI
 Architecture: amd64
 Depends: ${shlibs:Depends}
-Description: HTTPS for money.
- 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.
- This package provides the daemon, zcashd, and the CLI tool,
- zcash-cli, to interact with the daemon.
+Description: VerusCoin is a new, mineable and stakeable cryptocurrency.
+It is a live fork of Komodo that retains its Zcash lineage and improves it.
+VerusCoin will leverage the Komodo platform and dPoW notarization for enhanced security and cross-chain interoperability.
+We have added a variation of a zawy12, lwma difficulty algorithm, a new CPU-optimized hash algorithm and a new algorithm for fair proof of stake.
+We describe these changes and vision going forward in a [our Phase I white paper](http://185.25.51.16/papers/VerusPhaseI.pdf) and
+[our Vision](http://185.25.51.16/papers/VerusVision.pdf).
+
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -4,8 +4,9 @@ Upstream-Contact: Zcash Company <team@z.cash>
 Source: https://github.com/zcash/zcash

 Files: *
-Copyright: 2016-2017, The Zcash developers
- 2009-2017, Bitcoin Core developers
+Copyright: 2016-2018, The Zcash developers
+ 2009-2018, Bitcoin Core developers
+ 2009-2018, Bitcoin Developers
 License: Expat
 Comment: The Bitcoin Core developers encompasses the current developers listed on bitcoin.org,
 as well as the numerous contributors to the project.
--- a/contrib/debian/zcash.install
+++ b/contrib/debian/zcash.install
@@ -1,3 +1,3 @@
-usr/bin/zcashd
-usr/bin/zcash-cli
+usr/bin/komodod
+usr/bin/komodo-cli
 usr/bin/zcash-fetch-params
--- a/contrib/devtools/fix-copyright-headers.py
+++ b/contrib/devtools/fix-copyright-headers.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import print_function
+
 '''
 Run this script inside of src/ and it will look for all the files
 that were changed this year that still have the last year in the
@@ -46,7 +48,7 @@ for extension in extensions:
      filePath = os.getcwd() + filePath
      modifiedTime = getLastGitModifiedDate(filePath)
      if len(modifiedTime) > 0 and str(year) in modifiedTime:
-        print n,"Last Git Modified: ", modifiedTime, " - ", filePath
+        print(n, "Last Git Modified: ", modifiedTime, " - ", filePath)
        os.popen(command % (last_year,year,filePath))
        n = n + 1

--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 '''
 Perform basic ELF security checks on a series of executables.
 Exit status will be 0 if successful, and the program will be silent.
@@ -6,6 +6,7 @@ Otherwise the exit status will be 1 and it will log which executables failed whi
 Needs `readelf` (for ELF) and `objdump` (for PE).
 '''
 from __future__ import division,print_function,unicode_literals
+import struct
 import subprocess
 import sys
 import os
@@ -171,6 +172,8 @@ CHECKS = {
    ('DYNAMIC_BASE', check_PE_DYNAMIC_BASE),
    ('HIGH_ENTROPY_VA', check_PE_HIGH_ENTROPY_VA),
    ('NX', check_PE_NX)
+],
+'MachO64': [
 ]
 }

@@ -181,6 +184,8 @@ def identify_executable(executable):
        return 'PE'
    elif magic.startswith(b'\x7fELF'):
        return 'ELF'
+    elif struct.unpack('I', magic)[0] == 0xFEEDFACF:
+        return 'MachO64'
    return None

 if __name__ == '__main__':
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 '''
 Test script for security-check.py
 '''
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-1.0.15"
+name: "zcash-2.0.1"
 enable_cache: true
 distro: "debian"
 suites:
@@ -124,7 +124,8 @@ script: |
    find . -name "lib*.a" -delete
    rm -rf ${DISTNAME}/lib/pkgconfig
    find ${DISTNAME}/bin -type f -executable -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
-    find ${DISTNAME}/lib -type f -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
+    # Commented out while we don't build any libraries
+    #find ${DISTNAME}/lib -type f -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
    find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
    find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
    cd ../../
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -150,7 +150,8 @@ script: |
    find . -name "lib*.a" -delete
    rm -rf ${DISTNAME}/lib/pkgconfig
    find ${DISTNAME}/bin -type f -executable -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
-    find ${DISTNAME}/lib -type f -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
+    # Commented out while we don't build any libraries
+    #find ${DISTNAME}/lib -type f -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
    find ${DISTNAME} -not -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
    find ${DISTNAME} -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}-debug.zip
    cd ../../
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # linearize-data.py: Construct a linear, no-fork version of the chain.
 #
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # linearize-hashes.py:  List blocks in a linear, no-fork version of the chain.
 #
--- a/contrib/seeds/generate-seeds.py
+++ b/contrib/seeds/generate-seeds.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright (c) 2014 Wladmir J. van der Laan
+#!/usr/bin/env python
+# Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
--- a/contrib/seeds/nodes_main.txt
+++ b/contrib/seeds/nodes_main.txt
@@ -1,879 +1,6 @@
-1.34.168.128:8333
-1.202.128.218:8333
-2.30.0.210:8333
-5.9.96.203:8333
-5.45.71.130:8333
-5.45.98.141:8333
-5.102.145.68:8333
-5.135.160.77:8333
-5.189.134.246:8333
-5.199.164.132:8333
-5.249.135.102:8333
-8.19.44.110:8333
-8.22.230.8:8333
-14.200.200.145:8333
-18.228.0.188:8333
-18.228.0.200:8333
-23.24.168.97:8333
-23.28.35.227:8333
-23.92.76.170:8333
-23.99.64.119:8333
-23.228.166.128:8333
-23.229.45.32:8333
-24.8.105.128:8333
-24.16.69.137:8333
-24.94.98.96:8333
-24.102.118.7:8333
-24.118.166.228:8333
-24.122.133.49:8333
-24.166.97.162:8333
-24.213.235.242:8333
-24.226.107.64:8333
-24.228.192.171:8333
-27.140.133.18:8333
-31.41.40.25:8333
-31.43.101.59:8333
-31.184.195.181:8333
-31.193.139.66:8333
-37.200.70.102:8333
-37.205.10.151:8333
-42.3.106.227:8333
-42.60.133.106:8333
-45.56.85.231:8333
-45.56.102.228:8333
-45.79.130.235:8333
-46.28.204.61:11101
-46.38.235.229:8333
-46.59.2.74:8333
-46.101.132.37:8333
-46.101.168.50:8333
-46.163.76.230:8333
-46.166.161.103:8333
-46.182.132.100:8333
-46.223.36.94:8333
-46.227.66.132:8333
-46.227.66.138:8333
-46.239.107.74:8333
-46.249.39.100:8333
-46.250.98.108:8333
-50.7.37.114:8333
-50.81.53.151:8333
-50.115.43.253:8333
-50.116.20.87:8333
-50.116.33.92:8333
-50.125.167.245:8333
-50.143.9.51:8333
-50.188.192.133:8333
-54.77.162.76:8333
-54.153.97.109:8333
-54.165.192.125:8333
-58.96.105.85:8333
-59.167.196.135:8333
-60.29.227.163:8333
-61.35.225.19:8333
-62.43.130.178:8333
-62.109.49.26:8333
-62.202.0.97:8333
-62.210.66.227:8333
-62.210.192.169:8333
-64.74.98.205:8333
-64.156.193.100:8333
-64.203.102.86:8333
-64.229.142.48:8333
-65.96.193.165:8333
-66.30.3.7:8333
-66.114.33.49:8333
-66.118.133.194:8333
-66.135.10.126:8333
-66.172.10.4:8333
-66.194.38.250:8333
-66.194.38.253:8333
-66.215.192.104:8333
-67.60.98.115:8333
-67.164.35.36:8333
-67.191.162.244:8333
-67.207.195.77:8333
-67.219.233.140:8333
-67.221.193.55:8333
-67.228.162.228:8333
-68.50.67.199:8333
-68.62.3.203:8333
-68.65.205.226:9000
-68.106.42.191:8333
-68.150.181.198:8333
-68.196.196.106:8333
-68.224.194.81:8333
-69.46.5.194:8333
-69.50.171.238:8333
-69.64.43.152:8333
-69.65.41.13:8333
-69.90.132.200:8333
-69.143.1.243:8333
-69.146.98.216:8333
-69.165.246.38:8333
-69.207.6.135:8333
-69.251.208.26:8333
-70.38.1.101:8333
-70.38.9.66:8333
-70.90.2.18:8333
-71.58.228.226:8333
-71.199.11.189:8333
-71.199.193.202:8333
-71.205.232.181:8333
-71.236.200.162:8333
-72.24.73.186:8333
-72.52.130.110:8333
-72.53.111.37:8333
-72.235.38.70:8333
-73.31.171.149:8333
-73.32.137.72:8333
-73.137.133.238:8333
-73.181.192.103:8333
-73.190.2.60:8333
-73.195.192.137:8333
-73.222.35.117:8333
-74.57.199.180:8333
-74.82.233.205:8333
-74.85.66.82:8333
-74.101.224.127:8333
-74.113.69.16:8333
-74.122.235.68:8333
-74.193.68.141:8333
-74.208.164.219:8333
-75.100.37.122:8333
-75.145.149.169:8333
-75.168.34.20:8333
-76.20.44.240:8333
-76.100.70.17:8333
-76.168.3.239:8333
-76.186.140.103:8333
-77.92.68.221:8333
-77.109.101.142:8333
-77.110.11.86:8333
-77.242.108.18:8333
-78.46.96.150:9020
-78.84.100.95:8333
-79.132.230.144:8333
-79.133.43.63:8333
-79.160.76.153:8333
-79.169.34.24:8333
-79.188.7.78:8333
-80.217.226.25:8333
-80.223.100.179:8333
-80.240.129.221:8333
-81.1.173.243:8333
-81.7.11.50:8333
-81.7.16.17:8333
-81.66.111.3:8333
-81.80.9.71:8333
-81.140.43.138:8333
-81.171.34.37:8333
-81.174.247.50:8333
-81.181.155.53:8333
-81.184.5.253:8333
-81.187.69.130:8333
-81.230.3.84:8333
-82.42.128.51:8333
-82.74.226.21:8333
-82.142.75.50:8333
-82.199.102.10:8333
-82.200.205.30:8333
-82.221.108.21:8333
-82.221.128.35:8333
-82.238.124.41:8333
-82.242.0.245:8333
-83.76.123.110:8333
-83.150.9.196:8333
-83.162.196.192:8333
-83.162.234.224:8333
-83.170.104.91:8333
-83.255.66.118:8334
-84.2.34.104:8333
-84.45.98.91:8333
-84.47.161.150:8333
-84.212.192.131:8333
-84.215.169.101:8333
-84.238.140.176:8333
-84.245.71.31:8333
-85.17.4.212:8333
-85.114.128.134:8333
-85.159.237.191:8333
-85.166.130.189:8333
-85.199.4.228:8333
-85.214.66.168:8333
-85.214.195.210:8333
-85.229.0.73:8333
-86.21.96.45:8333
-87.48.42.199:8333
-87.81.143.82:8333
-87.81.251.72:8333
-87.104.24.185:8333
-87.104.168.104:8333
-87.117.234.71:8333
-87.118.96.197:8333
-87.145.12.57:8333
-87.159.170.190:8333
-88.150.168.160:8333
-88.208.0.79:8333
-88.208.0.149:8333
-88.214.194.226:8343
-89.1.11.32:8333
-89.36.235.108:8333
-89.67.96.2:15321
-89.98.16.41:8333
-89.108.72.195:8333
-89.156.35.157:8333
-89.163.227.28:8333
-89.212.33.237:8333
-89.212.160.165:8333
-89.231.96.83:8333
-89.248.164.64:8333
-90.149.193.199:8333
-91.77.239.245:8333
-91.106.194.97:8333
-91.126.77.77:8333
-91.134.38.195:8333
-91.156.97.181:8333
-91.207.68.144:8333
-91.209.77.101:8333
-91.214.200.205:8333
-91.220.131.242:8333
-91.220.163.18:8333
-91.233.23.35:8333
-92.13.96.93:8333
-92.14.74.114:8333
-92.27.7.209:8333
-92.221.228.13:8333
-92.255.207.73:8333
-93.72.167.148:8333
-93.74.163.234:8333
-93.123.174.66:8333
-93.152.166.29:8333
-93.181.45.188:8333
-94.19.12.244:8333
-94.190.227.112:8333
-94.198.135.29:8333
-94.224.162.65:8333
-94.226.107.86:8333
-94.242.198.161:8333
-95.31.10.209:8333
-95.65.72.244:8333
-95.84.162.95:8333
-95.90.139.46:8333
-95.183.49.27:8005
-95.215.47.133:8333
-96.23.67.85:8333
-96.44.166.190:8333
-97.93.225.74:8333
-98.26.0.34:8333
-98.27.225.102:8333
-98.229.117.229:8333
-98.249.68.125:8333
-98.255.5.155:8333
-99.101.240.114:8333
-101.100.174.138:8333
-101.251.203.6:8333
-103.3.60.61:8333
-103.30.42.189:8333
-103.224.165.48:8333
-104.36.83.233:8333
-104.37.129.22:8333
-104.54.192.251:8333
-104.128.228.252:8333
-104.128.230.185:8334
-104.130.161.47:8333
-104.131.33.60:8333
-104.143.0.156:8333
-104.156.111.72:8333
-104.167.111.84:8333
-104.193.40.248:8333
-104.197.7.174:8333
-104.197.8.250:8333
-104.223.1.133:8333
-104.236.97.140:8333
-104.238.128.214:8333
-104.238.130.182:8333
-106.38.234.84:8333
-106.185.36.204:8333
-107.6.4.145:8333
-107.150.2.6:8333
-107.150.40.234:8333
-107.155.108.130:8333
-107.161.182.115:8333
-107.170.66.231:8333
-107.190.128.226:8333
-107.191.106.115:8333
-108.16.2.61:8333
-109.70.4.168:8333
-109.162.35.196:8333
-109.163.235.239:8333
-109.190.196.220:8333
-109.191.39.60:8333
-109.234.106.191:8333
-109.238.81.82:8333
-114.76.147.27:8333
-115.28.224.127:8333
-115.68.110.82:18333
-118.97.79.218:8333
-118.189.207.197:8333
-119.228.96.233:8333
-120.147.178.81:8333
-121.41.123.5:8333
-121.67.5.230:8333
-122.107.143.110:8333
-123.2.170.98:8333
-123.110.65.94:8333
-123.193.139.19:8333
-125.239.160.41:8333
-128.101.162.193:8333
-128.111.73.10:8333
-128.140.229.73:8333
-128.175.195.31:8333
-128.199.107.63:8333
-128.199.192.153:8333
-128.253.3.193:20020
-129.123.7.7:8333
-130.89.160.234:8333
-131.72.139.164:8333
-131.191.112.98:8333
-133.1.134.162:8333
-134.19.132.53:8333
-137.226.34.42:8333
-141.41.2.172:8333
-141.255.128.204:8333
-142.217.12.106:8333
-143.215.129.126:8333
-146.0.32.101:8337
-147.229.13.199:8333
-149.210.133.244:8333
-149.210.162.187:8333
-150.101.163.241:8333
-151.236.11.189:8333
-153.121.66.211:8333
-154.20.2.139:8333
-159.253.23.132:8333
-162.209.106.123:8333
-162.210.198.184:8333
-162.218.65.121:8333
-162.222.161.49:8333
-162.243.132.6:8333
-162.243.132.58:8333
-162.248.99.164:53011
-162.248.102.117:8333
-163.158.35.110:8333
-164.15.10.189:8333
-164.40.134.171:8333
-166.230.71.67:8333
-167.160.161.199:8333
-168.103.195.250:8333
-168.144.27.112:8333
-168.158.129.29:8333
-170.75.162.86:8333
-172.90.99.174:8333
-172.245.5.156:8333
-173.23.166.47:8333
-173.32.11.194:8333
-173.34.203.76:8333
-173.171.1.52:8333
-173.175.136.13:8333
-173.230.228.139:8333
-173.247.193.70:8333
-174.49.132.28:8333
-174.52.202.72:8333
-174.53.76.87:8333
-174.109.33.28:8333
-176.28.12.169:8333
-176.35.182.214:8333
-176.36.33.113:8333
-176.36.33.121:8333
-176.58.96.173:8333
-176.121.76.84:8333
-178.62.70.16:8333
-178.62.111.26:8333
-178.76.169.59:8333
-178.79.131.32:8333
-178.162.199.216:8333
-178.175.134.35:8333
-178.248.111.4:8333
-178.254.1.170:8333
-178.254.34.161:8333
-179.43.143.120:8333
-179.208.156.198:8333
-180.200.128.58:8333
-183.78.169.108:8333
-183.96.96.152:8333
-184.68.2.46:8333
-184.73.160.160:8333
-184.94.227.58:8333
-184.152.68.163:8333
-185.7.35.114:8333
-185.28.76.179:8333
-185.31.160.202:8333
-185.45.192.129:8333
-185.66.140.15:8333
-186.2.167.23:8333
-186.220.101.142:8333
-188.26.5.33:8333
-188.75.136.146:8333
-188.120.194.140:8333
-188.121.5.150:8333
-188.138.0.114:8333
-188.138.33.239:8333
-188.166.0.82:8333
-188.182.108.129:8333
-188.191.97.208:8333
-188.226.198.102:8001
-190.10.9.217:8333
-190.75.143.144:8333
-190.139.102.146:8333
-191.237.64.28:8333
-192.3.131.61:8333
-192.99.225.3:8333
-192.110.160.122:8333
-192.146.137.1:8333
-192.183.198.204:8333
-192.203.228.71:8333
-193.0.109.3:8333
-193.12.238.204:8333
-193.91.200.85:8333
-193.234.225.156:8333
-194.6.233.38:8333
-194.63.143.136:8333
-194.126.100.246:8333
-195.134.99.195:8333
-195.159.111.98:8333
-195.159.226.139:8333
-195.197.175.190:8333
-198.48.199.108:8333
-198.57.208.134:8333
-198.57.210.27:8333
-198.62.109.223:8333
-198.167.140.8:8333
-198.167.140.18:8333
-199.91.173.234:8333
-199.127.226.245:8333
-199.180.134.116:8333
-200.7.96.99:8333
-201.160.106.86:8333
-202.55.87.45:8333
-202.60.68.242:8333
-202.60.69.232:8333
-202.124.109.103:8333
-203.30.197.77:8333
-203.88.160.43:8333
-203.151.140.14:8333
-203.219.14.204:8333
-205.147.40.62:8333
-207.235.39.214:8333
-207.244.73.8:8333
-208.12.64.225:8333
-208.76.200.200:8333
-209.40.96.121:8333
-209.126.107.176:8333
-209.141.40.149:8333
-209.190.75.59:8333
-209.208.111.142:8333
-210.54.34.164:8333
-211.72.66.229:8333
-212.51.144.42:8333
-212.112.33.157:8333
-212.116.72.63:8333
-212.126.14.122:8333
-213.66.205.194:8333
-213.111.196.21:8333
-213.122.107.102:8333
-213.136.75.175:8333
-213.155.7.24:8333
-213.163.64.31:8333
-213.163.64.208:8333
-213.165.86.136:8333
-213.184.8.22:8333
-216.15.78.182:8333
-216.55.143.154:8333
-216.115.235.32:8333
-216.126.226.166:8333
-216.145.67.87:8333
-216.169.141.169:8333
-216.249.92.230:8333
-216.250.138.230:8333
-217.20.171.43:8333
-217.23.2.71:8333
-217.23.2.242:8333
-217.25.9.76:8333
-217.40.226.169:8333
-217.123.98.9:8333
-217.155.36.62:8333
-217.172.32.18:20993
-218.61.196.202:8333
-218.231.205.41:8333
-220.233.77.200:8333
-223.18.226.85:8333
-223.197.203.82:8333
-223.255.166.142:8333
-[2001:1291:2bf:1::100]:8333
-[2001:1418:100:5c2::2]:8333
-[2001:16d8:dd24:0:86c9:681e:f931:256]:8333
-[2001:19f0:1624:e6::579d:9428]:8333
-[2001:19f0:300:1340:225:90ff:fec9:2b6d]:8333
-[2001:19f0:4009:1405::64]:8333
-[2001:1b40:5000:2e::3fb0:6571]:8333
-[2001:410:a000:4050:8463:90b0:fffb:4e58]:8333
-[2001:410:a002:cafe:8463:90b0:fffb:4e58]:8333
-[2001:41d0:1:541e::1]:8333
-[2001:41d0:1:6a34::3]:8333
-[2001:41d0:1:6cd3::]:8333
-[2001:41d0:1:8b26::1]:8333
-[2001:41d0:1:a33d::1]:8333
-[2001:41d0:1:b855::1]:8333
-[2001:41d0:1:c139::1]:8333
-[2001:41d0:1:c8d7::1]:8333
-[2001:41d0:1:dd3f::1]:8333
-[2001:41d0:1:e29d::1]:8333
-[2001:41d0:1:f59f::33]:8333
-[2001:41d0:1:f7cc::1]:8333
-[2001:41d0:1:ff87::1]:8333
-[2001:41d0:2:2f05::1]:8333
-[2001:41d0:2:37c3::]:8200
-[2001:41d0:2:3e13::1]:8333
-[2001:41d0:2:8619::]:8333
-[2001:41d0:2:9c94::1]:8333
-[2001:41d0:2:a24f::]:8333
-[2001:41d0:2:adbf::]:8333
-[2001:41d0:2:b721::1]:8333
-[2001:41d0:2:ee52::1]:8333
-[2001:41d0:2:f1a5::]:8333
-[2001:41d0:2:fa54::1]:8333
-[2001:41d0:51:1::2036]:8333
-[2001:41d0:52:a00::1a1]:8333
-[2001:41d0:52:cff::6f5]:8333
-[2001:41d0:52:d00::2c0]:8333
-[2001:41d0:52:d00::cf2]:8333
-[2001:41d0:8:1087::1]:8333
-[2001:41d0:8:4a3c::b7c]:8333
-[2001:41d0:8:6728::]:8333
-[2001:41d0:8:b779::1]:8333
-[2001:41d0:8:c30f::1]:8333
-[2001:41d0:8:d2b2::1]:8333
-[2001:41d0:8:d5c3::1]:8333
-[2001:41d0:8:eb8b::]:8333
-[2001:41d0:a:16d0::1]:8333
-[2001:41d0:a:2b18::1]:8333
-[2001:41d0:a:3a9c::1]:8333
-[2001:41d0:a:4903::]:8333
-[2001:41d0:a:57b::1]:8333
-[2001:41d0:a:5c7a::]:8333
-[2001:41d0:a:6c29::1]:8333
-[2001:41d0:a:f482::1]:8333
-[2001:41d0:b:854:b7c:b7c:b7c:b7c]:8333
-[2001:41d0:d:111c::]:8333
-[2001:44b8:4116:7801:4216:7eff:fe78:3fe4]:8333
-[2001:470:1f08:837::2]:8333
-[2001:470:1f08:c33::2]:8333
-[2001:470:1f09:bca:218:7dff:fe10:be33]:8333
-[2001:470:1f0f:22d::212:26]:8333
-[2001:470:1f11:12d5::ae1:5611]:8333
-[2001:470:1f14:57a::2]:8333
-[2001:470:1f14:7d::2]:8333
-[2001:470:1f15:57c::1]:8333
-[2001:470:1f15:dda:3d9a:3f11:9a56:ed64]:8333
-[2001:470:25:482::2]:8333
-[2001:470:25:e4::2]:8333
-[2001:470:4:26b::2]:8333
-[2001:470:5f:5f::232]:8333
-[2001:470:66:119::2]:8333
-[2001:470:67:39d::71]:8333
-[2001:470:6c4f::cafe]:8333
-[2001:470:8:2e1::43]:8333
-[2001:470:90a7:96::afe:6021]:8333
-[2001:470:95c1::2]:8333
-[2001:470:b1d0:ffff::1000]:8333
-[2001:470:c1f2:3::201]:8333
-[2001:470:d00d:0:3664:a9ff:fe9a:5150]:8333
-[2001:470:e250:0:211:11ff:feb9:924c]:8333
-[2001:4800:7817:101:be76:4eff:fe04:dc52]:8333
-[2001:4800:7819:104:be76:4eff:fe04:7809]:8333
-[2001:4800:7819:104:be76:4eff:fe05:c828]:8333
-[2001:4802:7800:2:30d7:1775:ff20:1858]:8333
-[2001:4802:7802:101:be76:4eff:fe20:256]:8333
-[2001:4802:7802:103:be76:4eff:fe20:2de8]:8333
-[2001:4830:1100:2e8::2]:8333
-[2001:4ba0:fff7:181:dead::1]:8333
-[2001:4ba0:fffa:5d::93]:8333
-[2001:4ba0:ffff:1be:1:1005:0:1]:8335
-[2001:4c48:110:101:216:3eff:fe24:1162]:8333
-[2001:4dd0:f101::32]:8333
-[2001:4dd0:ff00:867f::3]:8333
-[2001:4dd0:ff00:9a67::9]:8333
-[2001:4dd0:ff00:9c55:c23f:d5ff:fe6c:7ee9]:8333
-[2001:5c0:1400:b::3cc7]:8333
-[2001:5c0:1400:b::3d01]:8333
-[2001:5c0:1400:b::8df]:8333
-[2001:5c0:1501:300::3]:8333
-[2001:610:1b19::3]:8333
-[2001:620:500:fff0:f21f:afff:fecf:91cc]:8333
-[2001:67c:1220:80c:ad:8de2:f7e2:c784]:8333
-[2001:67c:21ec:1000::b]:8333
-[2001:6f8:1296:0:76d4:35ff:feba:1d26]:8333
-[2001:840:f000:4250:3e4a:92ff:fe6d:145f]:8333
-[2001:8d8:840:500::39:1ae]:8333
-[2001:980:efd8:0:21:de4a:2709:912]:8333
-[2001:981:46:1::3]:8333
-[2001:981:9319:2:c0:a8:c8:8]:8333
-[2001:9d8:cafe:3::91]:8333
-[2001:ad0:1:1:26be:5ff:fe25:959d]:8333
-[2001:ba8:1f1:f34c::2]:8333
-[2001:bc8:381c:100::1]:8333
-[2002:175c:4caa::175c:4caa]:8333
-[2002:4404:82f1:0:8d55:8fbb:15fa:f4e0]:8333
-[2002:4475:2233:0:21f:5bff:fe33:9f70]:8333
-[2002:596c:48c3::596c:48c3]:8333
-[2002:8c6d:6521:9617:12bf:48ff:fed8:1724]:8333
-[2002:a646:5e6a::1:2]:8333
-[2002:b009:20c5::b009:20c5]:8333
-[2400:8900::f03c:91ff:fe6e:823e]:8333
-[2400:8900::f03c:91ff:fe70:d164]:8333
-[2400:8901::f03c:91ff:fe37:9761]:8333
-[2403:4200:403:2::ff]:8333
-[2403:b800:1000:64:40a:e9ff:fe5f:94c1]:8333
-[2403:b800:1000:64:9879:17ff:fe6a:a59f]:8333
-[2600:3c00::f03c:91ff:fe18:59b2]:8333
-[2600:3c00::f03c:91ff:fe37:a4b1]:8333
-[2600:3c00::f03c:91ff:fe56:2973]:8333
-[2600:3c00::f03c:91ff:fe6e:7297]:8333
-[2600:3c00::f03c:91ff:fe84:8a6e]:8333
-[2600:3c01::f03c:91ff:fe18:6adf]:8333
-[2600:3c01::f03c:91ff:fe18:e217]:8333
-[2600:3c01::f03c:91ff:fe33:1b31]:8333
-[2600:3c01::f03c:91ff:fe33:2fe1]:8333
-[2600:3c01::f03c:91ff:fe33:a03f]:8333
-[2600:3c01::f03c:91ff:fe50:5e06]:8333
-[2600:3c01::f03c:91ff:fe56:d645]:8333
-[2600:3c01::f03c:91ff:fe6e:a3dc]:8333
-[2600:3c01::f03c:91ff:fe89:a659]:8333
-[2600:3c02::f03c:91ff:fe6e:6f0b]:8333
-[2600:3c03::f03c:91ff:fe33:f6fb]:8333
-[2600:3c03::f03c:91ff:fe50:5fa7]:8333
-[2600:3c03::f03c:91ff:fe6e:1803]:8333
-[2600:3c03::f03c:91ff:fe6e:4ac0]:8333
-[2601:6:4800:47f:1e4e:1f4d:332c:3bf6]:8333
-[2601:d:5400:fed:8d54:c1e8:7ed7:d45e]:8333
-[2602:100:4b8f:6d2a:20c:29ff:feaf:c4c2]:8333
-[2602:ffc5:1f::1f:2d61]:8333
-[2602:ffc5:1f::1f:9211]:8333
-[2602:ffc5::ffc5:b844]:8333
-[2602:ffe8:100:2::457:936b]:8333
-[2602:ffea:1001:125::2ad4]:8333
-[2602:ffea:1001:6ff::837d]:8333
-[2602:ffea:1001:72b::578b]:8333
-[2602:ffea:1001:77a::9cae]:8333
-[2602:ffea:1:2fe::6bc8]:8333
-[2602:ffea:1:701::7968]:8333
-[2602:ffea:1:70d::82ec]:8333
-[2602:ffea:1:9ff::e957]:8333
-[2602:ffea:1:a5d::4acb]:8333
-[2602:ffea:a::24c4:d9fd]:8333
-[2602:ffea:a::c06:ae32]:8333
-[2604:0:c1:100:1ec1:deff:fe54:2235]:8333
-[2604:180:1:1af::42a9]:8333
-[2604:180::b208:398]:8333
-[2604:2880::6072:aed]:8333
-[2604:4080:1114:0:3285:a9ff:fe93:850c]:8333
-[2604:7c00:17:3d0::5a4d]:8333
-[2604:9a00:2100:a009:2::]:8333
-[2604:a880:1:20::22a:4001]:8333
-[2604:a880:800:10::752:f001]:8333
-[2604:c00:88:32:216:3eff:fee4:fcca]:8333
-[2604:c00:88:32:216:3eff:fef5:bc21]:8333
-[2605:7980:1:2::1761:3d4e]:8333
-[2605:e000:1417:4068:223:32ff:fe96:e2d]:8333
-[2606:6000:a441:9903:5054:ff:fe78:66ff]:8333
-[2606:df00:2::ae85:8fc6]:8333
-[2607:5300:100:200::e7f]:8333
-[2607:5300:10::a1]:8333
-[2607:5300:60:116e::1]:8333
-[2607:5300:60:1535::]:8333
-[2607:5300:60:1b32::1]:8333
-[2607:5300:60:2337::1]:8333
-[2607:5300:60:2b90::1]:8333
-[2607:5300:60:2d99::1]:8333
-[2607:5300:60:3cb::1]:8333
-[2607:5300:60:4a85::]:8333
-[2607:5300:60:5112:0:2:4af5:63fe]:8333
-[2607:5300:60:6dd5::]:8333
-[2607:5300:60:a91::1]:8333
-[2607:f1c0:820:1500::7f:3f44]:8333
-[2607:f1c0:848:1000::48:943c]:8333
-[2607:f948:0:1::7]:8333
-[2607:fcd0:100:2300::4ad:e594]:8333
-[2607:fcd0:100:2300::659e:9cb3]:8333
-[2607:fcd0:100:2300::c74b:a8ae]:8333
-[2607:fcd0:100:2300::d82:d8c2]:8333
-[2607:fcd0:100:4300::8795:2fa8]:8333
-[2607:fcd0:daaa:901::9561:e043]:8333
-[2a00:1178:2:43:5054:ff:fee7:2eb6]:8333
-[2a00:1328:e100:cc42:230:48ff:fe92:55d]:8333
-[2a00:14f0:e000:80d2:cd1a::1]:8333
-[2a00:16d8:c::5b6a:c261]:8333
-[2a00:61e0:4083:6d01:6852:1376:e972:2091]:8333
-[2a00:c98:2030:a02f:2::2]:8333
-[2a01:1b0:7999:402::131]:8333
-[2a01:1e8:e100:811c:700f:65f0:f72a:1084]:8333
-[2a01:238:42da:c500:6546:1293:5422:ab40]:8333
-[2a01:348:6:473::2]:8333
-[2a01:368:e010:2::2]:8333
-[2a01:430:17:1::ffff:549]:8333
-[2a01:430:17:1::ffff:830]:8333
-[2a01:488:66:1000:53a9:d04:0:1]:8333
-[2a01:488:66:1000:57e6:578c:0:1]:8333
-[2a01:488:66:1000:b01c:178d:0:1]:8333
-[2a01:488:67:1000:523:fdce:0:1]:8333
-[2a01:488:67:1000:b01c:30ab:0:1]:8333
-[2a01:4f8:100:24aa::2]:8333
-[2a01:4f8:100:44e7::2]:8333
-[2a01:4f8:100:5128::2]:8333
-[2a01:4f8:100:84a7::1:1]:8333
-[2a01:4f8:110:516c::2]:8333
-[2a01:4f8:110:536e::2]:8333
-[2a01:4f8:120:62e6::2]:8333
-[2a01:4f8:120:702e::2]:8333
-[2a01:4f8:120:8005::2]:8333
-[2a01:4f8:120:8203::2]:8333
-[2a01:4f8:120:8422::2]:8333
-[2a01:4f8:121:11eb::2]:8333
-[2a01:4f8:121:261::2]:8333
-[2a01:4f8:130:242b::10]:8333
-[2a01:4f8:130:242b::5]:8333
-[2a01:4f8:130:2468::3]:8333
-[2a01:4f8:130:632c::2]:8333
-[2a01:4f8:130:6366::2]:8333
-[2a01:4f8:130:6426::2]:8333
-[2a01:4f8:130:934f::2]:8333
-[2a01:4f8:131:2070::2]:8333
-[2a01:4f8:131:54a2::2]:8333
-[2a01:4f8:140:80ad::2]:8333
-[2a01:4f8:141:186::2]:8333
-[2a01:4f8:150:210b::2]:8333
-[2a01:4f8:150:2263::5]:8333
-[2a01:4f8:150:2349::2]:8333
-[2a01:4f8:150:61ee::2]:8333
-[2a01:4f8:150:7088:5054:ff:fe45:bff2]:8333
-[2a01:4f8:150:8324::2]:9001
-[2a01:4f8:151:1d8::2]:8333
-[2a01:4f8:151:5128::2]:8333
-[2a01:4f8:151:6347::2]:9001
-[2a01:4f8:161:526d::2]:8333
-[2a01:4f8:161:9349::2]:8333
-[2a01:4f8:162:23c6::2]:8333
-[2a01:4f8:162:4348::2]:8333
-[2a01:4f8:162:7345::2]:8333
-[2a01:4f8:162:7383::2]:8333
-[2a01:4f8:162:74e3::2]:8333
-[2a01:4f8:190:6065::2]:8333
-[2a01:4f8:190:6349::2]:8333
-[2a01:4f8:190:64c9::2]:8333
-[2a01:4f8:190:91ce::2]:8333
-[2a01:4f8:191:2194::83]:8333
-[2a01:4f8:191:40a1::2]:8333
-[2a01:4f8:191:4a7::2]:8333
-[2a01:4f8:191:63b4:5000::1]:8333
-[2a01:4f8:191:7121::2]:8333
-[2a01:4f8:191:83a2::2]:8333
-[2a01:4f8:191:93c4::2]:8333
-[2a01:4f8:192:60a9:0:1:5:2]:8333
-[2a01:4f8:192:73b2::2]:8333
-[2a01:4f8:192:8098::2]:8333
-[2a01:4f8:192:db::2]:8333
-[2a01:4f8:200:1012::2]:8333
-[2a01:4f8:200:22e3::2]:8333
-[2a01:4f8:200:414e::2]:8333
-[2a01:4f8:200:63af::222]:8333
-[2a01:4f8:200:71e3:78b4:f3ff:fead:e8cf]:8333
-[2a01:4f8:201:5164::2]:8333
-[2a01:4f8:201:6011::4]:8333
-[2a01:4f8:201:60d5::2]:8333
-[2a01:4f8:202:53c3::2]:8333
-[2a01:4f8:210:24aa::2]:8333
-[2a01:4f8:210:502f::2]:8333
-[2a01:4f8:211:14cf::2]:8333
-[2a01:4f8:211:1a59::2]:8333
-[2a01:4f8:211:2ac1::2]:8333
-[2a01:4f8:211:cca::2]:8333
-[2a01:4f8:a0:22a5::2]:8333
-[2a01:4f8:a0:5023::2]:8333
-[2a01:4f8:a0:5243::2]:8333
-[2a01:4f8:a0:74c8::2]:8333
-[2a01:4f8:a0:8227::2]:8333
-[2a01:4f8:a0:822d::2]:8333
-[2a01:4f8:d13:2183::2]:8333
-[2a01:608:ffff:a009:8bf5:879d:e51a:f837]:8333
-[2a01:79d:469e:ed94:c23f:d5ff:fe65:20c5]:8333
-[2a01:7c8:aab5:3e6:5054:ff:fed7:4e54]:8333
-[2a01:7e00::f03c:91ff:fe18:301e]:8333
-[2a01:7e00::f03c:91ff:fe18:7749]:8333
-[2a01:7e00::f03c:91ff:fe33:2d67]:8333
-[2a01:7e00::f03c:91ff:fe33:347c]:8333
-[2a01:7e00::f03c:91ff:fe33:ae50]:8333
-[2a01:7e00::f03c:91ff:fe56:6b5c]:8333
-[2a01:7e00::f03c:91ff:fe56:bee6]:8333
-[2a01:7e00::f03c:91ff:fe69:4895]:8333
-[2a01:7e00::f03c:91ff:fe69:9912]:8333
-[2a01:7e00::f03c:91ff:fe6e:26ee]:8333
-[2a01:7e00::f03c:91ff:fe73:42f1]:8333
-[2a01:7e00::f03c:91ff:fe84:434f]:8333
-[2a01:7e00::f03c:91ff:fe84:b36b]:8333
-[2a01:7e00::f03c:91ff:fe89:1faa]:8333
-[2a01:7e00::f03c:91ff:fe98:816]:8333
-[2a01:7e00::f03c:91ff:fedb:352e]:8333
-[2a01:7e00::f03c:91ff:fedb:4a1d]:8333
-[2a01:e34:edbb:6750:224:1dff:fe89:3897]:8333
-[2a01:e35:2f1d:3fb0:7187:c7ba:bcfc:80ce]:8333
-[2a01:e35:8787:96f0:9032:9297:39ae:496d]:8333
-[2a01:e35:8a3f:47c0:c617:feff:fe3c:9fbd]:8333
-[2a01:e35:8b66:6a0:4900:9dfd:d841:d025]:8333
-[2a02:168:4a01::39]:8333
-[2a02:168:5404:2:c23f:d5ff:fe6a:512e]:8333
-[2a02:180:1:1::5b8f:538c]:8333
-[2a02:2028:1016::2]:8333
-[2a02:2528:503:2::14]:8333
-[2a02:2528:503:2::15]:8333
-[2a02:2528:ff00:81a6:21e:c5ff:fe8d:f9a5]:8333
-[2a02:2770:5:0:21a:4aff:fee4:c7db]:8333
-[2a02:2770:8:0:21a:4aff:fe7b:3dcd]:8333
-[2a02:348:5e:5a29::1]:8333
-[2a02:7aa0:1619::202f:c06a]:8333
-[2a02:8109:8e40:35fc:ba27:ebff:feae:cf16]:8333
-[2a02:af8:6:1500::1:130]:8333
-[2a02:c200:0:10:1:0:6314:2222]:8333
-[2a02:c200:0:10:2:3:3295:1]:8332
-[2a02:c200:0:10:3:0:5449:1]:8333
-[2a02:c200:1:10:2:3:5899:1]:8333
-[2a02:c200:1:10::2705:1]:8333
-[2a02:ce80:0:20::1]:8333
-[2a02:fe0:c321:27e0:6ef0:49ff:fe11:a61d]:8333
-[2a03:4000:2:496::8]:8333
-[2a03:b0c0:0:1010::62:f001]:8333
-[2a03:f80:ed16:ca7:ea75:b12d:2af:9e2a]:8333
-3ffk7iumtx3cegbi.onion:8333
-3hshaantu6ot4upz.onion:8333
-45c5lc77qgpikafy.onion:8333
-77mx2jsxaoyesz2p.onion:8333
-7g7j54btiaxhtsiy.onion:8333
-b6fr7dlbu2kpiysf.onion:8333
-bitcoincfqcssig5.onion:8333
-bitcoinostk4e4re.onion:8333
-bmutjfrj5btseddb.onion:8333
-drp4pvejybx2ejdr.onion:8333
-gixnv56d63buypan.onion:8333
-h2vlpudzphzqxutd.onion:8333
-hhiv5pnxenvbf4am.onion:8333
-lzxpkn6ptp3ohh63.onion:8333
-msphsgfiqfq5stne.onion:8333
-ncwk3lutemffcpc4.onion:8333
-okdzjarwekbshnof.onion:8333
-sjdomi4yb2dwkjbc.onion:8333
-uvwozwxlihntigbb.onion:8333
-v6ylz45dn5ybpk4d.onion:8333
-vk3qjdehyy4dwcxw.onion:8333
-vqpye2k5rcqvj5mq.onion:8333
-xudkoztdfrsuyyou.onion:8333
-z55v4ostefnwfy32.onion:8333
+185.25.48.236:27485
+185.25.48.236:27487
+185.64.105.111:27485
+185.64.105.111:27487
+185.25.48.72:27485
+185.25.48.72:27487                                                                                                    
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -14,6 +14,7 @@ BASEDIR = $(CURDIR)
 HASH_LENGTH:=11
 DOWNLOAD_CONNECT_TIMEOUT:=10
 DOWNLOAD_RETRIES:=3
+CRATE_REGISTRY:=vendored-sources

 host:=$(BUILD)
 ifneq ($(HOST),)
@@ -72,15 +73,14 @@ include builders/$(build_os).mk
 include builders/default.mk
 include packages/packages.mk

-rust_packages_$(NO_RUST) = $(rust_packages)
 wallet_packages_$(NO_WALLET) = $(wallet_packages)
 proton_packages_$(NO_PROTON) = $(proton_packages)

-packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(rust_packages_) $(proton_packages_) $(wallet_packages_)
+packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(rust_packages) $(proton_packages_) $(wallet_packages_)
 native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
 all_packages = $(packages) $(native_packages)

-meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk
+meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk cargo-checksum.sh

 $(host_arch)_$(host_os)_native_toolchain?=$($(host_os)_native_toolchain)

--- a/depends/cargo-checksum.sh
+++ b/depends/cargo-checksum.sh
@@ -0,0 +1,13 @@
+echo "{\"files\":{$(
+find . -type f |  	# Get list of file paths
+grep -v $1 |		# Exclude Makefile hashes
+grep -v '[.]stamp_' |	# Exclude Makefile stamps
+sed 's|^[.]/||' |	# Remove leading ./
+sort |			# Sort (for uniformity)
+xargs $2 |		# Get SHA256 hashes (assumes standard 'H(A) A' format)
+awk -v OFS='":"' '{print $2, $1}' |	#   'H(A) A'  ->  'A":"H(A)'
+sed 's|^|"|' |				#  'A":"H(A)' -> '"A":"H(A)'
+sed 's|$|"|' |				# '"A":"H(A)' -> '"A":"H(A)"'
+tr '\n' ',' |		# Concatenate lines with commas
+sed 's|,$||'		# Remove any trailing comma (to fit JSON spec)
+)},\"package\":$3}" > .cargo-checksum.json
--- a/depends/funcs.mk
+++ b/depends/funcs.mk
@@ -30,6 +30,21 @@ define fetch_file
    rm -rf $$($(1)_download_dir) ))
 endef

+define generate_crate_checksum
+$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "\"$($(1)_sha256_hash)\""
+endef
+
+define generate_unpackaged_crate_checksum
+$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "null"
+endef
+
+define vendor_crate_source
+mkdir -p $($(1)_staging_prefix_dir)/$(CRATE_REGISTRY) && \
+cp -r $($(1)_extract_dir) $($(1)_staging_prefix_dir)/$(CRATE_REGISTRY)/$($(1)_crate_name) && \
+cd $($(1)_staging_prefix_dir)/$(CRATE_REGISTRY)/$($(1)_crate_versioned_name) && \
+rm -r `basename $($(1)_patch_dir)` .stamp_* .$($(1)_file_name).hash
+endef
+
 define int_get_build_recipe_hash
 $(eval $(1)_all_file_checksums:=$(shell $(build_SHA256SUM) $(meta_depends) packages/$(1).mk $(addprefix $(PATCHES_PATH)/$(1)/,$($(1)_patches)) | cut -d" " -f1))
 $(eval $(1)_recipe_hash:=$(shell echo -n "$($(1)_all_file_checksums)" | $(build_SHA256SUM) | cut -d" " -f1))
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -8,7 +8,7 @@ darwin_CXX=g++-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysro
 darwin_CFLAGS=-pipe
 darwin_CXXFLAGS=$(darwin_CFLAGS)

-darwin_release_CFLAGS=-O2
+darwin_release_CFLAGS=-O1
 darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)

 darwin_debug_CFLAGS=-O1
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -3,7 +3,7 @@ mingw32_CXX=x86_64-w64-mingw32-g++-posix
 mingw32_CFLAGS=-pipe -std=c11
 mingw32_CXXFLAGS=$(mingw32_CFLAGS) -std=c++11

-mingw32_release_CFLAGS=-O2
+mingw32_release_CFLAGS=-O1
 mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)

 mingw32_debug_CFLAGS=-O1
--- a/depends/packages/bdb.mk
+++ b/depends/packages/bdb.mk
@@ -1,6 +1,6 @@
 package=bdb
 $(package)_version=6.2.23
-$(package)_download_path=http://download.oracle.com/berkeley-db
+$(package)_download_path=https://download.oracle.com/berkeley-db
 $(package)_file_name=db-$($(package)_version).tar.gz
 $(package)_sha256_hash=47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7
 $(package)_build_subdir=build_unix
@@ -13,6 +13,7 @@ $(package)_cxxflags=-std=c++11
 endef

 define $(package)_preprocess_cmds
+  sed -i.old 's/WinIoCtl.h/winioctl.h/g' src/dbinc/win_db.h && \
  sed -i.old 's/__atomic_compare_exchange\\(/__atomic_compare_exchange_db(/' src/dbinc/atomic.h && \
  sed -i.old 's/atomic_init/atomic_init_db/' src/dbinc/atomic.h src/mp/mp_region.c src/mp/mp_mvcc.c src/mp/mp_fget.c src/mutex/mut_method.c src/mutex/mut_tas.c
 endef
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -1,9 +1,9 @@
-
 package=boost
+
 $(package)_version=1_66_0
 $(package)_download_path=https://dl.bintray.com/boostorg/release/1.66.0/source
-$(package)_file_name=$(package)_$($(package)_version).tar.bz2
 $(package)_sha256_hash=5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
+$(package)_file_name=$(package)_$($(package)_version).tar.bz2

 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
--- a/depends/packages/crate_aes.mk
+++ b/depends/packages/crate_aes.mk
@@ -0,0 +1,15 @@
+package=crate_aes
+$(package)_crate_name=aes
+$(package)_version=0.2.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=e6fb1737cdc8da3db76e90ca817a194249a38fcb500c2e6ecec39b29448aa873
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_aes_soft.mk
+++ b/depends/packages/crate_aes_soft.mk
@@ -0,0 +1,15 @@
+package=crate_aes_soft
+$(package)_crate_name=aes-soft
+$(package)_version=0.2.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=67cc03b0a090a05cb01e96998a01905d7ceedce1bc23b756c0bb7faa0682ccb1
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_aesni.mk
+++ b/depends/packages/crate_aesni.mk
@@ -0,0 +1,15 @@
+package=crate_aesni
+$(package)_crate_name=aesni
+$(package)_version=0.4.1
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=6810b7fb9f2bb4f76f05ac1c170b8dde285b6308955dc3afd89710268c958d9e
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_arrayvec.mk
+++ b/depends/packages/crate_arrayvec.mk
@@ -0,0 +1,15 @@
+package=crate_arrayvec
+$(package)_crate_name=arrayvec
+$(package)_version=0.4.7
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_bellman.mk
+++ b/depends/packages/crate_bellman.mk
@@ -0,0 +1,15 @@
+package=crate_bellman
+$(package)_crate_name=bellman
+$(package)_version=0.1.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=eae372472c7ea8f7c8fc6a62f7d5535db8302de7f1aafda2e13a97c4830d3bcf
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_bit_vec.mk
+++ b/depends/packages/crate_bit_vec.mk
@@ -0,0 +1,15 @@
+package=crate_bit_vec
+$(package)_crate_name=bit-vec
+$(package)_version=0.4.4
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_bitflags.mk
+++ b/depends/packages/crate_bitflags.mk
@@ -0,0 +1,15 @@
+package=crate_bitflags
+$(package)_crate_name=bitflags
+$(package)_version=1.0.1
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_blake2_rfc.mk
+++ b/depends/packages/crate_blake2_rfc.mk
@@ -0,0 +1,16 @@
+package=crate_blake2_rfc
+$(package)_crate_name=blake2-rfc
+$(package)_download_path=https://github.com/gtank/$($(package)_crate_name)/archive/
+$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
+$(package)_download_file=$($(package)_git_commit).tar.gz
+$(package)_sha256_hash=8a873cc41f02e669e8071ab5919931dd4263f050becf0c19820b0497c07b0ca3
+$(package)_git_commit=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_unpackaged_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_block_cipher_trait.mk
+++ b/depends/packages/crate_block_cipher_trait.mk
@@ -0,0 +1,15 @@
+package=crate_block_cipher_trait
+$(package)_crate_name=block-cipher-trait
+$(package)_version=0.5.3
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=370424437b9459f3dfd68428ed9376ddfe03d8b70ede29cc533b3557df186ab4
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_byte_tools.mk
+++ b/depends/packages/crate_byte_tools.mk
@@ -0,0 +1,15 @@
+package=crate_byte_tools
+$(package)_crate_name=byte-tools
+$(package)_version=0.2.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_byteorder.mk
+++ b/depends/packages/crate_byteorder.mk
@@ -0,0 +1,15 @@
+package=crate_byteorder
+$(package)_crate_name=byteorder
+$(package)_version=1.2.2
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_constant_time_eq.mk
+++ b/depends/packages/crate_constant_time_eq.mk
@@ -0,0 +1,15 @@
+package=crate_constant_time_eq
+$(package)_crate_name=constant_time_eq
+$(package)_version=0.1.3
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_crossbeam.mk
+++ b/depends/packages/crate_crossbeam.mk
@@ -0,0 +1,15 @@
+package=crate_crossbeam
+$(package)_crate_name=crossbeam
+$(package)_version=0.3.2
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_digest.mk
+++ b/depends/packages/crate_digest.mk
@@ -0,0 +1,15 @@
+package=crate_digest
+$(package)_crate_name=digest
+$(package)_version=0.7.2
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_fpe.mk
+++ b/depends/packages/crate_fpe.mk
@@ -0,0 +1,15 @@
+package=crate_fpe
+$(package)_crate_name=fpe
+$(package)_version=0.1.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=ce3371c82bfbd984f624cab093f55e7336f5a6e589f8518e1258f54f011b89ad
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_fuchsia_zircon.mk
+++ b/depends/packages/crate_fuchsia_zircon.mk
@@ -0,0 +1,15 @@
+package=crate_fuchsia_zircon
+$(package)_crate_name=fuchsia-zircon
+$(package)_version=0.3.3
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_fuchsia_zircon_sys.mk
+++ b/depends/packages/crate_fuchsia_zircon_sys.mk
@@ -0,0 +1,15 @@
+package=crate_fuchsia_zircon_sys
+$(package)_crate_name=fuchsia-zircon-sys
+$(package)_version=0.3.3
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_futures.mk
+++ b/depends/packages/crate_futures.mk
@@ -0,0 +1,15 @@
+package=crate_futures
+$(package)_crate_name=futures
+$(package)_version=0.1.21
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_futures_cpupool.mk
+++ b/depends/packages/crate_futures_cpupool.mk
@@ -0,0 +1,15 @@
+package=crate_futures_cpupool
+$(package)_crate_name=futures-cpupool
+$(package)_version=0.1.8
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_generic_array.mk
+++ b/depends/packages/crate_generic_array.mk
@@ -0,0 +1,15 @@
+package=crate_generic_array
+$(package)_crate_name=generic-array
+$(package)_version=0.9.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_lazy_static.mk
+++ b/depends/packages/crate_lazy_static.mk
@@ -0,0 +1,15 @@
+package=crate_lazy_static
+$(package)_crate_name=lazy_static
+$(package)_version=1.0.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_libc.mk
+++ b/depends/packages/crate_libc.mk
@@ -0,0 +1,15 @@
+package=crate_libc
+$(package)_crate_name=libc
+$(package)_version=0.2.40
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_nodrop.mk
+++ b/depends/packages/crate_nodrop.mk
@@ -0,0 +1,15 @@
+package=crate_nodrop
+$(package)_crate_name=nodrop
+$(package)_version=0.1.12
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_num_bigint.mk
+++ b/depends/packages/crate_num_bigint.mk
@@ -0,0 +1,15 @@
+package=crate_num_bigint
+$(package)_crate_name=num-bigint
+$(package)_version=0.2.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=3eceac7784c5dc97c2d6edf30259b4e153e6e2b42b3c85e9a6e9f45d06caef6e
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_num_cpus.mk
+++ b/depends/packages/crate_num_cpus.mk
@@ -0,0 +1,15 @@
+package=crate_num_cpus
+$(package)_crate_name=num_cpus
+$(package)_version=1.8.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_num_integer.mk
+++ b/depends/packages/crate_num_integer.mk
@@ -0,0 +1,15 @@
+package=crate_num_integer
+$(package)_crate_name=num-integer
+$(package)_version=0.1.39
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_num_traits.mk
+++ b/depends/packages/crate_num_traits.mk
@@ -0,0 +1,15 @@
+package=crate_num_traits
+$(package)_crate_name=num-traits
+$(package)_version=0.2.5
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_opaque_debug.mk
+++ b/depends/packages/crate_opaque_debug.mk
@@ -0,0 +1,15 @@
+package=crate_opaque_debug
+$(package)_crate_name=opaque-debug
+$(package)_version=0.1.1
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=d620c9c26834b34f039489ac0dfdb12c7ac15ccaf818350a64c9b5334a452ad7
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_pairing.mk
+++ b/depends/packages/crate_pairing.mk
@@ -0,0 +1,15 @@
+package=crate_pairing
+$(package)_crate_name=pairing
+$(package)_version=0.14.2
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=ceda21136251c6d5a422d3d798d8ac22515a6e8d3521bb60c59a8349d36d0d57
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_rand.mk
+++ b/depends/packages/crate_rand.mk
@@ -0,0 +1,15 @@
+package=crate_rand
+$(package)_crate_name=rand
+$(package)_version=0.4.2
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_sapling_crypto.mk
+++ b/depends/packages/crate_sapling_crypto.mk
@@ -0,0 +1,16 @@
+package=crate_sapling_crypto
+$(package)_crate_name=sapling-crypto
+$(package)_download_path=https://github.com/zcash-hackworks/$($(package)_crate_name)/archive/
+$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
+$(package)_download_file=$($(package)_git_commit).tar.gz
+$(package)_sha256_hash=ae3a122b1f1ce97b4e80e0e8542e19aa1516e99e6c72875688c886af1a881558
+$(package)_git_commit=21084bde2019c04bd34208e63c3560fe2c02fb0e
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_unpackaged_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_stream_cipher.mk
+++ b/depends/packages/crate_stream_cipher.mk
@@ -0,0 +1,15 @@
+package=crate_stream_cipher
+$(package)_crate_name=stream-cipher
+$(package)_version=0.1.1
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=30dc6118470d69ce0fdcf7e6f95e95853f7f4f72f80d835d4519577c323814ab
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_typenum.mk
+++ b/depends/packages/crate_typenum.mk
@@ -0,0 +1,15 @@
+package=crate_typenum
+$(package)_crate_name=typenum
+$(package)_version=1.10.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_winapi.mk
+++ b/depends/packages/crate_winapi.mk
@@ -0,0 +1,15 @@
+package=crate_winapi
+$(package)_crate_name=winapi
+$(package)_version=0.3.4
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_winapi_i686_pc_windows_gnu.mk
+++ b/depends/packages/crate_winapi_i686_pc_windows_gnu.mk
@@ -0,0 +1,15 @@
+package=crate_winapi_i686_pc_windows_gnu
+$(package)_crate_name=winapi-i686-pc-windows-gnu
+$(package)_version=0.4.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk
+++ b/depends/packages/crate_winapi_x86_64_pc_windows_gnu.mk
@@ -0,0 +1,15 @@
+package=crate_winapi_x86_64_pc_windows_gnu
+$(package)_crate_name=winapi-x86_64-pc-windows-gnu
+$(package)_version=0.4.0
+$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
+$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
+$(package)_sha256_hash=712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/crate_zip32.mk
+++ b/depends/packages/crate_zip32.mk
@@ -0,0 +1,16 @@
+package=crate_zip32
+$(package)_crate_name=zip32
+$(package)_download_path=https://github.com/zcash-hackworks/$($(package)_crate_name)/archive/
+$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
+$(package)_download_file=$($(package)_git_commit).tar.gz
+$(package)_sha256_hash=b0b011ea96524f0d918a44c7ab8a3dec6270879d1ff03d7dbda6c676d25caa7e
+$(package)_git_commit=176470ef41583b5bd0bd749bd1b61d417aa8ec79
+$(package)_crate_versioned_name=$($(package)_crate_name)
+
+define $(package)_preprocess_cmds
+  $(call generate_unpackaged_crate_checksum,$(package))
+endef
+
+define $(package)_stage_cmds
+  $(call vendor_crate_source,$(package))
+endef
--- a/depends/packages/googletest.mk
+++ b/depends/packages/googletest.mk
@@ -5,6 +5,11 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=release-$($(package)_version).tar.gz
 $(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8

+define $(package)_set_vars
+$(package)_cxxflags+=-std=c++11
+$(package)_cxxflags_linux=-fPIC
+endef
+
 ifeq ($(build_os),darwin)
 define $(package)_set_vars
    $(package)_build_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)"
@@ -19,9 +24,10 @@ define $(package)_build_cmds
 endef
 else
 $(package)_install=install
+
 define $(package)_build_cmds
-  $(MAKE) -C googlemock/make CXXFLAGS=-fPIC gmock.a && \
-  $(MAKE) -C googletest/make CXXFLAGS=-fPIC gtest.a
+  $(MAKE) -C googlemock/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gmock.a && \
+  $(MAKE) -C googletest/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gtest.a
 endef
 endif

--- a/depends/packages/librustzcash.mk
+++ b/depends/packages/librustzcash.mk
@@ -1,34 +1,38 @@
 package=librustzcash
 $(package)_version=0.1
-$(package)_download_path=https://github.com/zcash/$(package)/archive
+$(package)_download_path=https://github.com/zcash/$(package)/archive/
 $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
 $(package)_download_file=$($(package)_git_commit).tar.gz
-$(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279
-$(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e
-$(package)_dependencies=rust
+$(package)_sha256_hash=9909ec59fa7a411c2071d6237b3363a0bc6e5e42358505cf64b7da0f58a7ff5a
+$(package)_git_commit=06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5
+$(package)_dependencies=rust $(rust_crates)
+$(package)_patches=cargo.config 0001-Start-using-cargo-clippy-for-CI.patch remove-dev-dependencies.diff

 ifeq ($(host_os),mingw32)
-define $(package)_build_cmds
- ~/.cargo/bin/cargo build --release --target=x86_64-pc-windows-gnu --verbose
-endef
+$(package)_library_file=target/x86_64-pc-windows-gnu/release/rustzcash.lib
 else
-define $(package)_build_cmds
-  cargo build --release
-endef
+$(package)_library_file=target/release/librustzcash.a
 endif

-ifeq ($(host_os),mingw32)
+define $(package)_set_vars
+$(package)_build_opts=--frozen --release
+$(package)_build_opts_mingw32=--target=x86_64-pc-windows-gnu
+endef
+
+define $(package)_preprocess_cmds
+  patch -p1 -d pairing < $($(package)_patch_dir)/0001-Start-using-cargo-clippy-for-CI.patch && \
+  patch -p1 < $($(package)_patch_dir)/remove-dev-dependencies.diff && \
+  mkdir .cargo && \
+  cat $($(package)_patch_dir)/cargo.config | sed 's|CRATE_REGISTRY|$(host_prefix)/$(CRATE_REGISTRY)|' > .cargo/config
+endef
+
+define $(package)_build_cmds
+  cargo build --package librustzcash $($(package)_build_opts)
+endef
+
 define $(package)_stage_cmds
  mkdir $($(package)_staging_dir)$(host_prefix)/lib/ && \
  mkdir $($(package)_staging_dir)$(host_prefix)/include/ && \
-  cp target/x86_64-pc-windows-gnu/release/rustzcash.lib $($(package)_staging_dir)$(host_prefix)/lib/ && \
-  cp include/librustzcash.h $($(package)_staging_dir)$(host_prefix)/include/
+  cp $($(package)_library_file) $($(package)_staging_dir)$(host_prefix)/lib/ && \
+  cp librustzcash/include/librustzcash.h $($(package)_staging_dir)$(host_prefix)/include/
 endef
-else
-define $(package)_stage_cmds
-  mkdir $($(package)_staging_dir)$(host_prefix)/lib/ && \
-  mkdir $($(package)_staging_dir)$(host_prefix)/include/ && \
-  cp target/release/librustzcash.a $($(package)_staging_dir)$(host_prefix)/lib/ && \
-  cp include/librustzcash.h $($(package)_staging_dir)$(host_prefix)/include/
-endef
-endif
--- a/depends/packages/libsnark.mk
+++ b/depends/packages/libsnark.mk
@@ -14,15 +14,15 @@ define $(package)_set_vars
  $(package)_build_env+=CXXFLAGS="$($(package)_cxxflags) -DBINARY_OUTPUT -DSTATICLIB -DNO_PT_COMPRESSION=1 "
 endef
 define $(package)_build_cmds
-	$(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64"
+	$(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g "
 endef
 else ifeq ($(host_os),mingw32)
 define $(package)_build_cmds
-	CXX="x86_64-w64-mingw32-g++-posix" CXXFLAGS="-DBINARY_OUTPUT -DPTW32_STATIC_LIB -DSTATICLIB -DNO_PT_COMPRESSION=1 -fopenmp" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64"
+	CXX="x86_64-w64-mingw32-g++-posix" CXXFLAGS="-DBINARY_OUTPUT -DPTW32_STATIC_LIB -DSTATICLIB -DNO_PT_COMPRESSION=1 -fopenmp" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g "
 endef
 else
 define $(package)_build_cmds
-	CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64"
+	CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g "
 endef
 endif

--- a/depends/packages/libsodium.mk
+++ b/depends/packages/libsodium.mk
@@ -1,19 +1,17 @@
-ifeq ($(build_os),darwin)
-package=libsodium
-$(package)_version=1.0.11
-$(package)_download_path=https://supernetorg.bintray.com/misc
-$(package)_file_name=libsodium-1.0.11.tar.gz
-$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
-$(package)_dependencies=
-$(package)_config_opts=
-else
 package=libsodium
 $(package)_version=1.0.15
-$(package)_download_path=https://download.libsodium.org/libsodium/releases
+$(package)_download_path=https://download.libsodium.org/libsodium/releases/old
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
 $(package)_dependencies=
 $(package)_config_opts=
+
+ifeq ($(build_os),darwin)
+define $(package)_set_vars
+  $(package)_build_env=MACOSX_DEPLOYMENT_TARGET="10.11"
+  $(package)_cc=clang
+  $(package)_cxx=clang++
+endef
 endif

 define $(package)_preprocess_cmds
--- a/depends/packages/openssl.mk
+++ b/depends/packages/openssl.mk
@@ -1,8 +1,8 @@
 package=openssl
-$(package)_version=1.1.0d
+$(package)_version=1.1.1a
 $(package)_download_path=https://www.openssl.org/source
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=7d5ebb9e89756545c156ff9c13cf2aa6214193b010a468a3bc789c3c28fe60df
+$(package)_sha256_hash=fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41

 define $(package)_set_vars
 $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
@@ -92,7 +92,7 @@ $(package)_config_opts_i686_mingw32=mingw
 endef

 define $(package)_preprocess_cmds
-  sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
+  sed -i.old 's/built on: $date/built on: not available/' util/mkbuildinf.pl && \
  sed -i.old "s|\"engines\", \"apps\", \"test\"|\"engines\"|" Configure
 endef

--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -7,12 +7,48 @@ else
 	zcash_packages := libgmp libsodium
 endif

+rust_crates := \
+  crate_aes \
+  crate_aesni \
+  crate_aes_soft \
+  crate_arrayvec \
+  crate_bitflags \
+  crate_bit_vec \
+  crate_blake2_rfc \
+  crate_block_cipher_trait \
+  crate_byte_tools \
+  crate_byteorder \
+  crate_constant_time_eq \
+  crate_crossbeam \
+  crate_digest \
+  crate_fpe \
+  crate_fuchsia_zircon \
+  crate_fuchsia_zircon_sys \
+  crate_futures_cpupool \
+  crate_futures \
+  crate_generic_array \
+  crate_lazy_static \
+  crate_libc \
+  crate_nodrop \
+  crate_num_bigint \
+  crate_num_cpus \
+  crate_num_integer \
+  crate_num_traits \
+  crate_opaque_debug \
+  crate_rand \
+  crate_stream_cipher \
+  crate_typenum \
+  crate_winapi_i686_pc_windows_gnu \
+  crate_winapi \
+  crate_winapi_x86_64_pc_windows_gnu
+rust_packages := rust $(rust_crates) librustzcash
+native_packages := native_ccache
+
+wallet_packages=bdb
+
 ifeq ($(host_os),linux)
 	packages := boost openssl libevent zeromq $(zcash_packages) googletest #googlemock
 else
 	packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock
 endif

-native_packages := native_ccache
-
-wallet_packages=bdb
--- a/depends/packages/rust.mk
+++ b/depends/packages/rust.mk
@@ -1,17 +1,52 @@
 package=rust
-$(package)_version=1.16.0
+$(package)_version=1.32.0
 $(package)_download_path=https://static.rust-lang.org/dist
+
+$(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
+$(package)_sha256_hash_linux=e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810
+$(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
+$(package)_sha256_hash_darwin=f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304
+$(package)_file_name_mingw32=rust-$($(package)_version)-x86_64-pc-windows-gnu.tar.gz
+$(package)_sha256_hash_mingw32=358e1435347c67dbf33aa9cad6fe501a833d6633ed5d5aa1863d5dffa0349be9
+
 ifeq ($(build_os),darwin)
-$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
+$(package)_file_name=$($(package)_file_name_darwin)
+$(package)_sha256_hash=$($(package)_sha256_hash_darwin)
 else ifeq ($(host_os),mingw32)
-$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
+$(package)_file_name=$($(package)_file_name_mingw32)
+$(package)_sha256_hash=$($(package)_sha256_hash_mingw32)
 else
-$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
+$(package)_file_name=$($(package)_file_name_linux)
+$(package)_sha256_hash=$($(package)_sha256_hash_linux)
 endif

+ifeq ($(host_os),mingw32)
+$(package)_build_subdir=buildos
+$(package)_extra_sources = $($(package)_file_name_$(build_os))
+
+define $(package)_fetch_cmds
+$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
+$(call fetch_file,$(package),$($(package)_download_path),$($(package)_file_name_$(build_os)),$($(package)_file_name_$(build_os)),$($(package)_sha256_hash_$(build_os)))
+endef
+
+define $(package)_extract_cmds
+  mkdir -p $($(package)_extract_dir) && \
+  echo "$($(package)_sha256_hash)  $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  echo "$($(package)_sha256_hash_$(build_os))  $($(package)_source_dir)/$($(package)_file_name_$(build_os))" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  mkdir mingw32 && \
+  tar --strip-components=1 -xf $($(package)_source) -C mingw32 && \
+  mkdir buildos && \
+  tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_file_name_$(build_os)) -C buildos
+endef
+
+define $(package)_stage_cmds
+  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig && \
+  cp -r ../mingw32/rust-std-x86_64-pc-windows-gnu/lib/rustlib/x86_64-pc-windows-gnu $($(package)_staging_dir)$(host_prefix)/native/lib/rustlib
+endef
+else
+
 define $(package)_stage_cmds
  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig
 endef
+endif
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -1,23 +1,23 @@
 ifeq ($(host_os),mingw32)
-$(package)_version=4.2.2-1
+$(package)_version=4.3.1
 $(package)_download_path=https://github.com/ca333/libzmq/archive
 $(package)_download_file=v$($(package)_version).tar.gz
 $(package)_file_name=libzmq-$($(package)_version).tar.gz
-$(package)_sha256_hash=0e225b85ce11be23bf7eb7d3f25c6686728bf30d5c31f61c12d37bb646c69962
+$(package)_sha256_hash=cb8ebe5b60dadeb526745610d6237f05a98aba287114d8991dad1fa14f4be354

 define $(package)_set_vars
  $(package)_build_env+=
  $(package)_config_opts=--enable-shared=false --enable-static --host=x86_64-w64-mingw32
-  $(package)_config_opts_mingw32=--enable-shared=false --enable-static --host=x86_64-w64-mingw32
+  $(package)_config_opts_mingw32=--enable-shared=false --enable-static --prefix=$(host_prefix) --host=x86_64-w64-mingw32 -disable-curve
  $(package)_cflags=-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4
  $(package)_conf_tool=./configure
 endef
 else
 package=zeromq
-$(package)_version=4.2.1
-$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
+$(package)_version=4.3.1
+$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=27d1e82a099228ee85a7ddb2260f40830212402c605a4a10b5e5498a7e0e9d03
+$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb

 define $(package)_set_vars
  $(package)_config_opts=--without-documentation --disable-shared --disable-curve
--- a/depends/patches/boost/deprecated_auto_ptr.patch
+++ b/depends/patches/boost/deprecated_auto_ptr.patch
@@ -1,30 +0,0 @@
--- boost_1_62_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2016-09-29 14:03:47.317997658 +1300
-+++ boost_1_62_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2016-09-29 14:07:41.308726372 +1300
-@@ -13,10 +13,16 @@
- 
- #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
- #include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp>
-+#include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
- #include <algorithm>
- #include <functional>
- #include <memory> // for std::auto_ptr
- #include <boost/weak_ptr.hpp>
-+
-+#if defined( BOOST_SP_DISABLE_DEPRECATED )
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-+#endif
- #endif
- 
- #ifdef BOOST_SPIRIT_THREADSAFE
-@@ -370,4 +376,10 @@
- 
- }} // namespace boost::spirit
- 
-+#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
-+#if defined( BOOST_SP_DISABLE_DEPRECATED )
-+#pragma GCC diagnostic pop
-+#endif
-+#endif
-+
- #endif
--- a/depends/patches/boost/include_poll.patch
+++ b/depends/patches/boost/include_poll.patch
@@ -1,11 +0,0 @@
--- boost_1_62_0-orig/boost/asio/detail/socket_types.hpp	2016-09-21 15:33:21.000000000 +0100
-+++ boost_1_62_0/boost/asio/detail/socket_types.hpp	2016-10-18 03:08:41.712254217 +0100
-@@ -58,7 +58,7 @@
- #else
- # include <sys/ioctl.h>
- # if !defined(__SYMBIAN32__)
-#  include <sys/poll.h>
-+#  include <poll.h>
- # endif
- # include <sys/types.h>
- # include <sys/stat.h>
--- a/depends/patches/librustzcash/0001-Start-using-cargo-clippy-for-CI.patch
+++ b/depends/patches/librustzcash/0001-Start-using-cargo-clippy-for-CI.patch
@@ -0,0 +1,42 @@
+From cc5b83510277632852af67d896a27e0cb40f342b Mon Sep 17 00:00:00 2001
+From: Sean Bowe <ewillbefull@gmail.com>
+Date: Wed, 4 Jul 2018 12:45:08 -0600
+Subject: [PATCH 1/2] Start using cargo-clippy for CI.
+
+---
+ src/lib.rs | 21 ++++++++++-----------
+ 1 file changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/src/lib.rs b/src/lib.rs
+index fefdae3..c3640c4 100644
+--- a/src/lib.rs
+++ b/src/lib.rs
+@@ -1,15 +1,14 @@
+ // `clippy` is a code linting tool for improving code quality by catching
+-// common mistakes or strange code patterns. If the `clippy` feature is
+-// provided, it is enabled and all compiler warnings are prohibited.
+-#![cfg_attr(feature = "clippy", deny(warnings))]
+-#![cfg_attr(feature = "clippy", feature(plugin))]
+-#![cfg_attr(feature = "clippy", plugin(clippy))]
+-#![cfg_attr(feature = "clippy", allow(inline_always))]
+-#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
+-#![cfg_attr(feature = "clippy", allow(unreadable_literal))]
+-#![cfg_attr(feature = "clippy", allow(many_single_char_names))]
+-#![cfg_attr(feature = "clippy", allow(new_without_default_derive))]
+-#![cfg_attr(feature = "clippy", allow(write_literal))]
+// common mistakes or strange code patterns. If the `cargo-clippy` feature
+// is provided, all compiler warnings are prohibited.
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
+#![cfg_attr(feature = "cargo-clippy", allow(inline_always))]
+#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
+#![cfg_attr(feature = "cargo-clippy", allow(many_single_char_names))]
+#![cfg_attr(feature = "cargo-clippy", allow(new_without_default_derive))]
+#![cfg_attr(feature = "cargo-clippy", allow(write_literal))]
+
+ // Force public structures to implement Debug
+ #![deny(missing_debug_implementations)]
+ 
+-- 
+2.17.1
+
--- a/depends/patches/librustzcash/cargo.config
+++ b/depends/patches/librustzcash/cargo.config
@@ -0,0 +1,23 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/gtank/blake2-rfc"]
+git = "https://github.com/gtank/blake2-rfc"
+rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9"
+replace-with = "vendored-sources"
+
+[source."https://github.com/zcash-hackworks/sapling-crypto"]
+git = "https://github.com/zcash-hackworks/sapling-crypto"
+rev = "21084bde2019c04bd34208e63c3560fe2c02fb0e"
+replace-with = "vendored-sources"
+
+[source."https://github.com/zcash-hackworks/zip32"]
+git = "https://github.com/zcash-hackworks/zip32"
+rev = "176470ef41583b5bd0bd749bd1b61d417aa8ec79"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "CRATE_REGISTRY"
+
+[target.x86_64-pc-windows-gnu]
+linker = "x86_64-w64-mingw32-gcc"
--- a/depends/patches/librustzcash/remove-dev-dependencies.diff
+++ b/depends/patches/librustzcash/remove-dev-dependencies.diff
@@ -0,0 +1,630 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index bc740bb..3c6c94b 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -28,22 +28,6 @@ dependencies = [
+  "stream-cipher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "aho-corasick"
+-version = "0.6.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "ansi_term"
+-version = "0.11.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "arrayvec"
+ version = "0.4.7"
+@@ -52,27 +36,6 @@ dependencies = [
+  "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "backtrace"
+-version = "0.3.9"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "backtrace-sys"
+-version = "0.1.24"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "bellman"
+ version = "0.1.0"
+@@ -92,11 +55,6 @@ name = "bit-vec"
+ version = "0.4.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+-[[package]]
+-name = "bitflags"
+-version = "0.9.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "bitflags"
+ version = "1.0.1"
+@@ -130,61 +88,6 @@ name = "byteorder"
+ version = "1.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+-[[package]]
+-name = "cargo_metadata"
+-version = "0.5.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "cc"
+-version = "1.0.22"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "cfg-if"
+-version = "0.1.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "clippy"
+-version = "0.0.200"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "clippy_lints 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "clippy_lints"
+-version = "0.0.200"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+- "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "constant_time_eq"
+ version = "0.1.3"
+@@ -203,19 +106,6 @@ dependencies = [
+  "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "either"
+-version = "1.5.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "error-chain"
+-version = "0.11.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "fpe"
+ version = "0.1.0"
+@@ -256,11 +146,6 @@ dependencies = [
+  "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "gcc"
+-version = "0.3.54"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "generic-array"
+ version = "0.9.0"
+@@ -269,59 +154,6 @@ dependencies = [
+  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "getopts"
+-version = "0.2.18"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "hex-literal"
+-version = "0.1.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "proc-macro-hack 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "hex-literal-impl"
+-version = "0.1.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "proc-macro-hack 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "idna"
+-version = "0.1.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "if_chain"
+-version = "0.1.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "itertools"
+-version = "0.7.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "itoa"
+-version = "0.4.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "lazy_static"
+ version = "1.0.0"
+@@ -347,19 +179,6 @@ dependencies = [
+  "zip32 0.0.0",
+ ]
+ 
+-[[package]]
+-name = "matches"
+-version = "0.1.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "memchr"
+-version = "2.0.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "nodrop"
+ version = "0.1.12"
+@@ -405,65 +224,6 @@ name = "pairing"
+ version = "0.14.2"
+ dependencies = [
+  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "clippy 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "percent-encoding"
+-version = "1.0.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "proc-macro-hack"
+-version = "0.4.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "proc-macro-hack-impl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "proc-macro-hack-impl"
+-version = "0.4.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "proc-macro2"
+-version = "0.4.14"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "pulldown-cmark"
+-version = "0.1.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "quine-mc_cluskey"
+-version = "0.2.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "quote"
+-version = "0.6.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "rand"
+-version = "0.3.22"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -477,66 +237,6 @@ dependencies = [
+  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "redox_syscall"
+-version = "0.1.40"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "regex"
+-version = "1.0.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "regex-syntax"
+-version = "0.6.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "rust-crypto"
+-version = "0.2.36"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "rustc-demangle"
+-version = "0.1.9"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "rustc-serialize"
+-version = "0.3.24"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "rustc_version"
+-version = "0.2.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "ryu"
+-version = "0.2.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "sapling-crypto"
+ version = "0.0.1"
+@@ -545,49 +245,8 @@ dependencies = [
+  "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
+  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pairing 0.14.2",
+  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "semver"
+-version = "0.9.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "semver-parser"
+-version = "0.7.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "serde"
+-version = "1.0.75"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "serde_derive"
+-version = "1.0.75"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "serde_json"
+-version = "1.0.26"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -598,90 +257,11 @@ dependencies = [
+  "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "syn"
+-version = "0.14.9"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "thread_local"
+-version = "0.3.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "time"
+-version = "0.1.40"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "toml"
+-version = "0.4.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "typenum"
+ version = "1.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+-[[package]]
+-name = "ucd-util"
+-version = "0.1.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "unicode-bidi"
+-version = "0.3.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "unicode-normalization"
+-version = "0.1.7"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "unicode-width"
+-version = "0.1.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "unicode-xid"
+-version = "0.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "url"
+-version = "1.7.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "utf8-ranges"
+-version = "1.0.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "winapi"
+ version = "0.3.4"
+@@ -730,87 +310,33 @@ dependencies = [
+ "checksum aes 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6fb1737cdc8da3db76e90ca817a194249a38fcb500c2e6ecec39b29448aa873"
+ "checksum aes-soft 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67cc03b0a090a05cb01e96998a01905d7ceedce1bc23b756c0bb7faa0682ccb1"
+ "checksum aesni 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6810b7fb9f2bb4f76f05ac1c170b8dde285b6308955dc3afd89710268c958d9e"
+-"checksum aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a"
+-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+ "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"
+-"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
+-"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
+ "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
+-"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+ "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
+ "checksum blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)" = "<none>"
+ "checksum block-cipher-trait 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "370424437b9459f3dfd68428ed9376ddfe03d8b70ede29cc533b3557df186ab4"
+ "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
+ "checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87"
+-"checksum cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1efca0b863ca03ed4c109fb1c55e0bc4bbeb221d3e103d86251046b06a526bd0"
+-"checksum cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6007c146fdd28d4512a794b07ffe9d8e89e6bf86e2e0c4ddff2e1fb54a0007"
+-"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
+-"checksum clippy 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)" = "927a1f79af10deb103df108347f23c6b7fa1731c953d6fb24d68be1748a0993f"
+-"checksum clippy_lints 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)" = "d2432663f6bdb90255dcf9df5ca504f99b575bb471281591138f62f9d31f863b"
+ "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
+ "checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19"
+ "checksum digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603"
+-"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
+-"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
+ "checksum fpe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce3371c82bfbd984f624cab093f55e7336f5a6e589f8518e1258f54f011b89ad"
+ "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+ "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+ "checksum futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c"
+ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+-"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
+ "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
+-"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
+-"checksum hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4da5f0e01bd8a71a224a4eedecaacfcabda388dbb7a80faf04d3514287572d95"
+-"checksum hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d340b6514f232f6db1bd16db65302a5278a04fef9ce867cb932e7e5fa21130a"
+-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+-"checksum if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
+-"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
+-"checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606"
+ "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
+ "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
+-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+-"checksum memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a3b4142ab8738a78c51896f704f83c11df047ff1bda9a92a661aa6361552d93d"
+ "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
+ "checksum num-bigint 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3eceac7784c5dc97c2d6edf30259b4e153e6e2b42b3c85e9a6e9f45d06caef6e"
+ "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+ "checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
+ "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
+ "checksum opaque-debug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d620c9c26834b34f039489ac0dfdb12c7ac15ccaf818350a64c9b5334a452ad7"
+-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+-"checksum proc-macro-hack 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ba8d4f9257b85eb6cdf13f055cea3190520aab1409ca2ab43493ea4820c25f0"
+-"checksum proc-macro-hack-impl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5cb6f960ad471404618e9817c0e5d10b1ae74cfdf01fab89ea0641fe7fb2892"
+-"checksum proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b331c6ad3411474cd55540398dc7ad89fc41488e64ec71fdecc9c9b86de96fb0"
+-"checksum pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdf85cda6cadfae5428a54661d431330b312bc767ddbc57adbedc24da66e32"
+-"checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
+-"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
+-"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
+ "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
+-"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
+-"checksum regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "67d0301b0c6804eca7e3c275119d0b01ff3b7ab9258a65709e608a66312a1025"
+-"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
+-"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
+-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
+-"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+-"checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7"
+-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+-"checksum serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "22d340507cea0b7e6632900a176101fea959c7065d93ba555072da90aaaafc87"
+-"checksum serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "234fc8b737737b148ccd625175fc6390f5e4dacfdaa543cb93a3430d984a9119"
+-"checksum serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "44dd2cfde475037451fa99b7e5df77aa3cfd1536575fa8e7a538ab36dcde49ae"
+ "checksum stream-cipher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "30dc6118470d69ce0fdcf7e6f95e95853f7f4f72f80d835d4519577c323814ab"
+-"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
+-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+-"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
+-"checksum toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a0263c6c02c4db6c8f7681f9fd35e90de799ebd4cfdeab77a38f4ff6b3d8c0d9"
+ "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
+-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+-"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+-"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"
+-"checksum utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd70f467df6810094968e2fce0ee1bd0e87157aceb026a8c083bcf5e25b9efe4"
+ "checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
+ "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+ "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+diff --git a/pairing/Cargo.toml b/pairing/Cargo.toml
+index 98725aa..dedce80 100644
+--- a/pairing/Cargo.toml
+++ b/pairing/Cargo.toml
+@@ -14,7 +14,6 @@ repository = "https://github.com/ebfull/pairing"
+ [dependencies]
+ rand = "0.4"
+ byteorder = "1"
+-clippy = { version = "0.0.200", optional = true }
+ 
+ [features]
+ unstable-features = ["expose-arith"]
+diff --git a/sapling-crypto/Cargo.toml b/sapling-crypto/Cargo.toml
+index 6e802f2..33e21bf 100644
+--- a/sapling-crypto/Cargo.toml
+++ b/sapling-crypto/Cargo.toml
+@@ -22,10 +22,6 @@ byteorder = "1"
+ git = "https://github.com/gtank/blake2-rfc"
+ rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9"
+ 
+-[dev-dependencies]
+-hex-literal = "0.1"
+-rust-crypto = "0.2"
+-
+ [features]
+ default = ["u128-support"]
+ u128-support = ["pairing/u128-support"]
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -870,7 +870,7 @@ HTML_FILE_EXTENSION    = .html
 # standard header. Note that when using a custom header you are responsible 
 # for the proper inclusion of any scripts and style sheets that doxygen 
 # needs, which is dependent on the configuration options used. 
-# It is adviced to generate a default header using "doxygen -w html 
+# It is advised to generate a default header using "doxygen -w html 
 # header.html footer.html stylesheet.css YourConfigFile" and then modify 
 # that header. Note that the header is subject to change so you typically 
 # have to redo this when upgrading to a newer version of doxygen or when
--- a/doc/authors.md
+++ b/doc/authors.md
@@ -1,63 +1,82 @@
 Zcash Contributors
 ==================

-Jack Grigg (601)
-Simon Liu (297)
-Sean Bowe (193)
-Daira Hopwood (102)
-Wladimir J. van der Laan (71)
+Jack Grigg (843)
+Simon Liu (420)
+Sean Bowe (264)
+Daira Hopwood (110)
+Jay Graber (89)
+Wladimir J. van der Laan (81)
 Taylor Hornby (65)
-Jay Graber (61)
+Eirik Ogilvie-Wigley (60)
+Jonas Schnelli (58)
 Nathan Wilcox (56)
-Jonas Schnelli (49)
+Pieter Wuille (50)
 Kevin Gallagher (38)
-Cory Fields (30)
-Pieter Wuille (24)
+Cory Fields (35)
 syd (15)
+Matt Corallo (13)
+Larry Ruane (11)
+mdr0id (10)
+Paige Peterson (10)
+MarcoFalke (10)
+Jonathan "Duke" Leto (10)
 nomnombtc (9)
-Paige Peterson (9)
-Matt Corallo (9)
+kozyilmaz (8)
 fanquake (8)
-MarcoFalke (7)
+Jeff Garzik (7)
+Gregory Maxwell (7)
+Ariel Gabizon (7)
 Luke Dashjr (6)
+David Mercer (6)
+Daniel Cousens (6)
+Pavel Janík (5)
+Karl-Johan Alm (5)
 Johnathan Corgan (5)
-Gregory Maxwell (5)
-Ariel Gabizon (5)
-kozyilmaz (4)
+WO (4)
 Philip Kaufmann (4)
 Peter Todd (4)
 Patrick Strateman (4)
-Karl-Johan Alm (4)
+Marius Kjærstad (4)
+João Barbosa (4)
 Jorge Timón (4)
-Jeff Garzik (4)
-David Mercer (4)
-Daniel Cousens (4)
+Duke Leto (4)
 lpescher (3)
 Suhas Daftuar (3)
-Pavel Janík (3)
-João Barbosa (3)
+Per Grön (3)
+Patick Strateman (3)
+Jason Davies (3)
+James O'Beirne (3)
+Daniel Kraft (3)
 Ariel (3)
 Alfie John (3)
 str4d (2)
+rofl0r (2)
 paveljanik (2)
+mruddy (2)
 kpcyrd (2)
+ca333 (2)
 aniemerg (2)
+UdjinM6 (2)
 Scott (2)
 Robert C. Seacord (2)
-Per Grön (2)
+Pejvan (2)
+Pavol Rusnak (2)
 Pavel Vasin (2)
+Matthew King (2)
+Kaz Wesley (2)
 Joe Turgeon (2)
-Jason Davies (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
+George Tankersley (2)
 Gavin Andresen (2)
-Daniel Kraft (2)
+Brad Miller (2)
 Bjorn Hjortsberg (2)
 Amgad Abdelhafez (2)
+Alex Morcos (2)
 zathras-crypto (1)
 unsystemizer (1)
 practicalswift (1)
-mruddy (1)
 mrbandrews (1)
 kazcw (1)
 jc (1)
@@ -68,11 +87,18 @@ dexX7 (1)
 daniel (1)
 calebogden (1)
 ayleph (1)
+Za Wilcox (1)
 Tom Ritter (1)
+Tom Harding (1)
 Stephen (1)
 S. Matthew English (1)
 Ross Nicoll (1)
+Richard Littauer (1)
 René Nyffenegger (1)
+R E Broadley (1)
+Puru (1)
+Peter Pratscher (1)
+Pedro Branco (1)
 Paul Georgiou (1)
 Paragon Initiative Enterprises, LLC (1)
 Nicolas DORIER (1)
@@ -81,13 +107,13 @@ Murilo Santana (1)
 Maxwell Gubler (1)
 Matt Quinn (1)
 Mark Friedenbach (1)
-Marius Kjærstad (1)
 Louis Nyffenegger (1)
 Leo Arias (1)
+Lauda (1)
 Lars-Magnus Skog (1)
 Kevin Pan (1)
-Jonathan "Duke" Leto (1)
 Jonas Nick (1)
+Jeremy Rubin (1)
 Jeffrey Walton (1)
 Ian Kelling (1)
 Gaurav Rana (1)
@@ -95,9 +121,12 @@ Forrest Voight (1)
 Florian Schmaus (1)
 Ethan Heilman (1)
 Eran Tromer (1)
-Duke Leto (1)
+Dimitris Apostolou (1)
+David Llop (1)
 Christian von Roques (1)
 Chirag Davé (1)
+Charlie OKeefe (1)
+Charlie O'Keefe (1)
 Casey Rodarmor (1)
 Cameron Boehmer (1)
 Bryan Stitt (1)
@@ -109,7 +138,6 @@ Ashley Holman (1)
 Anthony Towns (1)
 Allan Niemerg (1)
 Alex van der Peet (1)
-Alex Morcos (1)
 Alex (1)
 Adam Weiss (1)
 Adam Brown (1)
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -0,0 +1,4 @@
+BIPs that are implemented by Zcash (up-to-date up to **v1.1.0**):
+
+* Numerous historic BIPs were present in **v1.0.0** at launch; see [the protocol spec](https://github.com/zcash/zips/blob/master/protocol/protocol.pdf) for details.
+* [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, but only enforced for peer versions `>=170004` as of **v1.1.0** ([PR #2814](https://github.com/zcash/zcash/pull/2814)).
--- a/Show More
+++ b/Show More