From d974a5c0e42d3bab35f00adc2dca867644b52be5 Mon Sep 17 00:00:00 2001
From: Asher Dawes <asher.dawes@gmail.com>
Date: Thu, 13 Sep 2018 12:54:52 -0700
Subject: [PATCH 01/18] Update verus

fixed path for komodo-cli
---
 src/verus | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/verus b/src/verus
index 8f6f56892..443633e3c 100755
--- a/src/verus
+++ b/src/verus
@@ -1,2 +1,2 @@
 #!/bin/bash
-komodo-cli -ac_name=VRSC "$@"
+./komodo-cli -ac_name=VRSC "$@"

From e7ff7048c0f9e0b9cc7f94278a5b263b4db62ad0 Mon Sep 17 00:00:00 2001
From: Asher Dawes <asher.dawes@gmail.com>
Date: Sun, 14 Oct 2018 20:58:38 -0700
Subject: [PATCH 02/18] Fetching zcash sapling params

---
 kmd/windows/verus-cli/fetch-params.bat | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/kmd/windows/verus-cli/fetch-params.bat b/kmd/windows/verus-cli/fetch-params.bat
index b7b95ff82..8b14b1845 100644
--- a/kmd/windows/verus-cli/fetch-params.bat
+++ b/kmd/windows/verus-cli/fetch-params.bat
@@ -12,10 +12,21 @@ IF NOT EXIST %APPDATA%\ZcashParams\sprout-verifying.key (
     ECHO Downloading Zcash trusted setup sprout-verifying.key, this may take a while ...
     .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-verifying.key -O %APPDATA%\ZcashParams\sprout-verifying.key
 )
+IF NOT EXIST %APPDATA%\ZcashParams\sapling-spend.params (
+    ECHO Downloading Zcash trusted setup sprout-proving.key, this may take a while ...
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sapling-spend.params -O %APPDATA%\ZcashParams\sapling-spend.params
+)
+IF NOT EXIST %APPDATA%\ZcashParams\sapling-output.params (
+    ECHO Downloading Zcash trusted setup sprout-verifying.key, this may take a while ...
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sapling-output.params -O %APPDATA%\ZcashParams\sapling-output.params
+)
+IF NOT EXIST %APPDATA%\ZcashParams\sprout-groth16.params (
+    ECHO Downloading Zcash trusted setup sprout-verifying.key, this may take a while ...
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-groth16.params -O %APPDATA%\ZcashParams\sprout-groth16.params
+)
 goto :EOF
 :GET_CURRENT_DIR
 pushd %~dp0
 set THIS_DIR=%CD%
 popd
 goto :EOF
-

From db2a0ee777776f8887ae3e767ff77060af6f4d51 Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Sun, 14 Oct 2018 21:08:15 -0700
Subject: [PATCH 03/18] Updating versions

---
 .gitlab-ci.yml                   |  2 +-
 kmd/linux/verus-cli/README.txt   |  2 +-
 kmd/linux/verus-cli/fetch-params | 70 ++++++++++++++++++++++++--------
 kmd/mac/verus-cli/README.txt     |  2 +-
 kmd/windows/verus-cli/README.txt |  2 +-
 5 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8941fdcfc..f56c24c71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 
 variables:
-  VERSION: 0.3.14
+  VERSION: 0.4.0
   VERUS_CLI_LINUX: "Verus-CLI-Linux-v${VERSION}-beta.tar.gz"
   VERUS_CLI_WINDOWS: "Verus-CLI-Windows-v${VERSION}-beta.zip"
   VERUS_CLI_MACOS: "Verus-CLI-MacOS-v${VERSION}-beta.tar.gz"
diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt
index eed1a1c91..4ddd78c7e 100644
--- a/kmd/linux/verus-cli/README.txt
+++ b/kmd/linux/verus-cli/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.3.13-beta
+VerusCoin Command Line Tools v0.4.0-beta
 
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon
diff --git a/kmd/linux/verus-cli/fetch-params b/kmd/linux/verus-cli/fetch-params
index 10bade7cb..fd602b858 100644
--- a/kmd/linux/verus-cli/fetch-params
+++ b/kmd/linux/verus-cli/fetch-params
@@ -2,10 +2,17 @@
 
 set -eu
 
-PARAMS_DIR="$HOME/.zcash-params"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    PARAMS_DIR="$HOME/Library/Application Support/ZcashParams"
+else
+    PARAMS_DIR="$HOME/.zcash-params"
+fi
 
 SPROUT_PKEY_NAME='sprout-proving.key'
 SPROUT_VKEY_NAME='sprout-verifying.key'
+SAPLING_SPEND_NAME='sapling-spend.params'
+SAPLING_OUTPUT_NAME='sapling-output.params'
+SAPLING_SPROUT_GROTH16_NAME='sprout-groth16.params'
 SPROUT_URL="https://z.cash/downloads"
 SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo"
 
@@ -14,10 +21,12 @@ SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')"
 
 WGETCMD="$(command -v wget || echo '')"
 IPFSCMD="$(command -v ipfs || echo '')"
+CURLCMD="$(command -v curl || echo '')"
 
 # fetch methods can be disabled with ZC_DISABLE_SOMETHING=1
 ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}"
 ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}"
+ZC_DISABLE_CURL="${ZC_DISABLE_CURL:-}"
 
 function fetch_wget {
     if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then
@@ -28,7 +37,6 @@ function fetch_wget {
     local dlname="$2"
 
     cat <<EOF
-
 Retrieving (wget): $SPROUT_URL/$filename
 EOF
 
@@ -49,22 +57,38 @@ function fetch_ipfs {
     local dlname="$2"
 
     cat <<EOF
-
 Retrieving (ipfs): $SPROUT_IPFS/$filename
 EOF
 
     ipfs get --output "$dlname" "$SPROUT_IPFS/$filename"
 }
 
+function fetch_curl {
+    if [ -z "$CURLCMD" ] || ! [ -z "$ZC_DISABLE_CURL" ]; then
+        return 1
+    fi
+
+    local filename="$1"
+    local dlname="$2"
+
+    cat <<EOF
+Retrieving (curl): $SPROUT_URL/$filename
+EOF
+
+    curl \
+        --output "$dlname" \
+        -# -L -C - \
+        "$SPROUT_URL/$filename"
+
+}
+
 function fetch_failure {
     cat >&2 <<EOF
-
 Failed to fetch the Zcash zkSNARK parameters!
 Try installing one of the following programs and make sure you're online:
-
  * ipfs
  * wget
-
+ * curl
 EOF
     exit 1
 }
@@ -77,7 +101,7 @@ function fetch_params {
 
     if ! [ -f "$output" ]
     then
-        for method in wget ipfs failure; do
+        for method in wget ipfs curl failure; do
             if "fetch_$method" "$filename" "$dlname"; then
                 echo "Download successful!"
                 break
@@ -102,12 +126,20 @@ EOF
 # Use flock to prevent parallel execution.
 function lock() {
     local lockfile=/tmp/fetch_params.lock
-    # create lock file
-    eval "exec 200>/$lockfile"
-    # acquire the lock
-    flock -n 200 \
-        && return 0 \
-        || return 1
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        if shlock -f ${lockfile} -p $$; then
+            return 0
+        else
+            return 1
+        fi
+    else
+        # create lock file
+        eval "exec 200>$lockfile"
+        # acquire the lock
+        flock -n 200 \
+            && return 0 \
+            || return 1
+    fi
 }
 
 function exit_locked_error {
@@ -122,10 +154,8 @@ function main() {
 
     cat <<EOF
 Zcash - fetch-params.sh
-
 This script will fetch the Zcash zkSNARK parameters and verify their
 integrity with sha256sum.
-
 If they already exist locally, it will exit now and do nothing else.
 EOF
 
@@ -147,19 +177,23 @@ EOF
 The parameters are currently just under 911MB in size, so plan accordingly
 for your bandwidth constraints. If the files are already present and
 have the correct sha256sum, no networking is used.
-
 Creating params directory. For details about this directory, see:
 $README_PATH
-
 EOF
     fi
 
     cd "$PARAMS_DIR"
 
+    # Sprout parameters:
     fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
     fetch_params "$SPROUT_VKEY_NAME" "$PARAMS_DIR/$SPROUT_VKEY_NAME" "4bd498dae0aacfd8e98dc306338d017d9c08dd0918ead18172bd0aec2fc5df82"
+
+    # Sapling parameters:
+    fetch_params "$SAPLING_SPEND_NAME" "$PARAMS_DIR/$SAPLING_SPEND_NAME" "8e48ffd23abb3a5fd9c5589204f32d9c31285a04b78096ba40a79b75677efc13"
+    fetch_params "$SAPLING_OUTPUT_NAME" "$PARAMS_DIR/$SAPLING_OUTPUT_NAME" "2f0ebbcbb9bb0bcffe95a397e7eba89c29eb4dde6191c339db88570e3f3fb0e4"
+    fetch_params "$SAPLING_SPROUT_GROTH16_NAME" "$PARAMS_DIR/$SAPLING_SPROUT_GROTH16_NAME" "b685d700c60328498fbde589c8c7c484c722b788b265b72af448a5bf0ee55b50"
 }
 
 main
 rm -f /tmp/fetch_params.lock
-exit 0
+exit 0
\ No newline at end of file
diff --git a/kmd/mac/verus-cli/README.txt b/kmd/mac/verus-cli/README.txt
index 3bb23f3e7..23ea44f2a 100644
--- a/kmd/mac/verus-cli/README.txt
+++ b/kmd/mac/verus-cli/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.3.13-beta
+VerusCoin Command Line Tools v0.4.0-beta
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon.
 komodo-cli - VerusCoin's enhanced Komodo command line utility.
diff --git a/kmd/windows/verus-cli/README.txt b/kmd/windows/verus-cli/README.txt
index c7d80087b..1d3e7c812 100644
--- a/kmd/windows/verus-cli/README.txt
+++ b/kmd/windows/verus-cli/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.3.13-beta
+VerusCoin Command Line Tools v0.4.0-beta
 Contents:
 komodod.exe - VerusCoin's enhanced Komodo daemon
 komodo-cli.exe - VerusCoin's Komodo command line utility

From 63713e5567ccee98d299f10abffdfecea1948426 Mon Sep 17 00:00:00 2001
From: David Dawes <davidd@remitly.com>
Date: Sun, 14 Oct 2018 21:23:03 -0700
Subject: [PATCH 04/18] Force unsigned 64 bit, not u32.

---
 src/snark/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snark/Makefile b/src/snark/Makefile
index f957ab12e..7bcae4c94 100644
--- a/src/snark/Makefile
+++ b/src/snark/Makefile
@@ -16,7 +16,7 @@ endif
 # To override these, use "make OPTFLAGS=..." etc.
 CURVE = BN128
 OPTFLAGS = -O2 -march=x86-64 -g -mtune=x86-64
-FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT
+FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT -D__SIZE_TYPE__="unsigned long long"
 
 # Initialize this using "CXXFLAGS=... make". The makefile appends to that.
 CXXFLAGS += -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-comment -Wfatal-errors $(OPTFLAGS) $(FEATUREFLAGS) -DCURVE_$(CURVE)

From 098c8f6fd23f96ec13f120a7f8a2c13e75328880 Mon Sep 17 00:00:00 2001
From: David Dawes <davidd@remitly.com>
Date: Sun, 14 Oct 2018 21:28:27 -0700
Subject: [PATCH 05/18] On second thought make it Mac only, leave Linux  Win
 alone.

---
 src/snark/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/snark/Makefile b/src/snark/Makefile
index 7bcae4c94..3ef82ab87 100644
--- a/src/snark/Makefile
+++ b/src/snark/Makefile
@@ -16,7 +16,12 @@ endif
 # To override these, use "make OPTFLAGS=..." etc.
 CURVE = BN128
 OPTFLAGS = -O2 -march=x86-64 -g -mtune=x86-64
-FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT -D__SIZE_TYPE__="unsigned long long"
+
+ifneq ($(PLATFORM),darwin)
+	FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT
+else
+	FEATUREFLAGS = -DUSE_ASM -DMONTGOMERY_OUTPUT -D__SIZE_TYPE__="unsigned long long"
+endif
 
 # Initialize this using "CXXFLAGS=... make". The makefile appends to that.
 CXXFLAGS += -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-comment -Wfatal-errors $(OPTFLAGS) $(FEATUREFLAGS) -DCURVE_$(CURVE)

From 77d1ded7cca4eff5d78f090cf5befbb81918249f Mon Sep 17 00:00:00 2001
From: David Dawes <davidd@remitly.com>
Date: Sun, 14 Oct 2018 22:20:13 -0700
Subject: [PATCH 06/18] Use the 64 bit reverser, the only one provided.

---
 src/snark/libsnark/common/utils.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snark/libsnark/common/utils.hpp b/src/snark/libsnark/common/utils.hpp
index 4b036a859..c4ce26735 100644
--- a/src/snark/libsnark/common/utils.hpp
+++ b/src/snark/libsnark/common/utils.hpp
@@ -25,7 +25,7 @@ size_t log2(size_t n);
 
 inline size_t exp2(size_t k) { return UINT64_C(1) << k; }
 
-size_t bitreverse(size_t n, const size_t l);
+uint64_t bitreverse(uint64_t n, const uint64_t l);
 bit_vector int_list_to_bits(const std::initializer_list<uint64_t> &l, const size_t wordsize);
 int64_t div_ceil(int64_t x, int64_t y);
 

From 722cd7949723d5fdba7625975a5a573d61dab897 Mon Sep 17 00:00:00 2001
From: Asher Dawes <asher.dawes@gmail.com>
Date: Mon, 15 Oct 2018 08:47:09 -0700
Subject: [PATCH 07/18] Updating version

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7f400f9f5..af1d26195 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-## VerusCoin version 0.3.13-beta
+## VerusCoin version 0.4.0-beta
 
 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).
 - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/)
 - [VerusCoin Explorer](https://explorer.veruscoin.io/)
 
-Version 0.3.13-beta has portable mining working.
 
 ## Komodo with Bitcore
 This version of Komodo contains Bitcore support for komodo and all its assetchains.

From 522c4984e0be2616dd3649a4838e583168b9b827 Mon Sep 17 00:00:00 2001
From: Asher Dawes <asher.dawes@gmail.com>
Date: Tue, 16 Oct 2018 18:39:33 -0700
Subject: [PATCH 08/18] Updating CI config (#135)

---
 .gitlab-ci.yml                                | 149 ++++++-------
 README.md                                     |   2 +-
 .../man/verus-cli/linux}/README.txt           |   2 +-
 .../man/verus-cli/mac}/README.txt             |   2 +-
 .../man/verus-cli/windows}/README.txt         |   2 +-
 kmd/linux/verus-cli/fetch-params              | 199 ------------------
 kmd/linux/verus-cli/verus                     |   5 -
 kmd/linux/verus-cli/verusd                    |   4 -
 kmd/mac/verus-cli/fetch-params                | 199 ------------------
 kmd/mac/verus-cli/verus                       |   7 -
 kmd/mac/verus-cli/verusd                      |   6 -
 makeReleaseLinux.sh                           |   8 -
 makeReleaseMac.sh                             |  56 ++---
 src/verus                                     |   2 +-
 {kmd/windows/verus-cli => src}/verus.bat      |   0
 {kmd/windows/verus-cli => src}/verusd.bat     |   0
 .../verus-cli => zcutil}/fetch-params.bat     |   0
 {kmd/windows/verus-cli => zcutil}/wget64.exe  | Bin
 18 files changed, 111 insertions(+), 532 deletions(-)
 rename {kmd/linux/verus-cli => doc/man/verus-cli/linux}/README.txt (92%)
 rename {kmd/mac/verus-cli => doc/man/verus-cli/mac}/README.txt (96%)
 rename {kmd/windows/verus-cli => doc/man/verus-cli/windows}/README.txt (97%)
 delete mode 100644 kmd/linux/verus-cli/fetch-params
 delete mode 100755 kmd/linux/verus-cli/verus
 delete mode 100755 kmd/linux/verus-cli/verusd
 delete mode 100644 kmd/mac/verus-cli/fetch-params
 delete mode 100755 kmd/mac/verus-cli/verus
 delete mode 100755 kmd/mac/verus-cli/verusd
 delete mode 100755 makeReleaseLinux.sh
 rename {kmd/windows/verus-cli => src}/verus.bat (100%)
 rename {kmd/windows/verus-cli => src}/verusd.bat (100%)
 rename {kmd/windows/verus-cli => zcutil}/fetch-params.bat (100%)
 rename {kmd/windows/verus-cli => zcutil}/wget64.exe (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f56c24c71..59a877a07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,16 @@ stages:
 
 
 variables:
-  VERSION: 0.4.0
-  VERUS_CLI_LINUX: "Verus-CLI-Linux-v${VERSION}-beta.tar.gz"
-  VERUS_CLI_WINDOWS: "Verus-CLI-Windows-v${VERSION}-beta.zip"
-  VERUS_CLI_MACOS: "Verus-CLI-MacOS-v${VERSION}-beta.tar.gz"
-  POST_COMMENT: "Branch and Commit: ${CI_COMMIT_REF_NAME} ${CI_COMMIT_SHA} $'\n'MD5: "
+  VERSION: 0.4.1
+  VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
+  VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip
+  VERUS_CLI_MACOS: Verus-CLI-MacOS-v${VERSION}.tar.gz
+  DOWNSTREAM_AGAMA_BRANCH: ${CI_COMMIT_REF_NAME}
+  POST_MESSAGE: "Source: ${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}\n
+  Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
+  Commit: ${CI_COMMIT_SHA}$\n
+  Author:  ${GITLAB_USER_NAME} <${GITLAB_USER_EMAIL}>\n
+  ${CI_COMMIT_MESSAGE}"
 
 
 build:linux:
@@ -17,43 +22,42 @@ build:linux:
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
-  before_script: # Setup Cache
-  - rm -rf /root/.ccache || true
-  - mv .ccache /root/ || true
-  script:
-  - zcutil/build.sh -j$(nproc)
-  - cp src/komodod src/komodo-cli kmd/linux/verus-cli
-  - chmod +x kmd/linux/verus-cli/komodod
-  - chmod +x kmd/linux/verus-cli/komodo-cli
-  - chmod +x kmd/linux/verus-cli/verus
-  - chmod +x kmd/linux/verus-cli/verusd
-  - chmod +x kmd/linux/verus-cli/fetch-params
-  - dos2unix kmd/linux/verus-cli/README.txt
-  - cd kmd/linux/
-  - tar -czvf $VERUS_CLI_LINUX verus-cli
-  - mv $VERUS_CLI_LINUX ../..
-  - cd  ../..
-  - export VERUS_CLI_LINUX_MD5=$(md5sum $VERUS_CLI_LINUX | cut -d " " -f 1)
-  - curl -F file=@"$VERUS_CLI_LINUX"
-      -F channels="$CLI_POST_CHANNEL"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_LINUX_MD5"
-      -H "${SLACK_BOT_AUTH}"
-      "https://slack.com/api/files.upload"
-  after_script:
-  - mv /root/.ccache ./ || true
   cache:
     key: ${CI_JOB_NAME}
     paths:
     - depends/built
-    - .ccache
+  script:
+  - zcutil/build.sh -j$(nproc)
+  - mkdir verus-cli
+  - cp src/komodod
+    src/komodo-cli
+    src/verus
+    src/verusd
+    doc/man/verus-cli/linux/README.txt
+    zcutil/fetch-params.sh
+    verus-cli
+  - mv verus-cli/fetch-params.sh verus-cli/fetch-params
+  - chmod +x verus-cli/komodod
+  - chmod +x verus-cli/komodo-cli
+  - chmod +x verus-cli/verus
+  - chmod +x verus-cli/verusd
+  - chmod +x verus-cli/fetch-params
+  - tar -czvf ${VERUS_CLI_LINUX} verus-cli
+  - md5sum ${VERUS_CLI_LINUX} > ${VERUS_CLI_LINUX}.md5
+  - curl -F file=@"${VERUS_CLI_LINUX}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
+      -H "${SLACK_BOT_AUTH}"
+      "https://slack.com/api/files.upload"
   artifacts:
     paths:
-    - $VERUS_CLI_LINUX
+    - ${VERUS_CLI_LINUX}
+    - ${VERUS_CLI_LINUX}.md5
     expire_in: 1 week
 
 
 build:windows:
-  image: asherd/veruscoin-cross-compiler:latest
+  image: asherd/veruscoin-cross-compiler:windows
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
@@ -61,29 +65,27 @@ build:windows:
     key: ${CI_JOB_NAME}
     paths:
     - depends/built
-    - .ccache
-    - .cargo
-  before_script:
-  - mkdir .ccache  || echo ccache exists
-  - ln -s $PWD/.ccache /root/.ccache
-  - mkdir .zcash-params || echo zcash-params exists
-  - mkdir .cargo || echo .cargo exists
-  - ln -s $PWD/.cargo /root/.cargo
   script:
   - zcutil/build-win.sh -j$(nproc)
-  - cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli
-  - cd kmd/windows/
-  - zip -r $VERUS_CLI_WINDOWS verus-cli
-  - mv $VERUS_CLI_WINDOWS ../..
-  - cd  ../..
-  - export VERUS_CLI_WINDOWS_MD5=$(md5sum $VERUS_CLI_WINDOWS | cut -d " " -f 1)
-  - curl -F file=@"$VERUS_CLI_WINDOWS"
-      -F channels="$CLI_POST_CHANNEL"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_WINDOWS_MD5"
+  - mkdir verus-cli
+  - cp src/komodod.exe
+    src/komodo-cli.exe
+    src/komodo-tx.exe
+    doc/man/verus-cli/windows/README.txt
+    zcutil/fetch-params.bat
+    zcutil/wget64.exe
+    verus-cli
+  - zip -r ${VERUS_CLI_WINDOWS} verus-cli
+  - md5sum ${VERUS_CLI_WINDOWS} > ${VERUS_CLI_WINDOWS}.md5
+  - curl -F file=@"${VERUS_CLI_WINDOWS}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
       -H "${SLACK_BOT_AUTH}"
       "https://slack.com/api/files.upload"
   artifacts:
-    paths: [$VERUS_CLI_WINDOWS]
+    paths:
+    - ${VERUS_CLI_WINDOWS}
+    - ${VERUS_CLI_WINDOWS}.md5
     expire_in: 1 week
 
 
@@ -96,18 +98,19 @@ build:mac:
     - depends/built
   script:
   - brew bundle
-  - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu) | xcpretty
+  - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
   - ./makeReleaseMac.sh
-  - dos2unix kmd/mac/verus-cli/README.txt
-  - tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS verus-cli ./
-  - export VERUS_CLI_MACOS_MD5=$(md5sum $VERUS_CLI_MACOS | cut -d " " -f 1)
-  - curl -F file=@"$VERUS_CLI_MACOS"
-      -F channels="$CLI_POST_CHANNEL"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_MACOS_MD5"
+  - tar -czvf ${VERUS_CLI_MACOS} verus-cli
+  - md5sum ${VERUS_CLI_MACOS} > ${VERUS_CLI_MACOS}.md5
+  - curl -F file=@"${VERUS_CLI_MACOS}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
       -H "${SLACK_BOT_AUTH}"
       "https://slack.com/api/files.upload"
   artifacts:
-    paths: [$VERUS_CLI_MACOS]
+    paths:
+    - ${VERUS_CLI_MACOS}
+    - ${VERUS_CLI_MACOS}.md5
     expire_in: 1 week
 
 
@@ -169,11 +172,11 @@ build:mac:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget g++-multilib libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl3 python
   - rm -rf /root/.komodo || true
   - mv .komodo /root/ || true
   script:
-  - tar -xzvf $VERUS_CLI_LINUX
+  - tar -xzvf ${VERUS_CLI_LINUX}
   - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
   - python qa/verus-cli-tests/verus-cli-tester.py
   after_script:
@@ -194,11 +197,11 @@ build:mac:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget g++-multilib libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl3 python
   - rm -rf /root/.komodo || true
   - mv .komodo /root/ || true
   script:
-  - tar -xzvf $VERUS_CLI_LINUX
+  - tar -xzvf ${VERUS_CLI_LINUX}
   - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
   - python qa/verus-cli-tests/verus-cli-tester.py
   after_script:
@@ -213,7 +216,7 @@ build:mac:
   - build:linux
 
 
-.osx:sierra: # fetch-params.sh needs to be fixed for MacOS
+.macos:sierra: # fetch-params.sh needs to be fixed for MacOS
   stage: test
   tags: ["Sierra"]
   script:
@@ -227,11 +230,11 @@ build:mac:
   - build:mac
 
 
-.osx:high-sierra: # fetch-params.sh needs to be fixed for MacOS
+.macos:high-sierra:
   stage: test
   tags: ["High Sierra"]
   script:
-  - tar -xzvf $VERUS_CLI_MACOS
+  - tar -xzvf ${VERUS_CLI_MACOS}
   - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
   - python qa/verus-cli-tests/verus-cli-tester.py
   artifacts:
@@ -266,18 +269,18 @@ deploy:
   - build:mac
   script:
   - mkdir Windows && mkdir Linux && mkdir MacOS &&
-    mv $VERUS_CLI_WINDOWS Windows &&
-    mv $VERUS_CLI_LINUX Linux &&
-    mv $VERUS_CLI_MACOS MacOS
+    mv ${VERUS_CLI_WINDOWS} Windows &&
+    mv ${VERUS_CLI_LINUX} Linux &&
+    mv ${VERUS_CLI_MACOS} MacOS
   - echo "$AUTH_KEY" > AUTH_KEY.json &&
     gcloud auth activate-service-account
     --key-file AUTH_KEY.json
   - gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
   - curl -X POST
       -F token="$CI_JOB_TOKEN"
-      -F ref=dev
-      -F variables\[UPSTREAM_CLI_BRANCH\]="$CI_COMMIT_REF_NAME"
-      -F variables\[VERUS_CLI_LINUX\]="$VERUS_CLI_LINUX"
-      -F variables\[VERUS_CLI_WINDOWS\]="$VERUS_CLI_WINDOWS"
-      -F variables\[VERUS_CLI_MACOS\]="$VERUS_CLI_MACOS"
+      -F ref="$DOWNSTREAM_AGAMA_BRANCH"
+      -F variables\[UPSTREAM_TRIGGER_INFO\]="${POST_MESSAGE}"
+      -F variables\[VERUS_CLI_LINUX\]="${VERUS_CLI_LINUX}"
+      -F variables\[VERUS_CLI_WINDOWS\]="${VERUS_CLI_WINDOWS}"
+      -F variables\[VERUS_CLI_MACOS\]="${VERUS_CLI_MACOS}"
       "https://gitlab.com/api/v4/projects/8018592/trigger/pipeline"
diff --git a/README.md b/README.md
index af1d26195..620f71684 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## VerusCoin version 0.4.0-beta
+## VerusCoin version 0.4.1
 
 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).
 - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/)
diff --git a/kmd/linux/verus-cli/README.txt b/doc/man/verus-cli/linux/README.txt
similarity index 92%
rename from kmd/linux/verus-cli/README.txt
rename to doc/man/verus-cli/linux/README.txt
index 4ddd78c7e..991b187c2 100644
--- a/kmd/linux/verus-cli/README.txt
+++ b/doc/man/verus-cli/linux/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.0-beta
+VerusCoin Command Line Tools v0.4.1
 
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon
diff --git a/kmd/mac/verus-cli/README.txt b/doc/man/verus-cli/mac/README.txt
similarity index 96%
rename from kmd/mac/verus-cli/README.txt
rename to doc/man/verus-cli/mac/README.txt
index 23ea44f2a..dff8c2b36 100644
--- a/kmd/mac/verus-cli/README.txt
+++ b/doc/man/verus-cli/mac/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.0-beta
+VerusCoin Command Line Tools v0.4.1
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon.
 komodo-cli - VerusCoin's enhanced Komodo command line utility.
diff --git a/kmd/windows/verus-cli/README.txt b/doc/man/verus-cli/windows/README.txt
similarity index 97%
rename from kmd/windows/verus-cli/README.txt
rename to doc/man/verus-cli/windows/README.txt
index 1d3e7c812..e3f419a96 100644
--- a/kmd/windows/verus-cli/README.txt
+++ b/doc/man/verus-cli/windows/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.0-beta
+VerusCoin Command Line Tools v0.4.1
 Contents:
 komodod.exe - VerusCoin's enhanced Komodo daemon
 komodo-cli.exe - VerusCoin's Komodo command line utility
diff --git a/kmd/linux/verus-cli/fetch-params b/kmd/linux/verus-cli/fetch-params
deleted file mode 100644
index fd602b858..000000000
--- a/kmd/linux/verus-cli/fetch-params
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PARAMS_DIR="$HOME/Library/Application Support/ZcashParams"
-else
-    PARAMS_DIR="$HOME/.zcash-params"
-fi
-
-SPROUT_PKEY_NAME='sprout-proving.key'
-SPROUT_VKEY_NAME='sprout-verifying.key'
-SAPLING_SPEND_NAME='sapling-spend.params'
-SAPLING_OUTPUT_NAME='sapling-output.params'
-SAPLING_SPROUT_GROTH16_NAME='sprout-groth16.params'
-SPROUT_URL="https://z.cash/downloads"
-SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo"
-
-SHA256CMD="$(command -v sha256sum || echo shasum)"
-SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')"
-
-WGETCMD="$(command -v wget || echo '')"
-IPFSCMD="$(command -v ipfs || echo '')"
-CURLCMD="$(command -v curl || echo '')"
-
-# fetch methods can be disabled with ZC_DISABLE_SOMETHING=1
-ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}"
-ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}"
-ZC_DISABLE_CURL="${ZC_DISABLE_CURL:-}"
-
-function fetch_wget {
-    if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then
-        return 1
-    fi
-
-    local filename="$1"
-    local dlname="$2"
-
-    cat <<EOF
-Retrieving (wget): $SPROUT_URL/$filename
-EOF
-
-    wget \
-        --progress=dot:giga \
-        --output-document="$dlname" \
-        --continue \
-        --retry-connrefused --waitretry=3 --timeout=30 \
-        "$SPROUT_URL/$filename"
-}
-
-function fetch_ipfs {
-    if [ -z "$IPFSCMD" ] || ! [ -z "$ZC_DISABLE_IPFS" ]; then
-        return 1
-    fi
-
-    local filename="$1"
-    local dlname="$2"
-
-    cat <<EOF
-Retrieving (ipfs): $SPROUT_IPFS/$filename
-EOF
-
-    ipfs get --output "$dlname" "$SPROUT_IPFS/$filename"
-}
-
-function fetch_curl {
-    if [ -z "$CURLCMD" ] || ! [ -z "$ZC_DISABLE_CURL" ]; then
-        return 1
-    fi
-
-    local filename="$1"
-    local dlname="$2"
-
-    cat <<EOF
-Retrieving (curl): $SPROUT_URL/$filename
-EOF
-
-    curl \
-        --output "$dlname" \
-        -# -L -C - \
-        "$SPROUT_URL/$filename"
-
-}
-
-function fetch_failure {
-    cat >&2 <<EOF
-Failed to fetch the Zcash zkSNARK parameters!
-Try installing one of the following programs and make sure you're online:
- * ipfs
- * wget
- * curl
-EOF
-    exit 1
-}
-
-function fetch_params {
-    local filename="$1"
-    local output="$2"
-    local dlname="${output}.dl"
-    local expectedhash="$3"
-
-    if ! [ -f "$output" ]
-    then
-        for method in wget ipfs curl failure; do
-            if "fetch_$method" "$filename" "$dlname"; then
-                echo "Download successful!"
-                break
-            fi
-        done
-
-        "$SHA256CMD" $SHA256ARGS -c <<EOF
-$expectedhash  $dlname
-EOF
-
-        # Check the exit code of the shasum command:
-        CHECKSUM_RESULT=$?
-        if [ $CHECKSUM_RESULT -eq 0 ]; then
-            mv -v "$dlname" "$output"
-        else
-            echo "Failed to verify parameter checksums!" >&2
-            exit 1
-        fi
-    fi
-}
-
-# Use flock to prevent parallel execution.
-function lock() {
-    local lockfile=/tmp/fetch_params.lock
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        if shlock -f ${lockfile} -p $$; then
-            return 0
-        else
-            return 1
-        fi
-    else
-        # create lock file
-        eval "exec 200>$lockfile"
-        # acquire the lock
-        flock -n 200 \
-            && return 0 \
-            || return 1
-    fi
-}
-
-function exit_locked_error {
-    echo "Only one instance of fetch-params.sh can be run at a time." >&2
-    exit 1
-}
-
-function main() {
-
-    lock fetch-params.sh \
-    || exit_locked_error
-
-    cat <<EOF
-Zcash - fetch-params.sh
-This script will fetch the Zcash zkSNARK parameters and verify their
-integrity with sha256sum.
-If they already exist locally, it will exit now and do nothing else.
-EOF
-
-    # Now create PARAMS_DIR and insert a README if necessary:
-    if ! [ -d "$PARAMS_DIR" ]
-    then
-        mkdir -p "$PARAMS_DIR"
-        README_PATH="$PARAMS_DIR/README"
-        cat >> "$README_PATH" <<EOF
-This directory stores common Zcash zkSNARK parameters. Note that it is
-distinct from the daemon's -datadir argument because the parameters are
-large and may be shared across multiple distinct -datadir's such as when
-setting up test networks.
-EOF
-
-        # This may be the first time the user's run this script, so give
-        # them some info, especially about bandwidth usage:
-        cat <<EOF
-The parameters are currently just under 911MB in size, so plan accordingly
-for your bandwidth constraints. If the files are already present and
-have the correct sha256sum, no networking is used.
-Creating params directory. For details about this directory, see:
-$README_PATH
-EOF
-    fi
-
-    cd "$PARAMS_DIR"
-
-    # Sprout parameters:
-    fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
-    fetch_params "$SPROUT_VKEY_NAME" "$PARAMS_DIR/$SPROUT_VKEY_NAME" "4bd498dae0aacfd8e98dc306338d017d9c08dd0918ead18172bd0aec2fc5df82"
-
-    # Sapling parameters:
-    fetch_params "$SAPLING_SPEND_NAME" "$PARAMS_DIR/$SAPLING_SPEND_NAME" "8e48ffd23abb3a5fd9c5589204f32d9c31285a04b78096ba40a79b75677efc13"
-    fetch_params "$SAPLING_OUTPUT_NAME" "$PARAMS_DIR/$SAPLING_OUTPUT_NAME" "2f0ebbcbb9bb0bcffe95a397e7eba89c29eb4dde6191c339db88570e3f3fb0e4"
-    fetch_params "$SAPLING_SPROUT_GROTH16_NAME" "$PARAMS_DIR/$SAPLING_SPROUT_GROTH16_NAME" "b685d700c60328498fbde589c8c7c484c722b788b265b72af448a5bf0ee55b50"
-}
-
-main
-rm -f /tmp/fetch_params.lock
-exit 0
\ No newline at end of file
diff --git a/kmd/linux/verus-cli/verus b/kmd/linux/verus-cli/verus
deleted file mode 100755
index 5ba1e0721..000000000
--- a/kmd/linux/verus-cli/verus
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-./komodo-cli -ac_name=VRSC "$@"
diff --git a/kmd/linux/verus-cli/verusd b/kmd/linux/verus-cli/verusd
deleted file mode 100755
index ece180c12..000000000
--- a/kmd/linux/verus-cli/verusd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 "$@"
diff --git a/kmd/mac/verus-cli/fetch-params b/kmd/mac/verus-cli/fetch-params
deleted file mode 100644
index fd602b858..000000000
--- a/kmd/mac/verus-cli/fetch-params
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PARAMS_DIR="$HOME/Library/Application Support/ZcashParams"
-else
-    PARAMS_DIR="$HOME/.zcash-params"
-fi
-
-SPROUT_PKEY_NAME='sprout-proving.key'
-SPROUT_VKEY_NAME='sprout-verifying.key'
-SAPLING_SPEND_NAME='sapling-spend.params'
-SAPLING_OUTPUT_NAME='sapling-output.params'
-SAPLING_SPROUT_GROTH16_NAME='sprout-groth16.params'
-SPROUT_URL="https://z.cash/downloads"
-SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo"
-
-SHA256CMD="$(command -v sha256sum || echo shasum)"
-SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')"
-
-WGETCMD="$(command -v wget || echo '')"
-IPFSCMD="$(command -v ipfs || echo '')"
-CURLCMD="$(command -v curl || echo '')"
-
-# fetch methods can be disabled with ZC_DISABLE_SOMETHING=1
-ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}"
-ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}"
-ZC_DISABLE_CURL="${ZC_DISABLE_CURL:-}"
-
-function fetch_wget {
-    if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then
-        return 1
-    fi
-
-    local filename="$1"
-    local dlname="$2"
-
-    cat <<EOF
-Retrieving (wget): $SPROUT_URL/$filename
-EOF
-
-    wget \
-        --progress=dot:giga \
-        --output-document="$dlname" \
-        --continue \
-        --retry-connrefused --waitretry=3 --timeout=30 \
-        "$SPROUT_URL/$filename"
-}
-
-function fetch_ipfs {
-    if [ -z "$IPFSCMD" ] || ! [ -z "$ZC_DISABLE_IPFS" ]; then
-        return 1
-    fi
-
-    local filename="$1"
-    local dlname="$2"
-
-    cat <<EOF
-Retrieving (ipfs): $SPROUT_IPFS/$filename
-EOF
-
-    ipfs get --output "$dlname" "$SPROUT_IPFS/$filename"
-}
-
-function fetch_curl {
-    if [ -z "$CURLCMD" ] || ! [ -z "$ZC_DISABLE_CURL" ]; then
-        return 1
-    fi
-
-    local filename="$1"
-    local dlname="$2"
-
-    cat <<EOF
-Retrieving (curl): $SPROUT_URL/$filename
-EOF
-
-    curl \
-        --output "$dlname" \
-        -# -L -C - \
-        "$SPROUT_URL/$filename"
-
-}
-
-function fetch_failure {
-    cat >&2 <<EOF
-Failed to fetch the Zcash zkSNARK parameters!
-Try installing one of the following programs and make sure you're online:
- * ipfs
- * wget
- * curl
-EOF
-    exit 1
-}
-
-function fetch_params {
-    local filename="$1"
-    local output="$2"
-    local dlname="${output}.dl"
-    local expectedhash="$3"
-
-    if ! [ -f "$output" ]
-    then
-        for method in wget ipfs curl failure; do
-            if "fetch_$method" "$filename" "$dlname"; then
-                echo "Download successful!"
-                break
-            fi
-        done
-
-        "$SHA256CMD" $SHA256ARGS -c <<EOF
-$expectedhash  $dlname
-EOF
-
-        # Check the exit code of the shasum command:
-        CHECKSUM_RESULT=$?
-        if [ $CHECKSUM_RESULT -eq 0 ]; then
-            mv -v "$dlname" "$output"
-        else
-            echo "Failed to verify parameter checksums!" >&2
-            exit 1
-        fi
-    fi
-}
-
-# Use flock to prevent parallel execution.
-function lock() {
-    local lockfile=/tmp/fetch_params.lock
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        if shlock -f ${lockfile} -p $$; then
-            return 0
-        else
-            return 1
-        fi
-    else
-        # create lock file
-        eval "exec 200>$lockfile"
-        # acquire the lock
-        flock -n 200 \
-            && return 0 \
-            || return 1
-    fi
-}
-
-function exit_locked_error {
-    echo "Only one instance of fetch-params.sh can be run at a time." >&2
-    exit 1
-}
-
-function main() {
-
-    lock fetch-params.sh \
-    || exit_locked_error
-
-    cat <<EOF
-Zcash - fetch-params.sh
-This script will fetch the Zcash zkSNARK parameters and verify their
-integrity with sha256sum.
-If they already exist locally, it will exit now and do nothing else.
-EOF
-
-    # Now create PARAMS_DIR and insert a README if necessary:
-    if ! [ -d "$PARAMS_DIR" ]
-    then
-        mkdir -p "$PARAMS_DIR"
-        README_PATH="$PARAMS_DIR/README"
-        cat >> "$README_PATH" <<EOF
-This directory stores common Zcash zkSNARK parameters. Note that it is
-distinct from the daemon's -datadir argument because the parameters are
-large and may be shared across multiple distinct -datadir's such as when
-setting up test networks.
-EOF
-
-        # This may be the first time the user's run this script, so give
-        # them some info, especially about bandwidth usage:
-        cat <<EOF
-The parameters are currently just under 911MB in size, so plan accordingly
-for your bandwidth constraints. If the files are already present and
-have the correct sha256sum, no networking is used.
-Creating params directory. For details about this directory, see:
-$README_PATH
-EOF
-    fi
-
-    cd "$PARAMS_DIR"
-
-    # Sprout parameters:
-    fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
-    fetch_params "$SPROUT_VKEY_NAME" "$PARAMS_DIR/$SPROUT_VKEY_NAME" "4bd498dae0aacfd8e98dc306338d017d9c08dd0918ead18172bd0aec2fc5df82"
-
-    # Sapling parameters:
-    fetch_params "$SAPLING_SPEND_NAME" "$PARAMS_DIR/$SAPLING_SPEND_NAME" "8e48ffd23abb3a5fd9c5589204f32d9c31285a04b78096ba40a79b75677efc13"
-    fetch_params "$SAPLING_OUTPUT_NAME" "$PARAMS_DIR/$SAPLING_OUTPUT_NAME" "2f0ebbcbb9bb0bcffe95a397e7eba89c29eb4dde6191c339db88570e3f3fb0e4"
-    fetch_params "$SAPLING_SPROUT_GROTH16_NAME" "$PARAMS_DIR/$SAPLING_SPROUT_GROTH16_NAME" "b685d700c60328498fbde589c8c7c484c722b788b265b72af448a5bf0ee55b50"
-}
-
-main
-rm -f /tmp/fetch_params.lock
-exit 0
\ No newline at end of file
diff --git a/kmd/mac/verus-cli/verus b/kmd/mac/verus-cli/verus
deleted file mode 100755
index 67f0e9334..000000000
--- a/kmd/mac/verus-cli/verus
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-#set working directory to the location of this script
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-./komodo-cli -ac_name=VRSC "$@"
diff --git a/kmd/mac/verus-cli/verusd b/kmd/mac/verus-cli/verusd
deleted file mode 100755
index b1fda4785..000000000
--- a/kmd/mac/verus-cli/verusd
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-#set working directory to the location of this script
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 "$@"
diff --git a/makeReleaseLinux.sh b/makeReleaseLinux.sh
deleted file mode 100755
index 9e48f16eb..000000000
--- a/makeReleaseLinux.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cp src/komodod src/komodo-cli kmd/linux/verus-cli
-chmod +x kmd/linux/verus-cli/komodo
-chmod +x kmd/linux/verus-cli/komodod
-chmod +x kmd/linux/verus-cli/verus
-chmod +x kmd/linux/verus-cli/verusd
-chmod +x kmd/linux/verus-cli/fetch-params
diff --git a/makeReleaseMac.sh b/makeReleaseMac.sh
index 29cf91dd4..61dc5d45c 100755
--- a/makeReleaseMac.sh
+++ b/makeReleaseMac.sh
@@ -1,31 +1,40 @@
 #!/bin/sh
 
-KMD_DIR=kmd/mac/verus-cli
+KMD_DIR=verus-cli
+mkdir ${KMD_DIR}
+
+cp src/verus \
+   src/verusd \
+   doc/man/verus-cli/mac/README.txt \
+   zcutil/fetch-params.sh \
+   verus-cli
+mv verus-cli/fetch-params.sh verus-cli/fetch-params
+chmod +x ${KMD_DIR}/fetch-params
+chmod +x ${KMD_DIR}/verus
+chmod +x ${KMD_DIR}/verusd
 
 binaries=("komodo-cli" "komodod")
 alllibs=()
 for binary in "${binaries[@]}";
 do
     # do the work in the destination directory
-    cp src/$binary $KMD_DIR
+    cp src/${binary} ${KMD_DIR}
     # find the dylibs to copy for komodod
-    DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
-    echo "copying $DYLIBS to $KMD_DIR"
+    DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'`
+    echo "copying ${DYLIBS} to ${KMD_DIR}"
     # copy the dylibs to the srcdir
-    for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; done
+    for dylib in ${DYLIBS}; do cp -rf ${dylib} ${KMD_DIR}; done
 done
 
 libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.dylib")
 
 for binary in "${libraries[@]}";
 do
-    # Need to undo this for the dylibs when we are done
-    chmod 755 $KMD_DIR/$binary
     # find the dylibs to copy for komodod
-    DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
-    echo "copying $DYLIBS to $KMD_DIR"
+    DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'`
+    echo "copying ${DYLIBS} to ${KMD_DIR}"
     # copy the dylibs to the srcdir
-    for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done
+    for dylib in ${DYLIBS}; do cp -rf ${dylib} ${KMD_DIR}; alllibs+=(${dylib}); done
 done
 
 indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib")
@@ -33,40 +42,35 @@ indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib")
 for binary in "${indirectlibraries[@]}";
 do
     # Need to undo this for the dylibs when we are done
-    chmod 755 src/$binary
+    chmod 755 src/${binary}
     # find the dylibs to copy for komodod
-    DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
-    echo "copying indirect $DYLIBS to $KMD_DIR"
+    DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'`
+    echo "copying indirect ${DYLIBS} to ${KMD_DIR}"
     # copy the dylibs to the dest dir
-    for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done
+    for dylib in ${DYLIBS}; do cp -rf ${dylib} ${KMD_DIR}; alllibs+=(${dylib}); done
 done
 
 for binary in "${binaries[@]}";
 do
     # modify komodod to point to dylibs
-    echo "modifying $binary to use local libraries"
+    echo "modifying ${binary} to use local libraries"
     for dylib in "${alllibs[@]}"
     do
-        echo "Next lib is $dylib "
-        install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary
+        echo "Next lib is ${dylib} "
+        install_name_tool -change ${dylib} @executable_path/`basename ${dylib}` ${KMD_DIR}/${binary}
     done
-    chmod +x $KMD_DIR/$binary
+    chmod +x ${KMD_DIR}/${binary}
 done
 
 for binary in "${libraries[@]}";
 do
     # modify libraries to point to dylibs
-    echo "modifying $binary to use local libraries"
+    echo "modifying ${binary} to use local libraries"
     for dylib in "${alllibs[@]}"
     do
-        echo "Next lib is $dylib "
-        install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary
+        echo "Next lib is ${dylib} "
+        install_name_tool -change ${dylib} @executable_path/`basename ${dylib}` ${KMD_DIR}/${binary}
     done
-    chmod +x $KMD_DIR/$binary
 done
 
-chmod +x kmd/mac/verus-cli/fetch-params
-chmod +x kmd/linux/verus-cli/verus
-chmod +x kmd/linux/verus-cli/verusd
-
 
diff --git a/src/verus b/src/verus
index 8f6f56892..443633e3c 100755
--- a/src/verus
+++ b/src/verus
@@ -1,2 +1,2 @@
 #!/bin/bash
-komodo-cli -ac_name=VRSC "$@"
+./komodo-cli -ac_name=VRSC "$@"
diff --git a/kmd/windows/verus-cli/verus.bat b/src/verus.bat
similarity index 100%
rename from kmd/windows/verus-cli/verus.bat
rename to src/verus.bat
diff --git a/kmd/windows/verus-cli/verusd.bat b/src/verusd.bat
similarity index 100%
rename from kmd/windows/verus-cli/verusd.bat
rename to src/verusd.bat
diff --git a/kmd/windows/verus-cli/fetch-params.bat b/zcutil/fetch-params.bat
similarity index 100%
rename from kmd/windows/verus-cli/fetch-params.bat
rename to zcutil/fetch-params.bat
diff --git a/kmd/windows/verus-cli/wget64.exe b/zcutil/wget64.exe
similarity index 100%
rename from kmd/windows/verus-cli/wget64.exe
rename to zcutil/wget64.exe

From 925f4658301a802d64bc68cc19777bf237e20a9d Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Wed, 17 Oct 2018 18:08:05 -0700
Subject: [PATCH 09/18] Updating versions for release

---
 .gitlab-ci.yml                       | 7 +++----
 README.md                            | 2 +-
 doc/man/verus-cli/linux/README.txt   | 2 +-
 doc/man/verus-cli/mac/README.txt     | 2 +-
 doc/man/verus-cli/windows/README.txt | 2 +-
 src/rpc/misc.cpp                     | 2 +-
 zcutil/build-mac.sh                  | 6 +++---
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59a877a07..cc5aa3dd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 
 variables:
-  VERSION: 0.4.1
+  VERSION: 0.4.0a
   VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
   VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip
   VERUS_CLI_MACOS: Verus-CLI-MacOS-v${VERSION}.tar.gz
@@ -13,12 +13,11 @@ variables:
   POST_MESSAGE: "Source: ${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}\n
   Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
   Commit: ${CI_COMMIT_SHA}$\n
-  Author:  ${GITLAB_USER_NAME} <${GITLAB_USER_EMAIL}>\n
   ${CI_COMMIT_MESSAGE}"
 
 
 build:linux:
-  image: asherd/veruscoin-cross-compiler:linux
+  image: asherd/verus-builders:verus-ubuntu
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
@@ -57,7 +56,7 @@ build:linux:
 
 
 build:windows:
-  image: asherd/veruscoin-cross-compiler:windows
+  image: asherd/verus-builders:verus-windows
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
diff --git a/README.md b/README.md
index 620f71684..6bafe58c4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## VerusCoin version 0.4.1
+## VerusCoin version 0.4.0a
 
 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).
 - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/)
diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt
index 991b187c2..e61d02b07 100644
--- a/doc/man/verus-cli/linux/README.txt
+++ b/doc/man/verus-cli/linux/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.1
+VerusCoin Command Line Tools v0.4.0a
 
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon
diff --git a/doc/man/verus-cli/mac/README.txt b/doc/man/verus-cli/mac/README.txt
index dff8c2b36..91229eb53 100644
--- a/doc/man/verus-cli/mac/README.txt
+++ b/doc/man/verus-cli/mac/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.1
+VerusCoin Command Line Tools v0.4.0a
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon.
 komodo-cli - VerusCoin's enhanced Komodo command line utility.
diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt
index e3f419a96..9aab9c8d7 100644
--- a/doc/man/verus-cli/windows/README.txt
+++ b/doc/man/verus-cli/windows/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.1
+VerusCoin Command Line Tools v0.4.0a
 Contents:
 komodod.exe - VerusCoin's enhanced Komodo daemon
 komodo-cli.exe - VerusCoin's Komodo command line utility
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index e914bb8ac..185a6130b 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -56,7 +56,7 @@ uint32_t komodo_segid32(char *coinaddr);
 int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.4.0"
+#define VERUS_VERSION "0.4.0a"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;
 extern uint32_t ASSETCHAINS_MAGIC;
diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh
index 138508cb5..7c50473d0 100755
--- a/zcutil/build-mac.sh
+++ b/zcutil/build-mac.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-export CC=gcc-6
-export CXX=g++-6
+export CC=gcc-8
+export CXX=g++-8
 export LIBTOOL=libtool
 export AR=ar
 export RANLIB=ranlib
@@ -44,7 +44,7 @@ make "$@" -C ./depends/ V=1 NO_QT=1 NO_PROTON=1
 
 ./autogen.sh
 CPPFLAGS="-I$PREFIX/include -arch x86_64" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie" \
-CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@6/6.4.0_2/include/c++/6.4.0/ -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \
+CXXFLAGS='-arch x86_64 -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \
 ./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG"
 
 make "$@" V=1 NO_GTEST=1 STATIC=1

From 37ff7360a0e66a4913707b4076bdcc6d4c2e385e Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Wed, 17 Oct 2018 19:46:38 -0700
Subject: [PATCH 10/18] Reverting gcc change

---
 zcutil/build-mac.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh
index 7c50473d0..138508cb5 100755
--- a/zcutil/build-mac.sh
+++ b/zcutil/build-mac.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-export CC=gcc-8
-export CXX=g++-8
+export CC=gcc-6
+export CXX=g++-6
 export LIBTOOL=libtool
 export AR=ar
 export RANLIB=ranlib
@@ -44,7 +44,7 @@ make "$@" -C ./depends/ V=1 NO_QT=1 NO_PROTON=1
 
 ./autogen.sh
 CPPFLAGS="-I$PREFIX/include -arch x86_64" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie" \
-CXXFLAGS='-arch x86_64 -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \
+CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@6/6.4.0_2/include/c++/6.4.0/ -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \
 ./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG"
 
 make "$@" V=1 NO_GTEST=1 STATIC=1

From ebaafd4d2c2e0c2c07f0facb11365d6656b1b0ee Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Wed, 17 Oct 2018 20:54:20 -0700
Subject: [PATCH 11/18] Removing symbols on Linux build

---
 zcutil/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zcutil/build.sh b/zcutil/build.sh
index c1388b959..3b57a0b53 100755
--- a/zcutil/build.sh
+++ b/zcutil/build.sh
@@ -108,5 +108,5 @@ HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V
 #=======
 #CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" "$LIBS_ARG" $CONFIGURE_FLAGS --enable-werror CXXFLAGS='-g'
 #>>>>>>> zcash/master
-CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g'
+CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CXXFLAGS=''
 "$MAKE" "$@" V=1

From c79ca917a45cdc26beb86f1222c40139554e26d7 Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Thu, 18 Oct 2018 13:19:56 -0700
Subject: [PATCH 12/18] Adding comments to structure GitLab-CI configuration
 enabling tests

---
 .gitlab-ci.yml | 171 +++++++++++++++++++++++++++++++------------------
 1 file changed, 108 insertions(+), 63 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc5aa3dd0..6279d478a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,9 @@ stages:
 - build
 - test
 - deploy
-
-
+########################################################################################################################
+####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
+########################################################################################################################
 variables:
   VERSION: 0.4.0a
   VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
@@ -14,27 +15,35 @@ variables:
   Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
   Commit: ${CI_COMMIT_SHA}$\n
   ${CI_COMMIT_MESSAGE}"
-
-
+########################################################################################################################
+####END####                                        PROJECT LEVEL VARIABLES                                   ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####          Build Stage: compile and package komodo binaries for Verus CLI                     ####START#####
+########################################################################################################################
+########################################################################################################################
+####START####                                            LINUX                                             ####START####
+########################################################################################################################
 build:linux:
   image: asherd/verus-builders:verus-ubuntu
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
   cache:
-    key: ${CI_JOB_NAME}
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   script:
   - zcutil/build.sh -j$(nproc)
   - mkdir verus-cli
   - cp src/komodod
-    src/komodo-cli
-    src/verus
-    src/verusd
-    doc/man/verus-cli/linux/README.txt
-    zcutil/fetch-params.sh
-    verus-cli
+      src/komodo-cli
+      src/verus
+      src/verusd
+      doc/man/verus-cli/linux/README.txt
+      zcutil/fetch-params.sh
+      verus-cli
   - mv verus-cli/fetch-params.sh verus-cli/fetch-params
   - chmod +x verus-cli/komodod
   - chmod +x verus-cli/komodo-cli
@@ -53,27 +62,30 @@ build:linux:
     - ${VERUS_CLI_LINUX}
     - ${VERUS_CLI_LINUX}.md5
     expire_in: 1 week
-
-
+########################################################################################################################
+####END####                                              LINUX                                               ####END####
+########################################################################################################################
+####START####                                           WINDOWS                                            ####START####
+########################################################################################################################
 build:windows:
   image: asherd/verus-builders:verus-windows
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
   cache:
-    key: ${CI_JOB_NAME}
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   script:
   - zcutil/build-win.sh -j$(nproc)
   - mkdir verus-cli
   - cp src/komodod.exe
-    src/komodo-cli.exe
-    src/komodo-tx.exe
-    doc/man/verus-cli/windows/README.txt
-    zcutil/fetch-params.bat
-    zcutil/wget64.exe
-    verus-cli
+      src/komodo-cli.exe
+      src/komodo-tx.exe
+      doc/man/verus-cli/windows/README.txt
+      zcutil/fetch-params.bat
+      zcutil/wget64.exe
+      verus-cli
   - zip -r ${VERUS_CLI_WINDOWS} verus-cli
   - md5sum ${VERUS_CLI_WINDOWS} > ${VERUS_CLI_WINDOWS}.md5
   - curl -F file=@"${VERUS_CLI_WINDOWS}"
@@ -86,17 +98,19 @@ build:windows:
     - ${VERUS_CLI_WINDOWS}
     - ${VERUS_CLI_WINDOWS}.md5
     expire_in: 1 week
-
-
+########################################################################################################################
+####END####                                             WINDOWS                                              ####END####
+########################################################################################################################
+####START####                                            MACOS                                             ####START####
+########################################################################################################################
 build:mac:
   stage: build
   tags: ["High Sierra"]
   cache:
-    key: ${CI_JOB_NAME}
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   script:
-  - brew bundle
   - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
   - ./makeReleaseMac.sh
   - tar -czvf ${VERUS_CLI_MACOS} verus-cli
@@ -111,9 +125,22 @@ build:mac:
     - ${VERUS_CLI_MACOS}
     - ${VERUS_CLI_MACOS}.md5
     expire_in: 1 week
-
-
-.code_quality:
+########################################################################################################################
+####END####                                              MACOS                                               ####END####
+########################################################################################################################
+########################################################################################################################
+####END####                                           Build Stage                                            ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####     Test stage: Test functionality of komodo binaries. Produce code quality and SAST reports. ####START####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####                                        Code Quality                                          ####START####
+########################################################################################################################
+code_quality:
   image: docker:stable
   variables:
     DOCKER_DRIVER: overlay2
@@ -129,9 +156,13 @@ build:mac:
       "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
   artifacts:
     paths: [gl-code-quality-report.json]
-
-
-.sast:
+########################################################################################################################
+####END####                                          Code Quality                                            ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                              Static Application Security Tests                               ####START####
+########################################################################################################################
+sast:
   image: docker:stable
   variables:
     DOCKER_DRIVER: overlay2
@@ -147,31 +178,19 @@ build:mac:
       "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
   artifacts:
     paths: [gl-sast-report.json]
-
-
-.license_management:
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-  - docker:stable-dind
-  script:
-  - export LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-  - docker run
-      --volume "$PWD:/code"
-      "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code
-  artifacts:
-    paths: [gl-license-management-report.json]
-
-
-.ubuntu:xenial:
+########################################################################################################################
+####END####                                Static Application Security Tests                                 ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                            Run Verus CLI on Ubuntu Xenial (16.04)                            ####START####
+########################################################################################################################
+ubuntu:xenial:
   image: ubuntu:xenial
   variables:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget libgomp1 libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl4-gnutls-dev python
   - rm -rf /root/.komodo || true
   - mv .komodo /root/ || true
   script:
@@ -188,15 +207,19 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:linux
-
-
-.ubuntu:bionic:
+########################################################################################################################
+####END####                               Run Verus CLI on Ubuntu Xenial (16.04)                             ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                             Run Verus CLI on Ubuntu Bionic (18.04)                           ####START####
+########################################################################################################################
+ubuntu:bionic:
   image: ubuntu:bionic
   variables:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget libgomp1 libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl4-gnutls-dev python
   - rm -rf /root/.komodo || true
   - mv .komodo /root/ || true
   script:
@@ -213,9 +236,13 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:linux
-
-
-.macos:sierra: # fetch-params.sh needs to be fixed for MacOS
+########################################################################################################################
+####END####                               Run Verus CLI on Ubuntu Bionic (18.04)                             ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                             Run Verus CLI on MacOS Sierra (10.12.6)                          ####START####
+########################################################################################################################
+.macos:sierra:
   stage: test
   tags: ["Sierra"]
   script:
@@ -227,8 +254,12 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:mac
-
-
+########################################################################################################################
+####END####                               Run Verus CLI on MacOS Sierra (10.12.6)                            ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                          Run Verus CLI on MacOS High Sierra (10.12.6)                        ####START####
+########################################################################################################################
 .macos:high-sierra:
   stage: test
   tags: ["High Sierra"]
@@ -241,8 +272,12 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:mac
-
-
+########################################################################################################################
+####START####                          Run Verus CLI on MacOS High Sierra (10.12.6)                        ####START####
+########################################################################################################################
+########################################################################################################################
+####START####                              Run Verus CLI on Windows 10                                     ####START####
+########################################################################################################################
 .windows:10:
   stage: test
   tags: ["Windows 10"]
@@ -255,8 +290,15 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:windows
-
-
+########################################################################################################################
+####END####                                Run Verus CLI on Windows 10                                       ####END####
+########################################################################################################################
+########################################################################################################################
+####END####                                           Test Stage                                             ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                                         Deploy                                               ####START####
+########################################################################################################################
 deploy:
   stage: deploy
   image: google/cloud-sdk:alpine
@@ -283,3 +325,6 @@ deploy:
       -F variables\[VERUS_CLI_WINDOWS\]="${VERUS_CLI_WINDOWS}"
       -F variables\[VERUS_CLI_MACOS\]="${VERUS_CLI_MACOS}"
       "https://gitlab.com/api/v4/projects/8018592/trigger/pipeline"
+########################################################################################################################
+####END####                                           Deploy                                                 ####END####
+########################################################################################################################

From b8a246d3137741ae9b7c76a14b879f2fcbeffac8 Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Fri, 19 Oct 2018 17:43:12 -0700
Subject: [PATCH 13/18] CI run tests need to be revised on a branch. Disabling
 for now

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6279d478a..cffc3643a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,7 @@ build:mac:
 ########################################################################################################################
 ####START####                                        Code Quality                                          ####START####
 ########################################################################################################################
-code_quality:
+.code_quality:
   image: docker:stable
   variables:
     DOCKER_DRIVER: overlay2
@@ -162,7 +162,7 @@ code_quality:
 ########################################################################################################################
 ####START####                              Static Application Security Tests                               ####START####
 ########################################################################################################################
-sast:
+.sast:
   image: docker:stable
   variables:
     DOCKER_DRIVER: overlay2
@@ -184,7 +184,7 @@ sast:
 ########################################################################################################################
 ####START####                            Run Verus CLI on Ubuntu Xenial (16.04)                            ####START####
 ########################################################################################################################
-ubuntu:xenial:
+.ubuntu:xenial:
   image: ubuntu:xenial
   variables:
     DOCKER_DRIVER: overlay2
@@ -213,7 +213,7 @@ ubuntu:xenial:
 ########################################################################################################################
 ####START####                             Run Verus CLI on Ubuntu Bionic (18.04)                           ####START####
 ########################################################################################################################
-ubuntu:bionic:
+.ubuntu:bionic:
   image: ubuntu:bionic
   variables:
     DOCKER_DRIVER: overlay2
@@ -316,7 +316,7 @@ deploy:
   - echo "$AUTH_KEY" > AUTH_KEY.json &&
     gcloud auth activate-service-account
     --key-file AUTH_KEY.json
-  - gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
+  - gsutil cp -r Windows Linux MacOS $STAGING/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/
   - curl -X POST
       -F token="$CI_JOB_TOKEN"
       -F ref="$DOWNSTREAM_AGAMA_BRANCH"

From 892448889d7605951ed22e78b0aa4d8a574739c5 Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Sun, 21 Oct 2018 11:07:13 -0700
Subject: [PATCH 14/18] Fixing verus shell script to change to its current
 directory upon call.

---
 src/verus | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/verus b/src/verus
index 443633e3c..7e4109b59 100755
--- a/src/verus
+++ b/src/verus
@@ -1,2 +1,5 @@
 #!/bin/bash
+#set working directory to the location of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
 ./komodo-cli -ac_name=VRSC "$@"

From e7657bf1f689cb0f19f85b52c996dde4627d0b28 Mon Sep 17 00:00:00 2001
From: Asher Dawes <asher.dawes@gmail.com>
Date: Sun, 21 Oct 2018 11:09:52 -0700
Subject: [PATCH 15/18] Dev (#139)

* Adding comments to structure GitLab-CI configuration
enabling tests

* Fixing verus shell script to change to its current directory upon call.
---
 .gitlab-ci.yml | 165 +++++++++++++++++++++++++++++++------------------
 src/verus      |   3 +
 2 files changed, 108 insertions(+), 60 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc5aa3dd0..cffc3643a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,9 @@ stages:
 - build
 - test
 - deploy
-
-
+########################################################################################################################
+####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
+########################################################################################################################
 variables:
   VERSION: 0.4.0a
   VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
@@ -14,27 +15,35 @@ variables:
   Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
   Commit: ${CI_COMMIT_SHA}$\n
   ${CI_COMMIT_MESSAGE}"
-
-
+########################################################################################################################
+####END####                                        PROJECT LEVEL VARIABLES                                   ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####          Build Stage: compile and package komodo binaries for Verus CLI                     ####START#####
+########################################################################################################################
+########################################################################################################################
+####START####                                            LINUX                                             ####START####
+########################################################################################################################
 build:linux:
   image: asherd/verus-builders:verus-ubuntu
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
   cache:
-    key: ${CI_JOB_NAME}
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   script:
   - zcutil/build.sh -j$(nproc)
   - mkdir verus-cli
   - cp src/komodod
-    src/komodo-cli
-    src/verus
-    src/verusd
-    doc/man/verus-cli/linux/README.txt
-    zcutil/fetch-params.sh
-    verus-cli
+      src/komodo-cli
+      src/verus
+      src/verusd
+      doc/man/verus-cli/linux/README.txt
+      zcutil/fetch-params.sh
+      verus-cli
   - mv verus-cli/fetch-params.sh verus-cli/fetch-params
   - chmod +x verus-cli/komodod
   - chmod +x verus-cli/komodo-cli
@@ -53,27 +62,30 @@ build:linux:
     - ${VERUS_CLI_LINUX}
     - ${VERUS_CLI_LINUX}.md5
     expire_in: 1 week
-
-
+########################################################################################################################
+####END####                                              LINUX                                               ####END####
+########################################################################################################################
+####START####                                           WINDOWS                                            ####START####
+########################################################################################################################
 build:windows:
   image: asherd/verus-builders:verus-windows
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
   cache:
-    key: ${CI_JOB_NAME}
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   script:
   - zcutil/build-win.sh -j$(nproc)
   - mkdir verus-cli
   - cp src/komodod.exe
-    src/komodo-cli.exe
-    src/komodo-tx.exe
-    doc/man/verus-cli/windows/README.txt
-    zcutil/fetch-params.bat
-    zcutil/wget64.exe
-    verus-cli
+      src/komodo-cli.exe
+      src/komodo-tx.exe
+      doc/man/verus-cli/windows/README.txt
+      zcutil/fetch-params.bat
+      zcutil/wget64.exe
+      verus-cli
   - zip -r ${VERUS_CLI_WINDOWS} verus-cli
   - md5sum ${VERUS_CLI_WINDOWS} > ${VERUS_CLI_WINDOWS}.md5
   - curl -F file=@"${VERUS_CLI_WINDOWS}"
@@ -86,17 +98,19 @@ build:windows:
     - ${VERUS_CLI_WINDOWS}
     - ${VERUS_CLI_WINDOWS}.md5
     expire_in: 1 week
-
-
+########################################################################################################################
+####END####                                             WINDOWS                                              ####END####
+########################################################################################################################
+####START####                                            MACOS                                             ####START####
+########################################################################################################################
 build:mac:
   stage: build
   tags: ["High Sierra"]
   cache:
-    key: ${CI_JOB_NAME}
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   script:
-  - brew bundle
   - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
   - ./makeReleaseMac.sh
   - tar -czvf ${VERUS_CLI_MACOS} verus-cli
@@ -111,8 +125,21 @@ build:mac:
     - ${VERUS_CLI_MACOS}
     - ${VERUS_CLI_MACOS}.md5
     expire_in: 1 week
-
-
+########################################################################################################################
+####END####                                              MACOS                                               ####END####
+########################################################################################################################
+########################################################################################################################
+####END####                                           Build Stage                                            ####END####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####     Test stage: Test functionality of komodo binaries. Produce code quality and SAST reports. ####START####
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+####START####                                        Code Quality                                          ####START####
+########################################################################################################################
 .code_quality:
   image: docker:stable
   variables:
@@ -129,8 +156,12 @@ build:mac:
       "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:
@@ -147,31 +178,19 @@ build:mac:
       "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
   artifacts:
     paths: [gl-sast-report.json]
-
-
-.license_management:
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-  - docker:stable-dind
-  script:
-  - export LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-  - docker run
-      --volume "$PWD:/code"
-      "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code
-  artifacts:
-    paths: [gl-license-management-report.json]
-
-
+########################################################################################################################
+####END####                                Static Application Security Tests                                 ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                            Run Verus CLI on Ubuntu Xenial (16.04)                            ####START####
+########################################################################################################################
 .ubuntu:xenial:
   image: ubuntu:xenial
   variables:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget libgomp1 libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl4-gnutls-dev python
   - rm -rf /root/.komodo || true
   - mv .komodo /root/ || true
   script:
@@ -188,15 +207,19 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:linux
-
-
+########################################################################################################################
+####END####                               Run Verus CLI on Ubuntu Xenial (16.04)                             ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                             Run Verus CLI on Ubuntu Bionic (18.04)                           ####START####
+########################################################################################################################
 .ubuntu:bionic:
   image: ubuntu:bionic
   variables:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget libgomp1 libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl4-gnutls-dev python
   - rm -rf /root/.komodo || true
   - mv .komodo /root/ || true
   script:
@@ -213,9 +236,13 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:linux
-
-
-.macos:sierra: # fetch-params.sh needs to be fixed for MacOS
+########################################################################################################################
+####END####                               Run Verus CLI on Ubuntu Bionic (18.04)                             ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                             Run Verus CLI on MacOS Sierra (10.12.6)                          ####START####
+########################################################################################################################
+.macos:sierra:
   stage: test
   tags: ["Sierra"]
   script:
@@ -227,8 +254,12 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:mac
-
-
+########################################################################################################################
+####END####                               Run Verus CLI on MacOS Sierra (10.12.6)                            ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                          Run Verus CLI on MacOS High Sierra (10.12.6)                        ####START####
+########################################################################################################################
 .macos:high-sierra:
   stage: test
   tags: ["High Sierra"]
@@ -241,8 +272,12 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:mac
-
-
+########################################################################################################################
+####START####                          Run Verus CLI on MacOS High Sierra (10.12.6)                        ####START####
+########################################################################################################################
+########################################################################################################################
+####START####                              Run Verus CLI on Windows 10                                     ####START####
+########################################################################################################################
 .windows:10:
   stage: test
   tags: ["Windows 10"]
@@ -255,8 +290,15 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:windows
-
-
+########################################################################################################################
+####END####                                Run Verus CLI on Windows 10                                       ####END####
+########################################################################################################################
+########################################################################################################################
+####END####                                           Test Stage                                             ####END####
+########################################################################################################################
+########################################################################################################################
+####START####                                         Deploy                                               ####START####
+########################################################################################################################
 deploy:
   stage: deploy
   image: google/cloud-sdk:alpine
@@ -274,7 +316,7 @@ deploy:
   - echo "$AUTH_KEY" > AUTH_KEY.json &&
     gcloud auth activate-service-account
     --key-file AUTH_KEY.json
-  - gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
+  - gsutil cp -r Windows Linux MacOS $STAGING/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/
   - curl -X POST
       -F token="$CI_JOB_TOKEN"
       -F ref="$DOWNSTREAM_AGAMA_BRANCH"
@@ -283,3 +325,6 @@ deploy:
       -F variables\[VERUS_CLI_WINDOWS\]="${VERUS_CLI_WINDOWS}"
       -F variables\[VERUS_CLI_MACOS\]="${VERUS_CLI_MACOS}"
       "https://gitlab.com/api/v4/projects/8018592/trigger/pipeline"
+########################################################################################################################
+####END####                                           Deploy                                                 ####END####
+########################################################################################################################
diff --git a/src/verus b/src/verus
index 443633e3c..7e4109b59 100755
--- a/src/verus
+++ b/src/verus
@@ -1,2 +1,5 @@
 #!/bin/bash
+#set working directory to the location of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
 ./komodo-cli -ac_name=VRSC "$@"

From 7e6fdc5b7f2dd2741b26f5406d77a92b51db9026 Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Sun, 21 Oct 2018 15:18:47 -0700
Subject: [PATCH 16/18] Updating version

---
 .gitlab-ci.yml                       | 39 +---------------------------
 README.md                            |  4 +--
 doc/man/verus-cli/linux/README.txt   |  2 +-
 doc/man/verus-cli/mac/README.txt     |  2 +-
 doc/man/verus-cli/windows/README.txt |  2 +-
 requirements-debian.txt              | 18 -------------
 src/rpc/misc.cpp                     |  2 +-
 7 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 requirements-debian.txt

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cffc3643a..69c3e6879 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 ####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
 ########################################################################################################################
 variables:
-  VERSION: 0.4.0a
+  VERSION: 0.4.0b
   VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
   VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip
   VERUS_CLI_MACOS: Verus-CLI-MacOS-v${VERSION}.tar.gz
@@ -25,43 +25,6 @@ variables:
 ########################################################################################################################
 ####START####                                            LINUX                                             ####START####
 ########################################################################################################################
-build:linux:
-  image: asherd/verus-builders:verus-ubuntu
-  variables:
-    DOCKER_DRIVER: overlay2
-  stage: build
-  cache:
-    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
-    paths:
-    - depends/built
-  script:
-  - zcutil/build.sh -j$(nproc)
-  - mkdir verus-cli
-  - cp src/komodod
-      src/komodo-cli
-      src/verus
-      src/verusd
-      doc/man/verus-cli/linux/README.txt
-      zcutil/fetch-params.sh
-      verus-cli
-  - mv verus-cli/fetch-params.sh verus-cli/fetch-params
-  - chmod +x verus-cli/komodod
-  - chmod +x verus-cli/komodo-cli
-  - chmod +x verus-cli/verus
-  - chmod +x verus-cli/verusd
-  - chmod +x verus-cli/fetch-params
-  - tar -czvf ${VERUS_CLI_LINUX} verus-cli
-  - md5sum ${VERUS_CLI_LINUX} > ${VERUS_CLI_LINUX}.md5
-  - curl -F file=@"${VERUS_CLI_LINUX}"
-      -F channels="${CLI_POST_CHANNEL}"
-      -F initial_comment="${POST_MESSAGE}"
-      -H "${SLACK_BOT_AUTH}"
-      "https://slack.com/api/files.upload"
-  artifacts:
-    paths:
-    - ${VERUS_CLI_LINUX}
-    - ${VERUS_CLI_LINUX}.md5
-    expire_in: 1 week
 ########################################################################################################################
 ####END####                                              LINUX                                               ####END####
 ########################################################################################################################
diff --git a/README.md b/README.md
index 6bafe58c4..3b0e4d4f9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## VerusCoin version 0.4.0a
+## VerusCoin version 0.4.0b
 
 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).
 - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/)
@@ -55,7 +55,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
 ```
 
 
diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt
index e61d02b07..85e0a9949 100644
--- a/doc/man/verus-cli/linux/README.txt
+++ b/doc/man/verus-cli/linux/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.0a
+VerusCoin Command Line Tools v0.4.0b
 
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon
diff --git a/doc/man/verus-cli/mac/README.txt b/doc/man/verus-cli/mac/README.txt
index 91229eb53..7b4d8252e 100644
--- a/doc/man/verus-cli/mac/README.txt
+++ b/doc/man/verus-cli/mac/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.0a
+VerusCoin Command Line Tools v0.4.0b
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon.
 komodo-cli - VerusCoin's enhanced Komodo command line utility.
diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt
index 9aab9c8d7..0b7f17b71 100644
--- a/doc/man/verus-cli/windows/README.txt
+++ b/doc/man/verus-cli/windows/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.4.0a
+VerusCoin Command Line Tools v0.4.0b
 Contents:
 komodod.exe - VerusCoin's enhanced Komodo daemon
 komodo-cli.exe - VerusCoin's Komodo command line utility
diff --git a/requirements-debian.txt b/requirements-debian.txt
deleted file mode 100644
index 7bfd9e6e2..000000000
--- a/requirements-debian.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-autoconf
-automake
-bsdmainutils
-build-essential
-curl
-g++-multilib
-git
-libc6-dev
-libcurl4-openssl-dev
-libtool
-ncurses-dev
-pkg-config
-python
-python-zmq
-m4
-unzip
-wget
-zlib1g-dev
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 185a6130b..c799d9eaf 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -56,7 +56,7 @@ uint32_t komodo_segid32(char *coinaddr);
 int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.4.0a"
+#define VERUS_VERSION "0.4.0b"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;
 extern uint32_t ASSETCHAINS_MAGIC;

From 2b198dc777f25705f82e2f7bc540c101508cde1e Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Sun, 21 Oct 2018 15:22:05 -0700
Subject: [PATCH 17/18] Adding missing build

---
 .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69c3e6879..17ab6d31b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,43 @@ variables:
 ########################################################################################################################
 ####START####                                            LINUX                                             ####START####
 ########################################################################################################################
+build:linux:
+  image: asherd/verus-builders:verus-ubuntu
+  variables:
+    DOCKER_DRIVER: overlay2
+  stage: build
+  cache:
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
+    paths:
+    - depends/built
+  script:
+  - zcutil/build.sh -j$(nproc)
+  - mkdir verus-cli
+  - cp src/komodod
+      src/komodo-cli
+      src/verus
+      src/verusd
+      doc/man/verus-cli/linux/README.txt
+      zcutil/fetch-params.sh
+      verus-cli
+  - mv verus-cli/fetch-params.sh verus-cli/fetch-params
+  - chmod +x verus-cli/komodod
+  - chmod +x verus-cli/komodo-cli
+  - chmod +x verus-cli/verus
+  - chmod +x verus-cli/verusd
+  - chmod +x verus-cli/fetch-params
+  - tar -czvf ${VERUS_CLI_LINUX} verus-cli
+  - md5sum ${VERUS_CLI_LINUX} > ${VERUS_CLI_LINUX}.md5
+  - curl -F file=@"${VERUS_CLI_LINUX}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
+      -H "${SLACK_BOT_AUTH}"
+      "https://slack.com/api/files.upload"
+  artifacts:
+    paths:
+    - ${VERUS_CLI_LINUX}
+    - ${VERUS_CLI_LINUX}.md5
+    expire_in: 1 week
 ########################################################################################################################
 ####END####                                              LINUX                                               ####END####
 ########################################################################################################################

From 844637a503186648b49f357f03fd464f3d7c9ec1 Mon Sep 17 00:00:00 2001
From: Asher Dawes <Asher.dawes@gmail.com>
Date: Tue, 23 Oct 2018 19:19:38 -0700
Subject: [PATCH 18/18] Adding symbols back to Linux builds. Stripping symbols
 on master branch builds

---
 .gitlab-ci.yml  | 1 +
 zcutil/build.sh | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17ab6d31b..69d092599 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ build:linux:
   - chmod +x verus-cli/verus
   - chmod +x verus-cli/verusd
   - chmod +x verus-cli/fetch-params
+  - if [ "${CI_COMMIT_REF_NAME}" = "master" ]; then strip -g verus-cli/komodod && strip -g verus-cli/komodod; fi
   - tar -czvf ${VERUS_CLI_LINUX} verus-cli
   - md5sum ${VERUS_CLI_LINUX} > ${VERUS_CLI_LINUX}.md5
   - curl -F file=@"${VERUS_CLI_LINUX}"
diff --git a/zcutil/build.sh b/zcutil/build.sh
index 3b57a0b53..08517475c 100755
--- a/zcutil/build.sh
+++ b/zcutil/build.sh
@@ -103,10 +103,6 @@ ld -v
 
 HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1
 ./autogen.sh
-#<<<<<<< HEAD
-#CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -g'
-#=======
-#CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" "$LIBS_ARG" $CONFIGURE_FLAGS --enable-werror CXXFLAGS='-g'
-#>>>>>>> zcash/master
-CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CXXFLAGS=''
+
+CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g'
 "$MAKE" "$@" V=1