Merge branch 'dev' of https://github.com/miketout/komodo into dev

.gitlab-ci.yml

@@ -2,115 +2,145 @@ stages:
 - build
 - test
 - deploy
-
+########################################################################################################################
-
+####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
+########################################################################################################################
 variables:
-  VERSION: 0.3.14
+  VERSION: 0.4.0b
-  VERUS_CLI_LINUX: "Verus-CLI-Linux-v${VERSION}-beta.tar.gz"
+  VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
-  VERUS_CLI_WINDOWS: "Verus-CLI-Windows-v${VERSION}-beta.zip"
+  VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip
-  VERUS_CLI_MACOS: "Verus-CLI-MacOS-v${VERSION}-beta.tar.gz"
+  VERUS_CLI_MACOS: Verus-CLI-MacOS-v${VERSION}.tar.gz
-  POST_COMMENT: "Branch and Commit: ${CI_COMMIT_REF_NAME} ${CI_COMMIT_SHA} $'\n'MD5: "
+  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
+  ${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/veruscoin-cross-compiler:linux
+  image: asherd/verus-builders:verus-ubuntu
   variables:
     DOCKER_DRIVER: overlay2
   stage: build
-  before_script: # Setup Cache
+  cache:
-  - rm -rf /root/.ccache || true
+    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
-  - mv .ccache /root/ || true
+    paths:
+    - depends/built
   script:
   - zcutil/build.sh -j$(nproc)
-  - cp src/komodod src/komodo-cli kmd/linux/verus-cli
+  - mkdir verus-cli
-  - chmod +x kmd/linux/verus-cli/komodod
+  - cp src/komodod
-  - chmod +x kmd/linux/verus-cli/komodo-cli
+      src/komodo-cli
-  - chmod +x kmd/linux/verus-cli/verus
+      src/verus
-  - chmod +x kmd/linux/verus-cli/verusd
+      src/verusd
-  - chmod +x kmd/linux/verus-cli/fetch-params
+      doc/man/verus-cli/linux/README.txt
-  - dos2unix kmd/linux/verus-cli/README.txt
+      zcutil/fetch-params.sh
-  - cd kmd/linux/
+      verus-cli
-  - tar -czvf $VERUS_CLI_LINUX verus-cli
+  - mv verus-cli/fetch-params.sh verus-cli/fetch-params
-  - mv $VERUS_CLI_LINUX ../..
+  - chmod +x verus-cli/komodod
-  - cd  ../..
+  - chmod +x verus-cli/komodo-cli
-  - export VERUS_CLI_LINUX_MD5=$(md5sum $VERUS_CLI_LINUX | cut -d " " -f 1)
+  - chmod +x verus-cli/verus
-  - curl -F file=@"$VERUS_CLI_LINUX"
+  - chmod +x verus-cli/verusd
-      -F channels="$CLI_POST_CHANNEL"
+  - chmod +x verus-cli/fetch-params
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_LINUX_MD5"
+  - 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}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
       -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
   artifacts:
     paths:
-    - $VERUS_CLI_LINUX
+    - ${VERUS_CLI_LINUX}
+    - ${VERUS_CLI_LINUX}.md5
     expire_in: 1 week
-
+########################################################################################################################
-
+####END####                                              LINUX                                               ####END####
+########################################################################################################################
+####START####                                           WINDOWS                                            ####START####
+########################################################################################################################
 build:windows:
-  image: asherd/veruscoin-cross-compiler:latest
+  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
-    - .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
+  - mkdir verus-cli
-  - cd kmd/windows/
+  - cp src/komodod.exe
-  - zip -r $VERUS_CLI_WINDOWS verus-cli
+      src/komodo-cli.exe
-  - mv $VERUS_CLI_WINDOWS ../..
+      src/komodo-tx.exe
-  - cd  ../..
+      doc/man/verus-cli/windows/README.txt
-  - export VERUS_CLI_WINDOWS_MD5=$(md5sum $VERUS_CLI_WINDOWS | cut -d " " -f 1)
+      zcutil/fetch-params.bat
-  - curl -F file=@"$VERUS_CLI_WINDOWS"
+      zcutil/wget64.exe
-      -F channels="$CLI_POST_CHANNEL"
+      verus-cli
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_WINDOWS_MD5"
+  - 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
-
+########################################################################################################################
-
+####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)
-  - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu) | xcpretty
   - ./makeReleaseMac.sh
-  - dos2unix kmd/mac/verus-cli/README.txt
+  - tar -czvf ${VERUS_CLI_MACOS} verus-cli
-  - tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS verus-cli ./
+  - md5sum ${VERUS_CLI_MACOS} > ${VERUS_CLI_MACOS}.md5
-  - export VERUS_CLI_MACOS_MD5=$(md5sum $VERUS_CLI_MACOS | cut -d " " -f 1)
+  - curl -F file=@"${VERUS_CLI_MACOS}"
-  - curl -F file=@"$VERUS_CLI_MACOS"
+      -F channels="${CLI_POST_CHANNEL}"
-      -F channels="$CLI_POST_CHANNEL"
+      -F initial_comment="${POST_MESSAGE}"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_MACOS_MD5"
       -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
-
+########################################################################################################################
-
+####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:
@@ -127,8 +157,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:
@@ -145,35 +179,23 @@ build:mac:
       "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
   artifacts:
     paths: [gl-sast-report.json]
-
+########################################################################################################################
-
+####END####                                Static Application Security Tests                                 ####END####
-.license_management:
+########################################################################################################################
-  image: docker:stable
+########################################################################################################################
-  variables:
+####START####                            Run Verus CLI on Ubuntu Xenial (16.04)                            ####START####
-    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:
   image: ubuntu:xenial
   variables:
     DOCKER_DRIVER: overlay2
   stage: test
   before_script:
-  - apt update && apt install -y wget g++-multilib libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl4-gnutls-dev 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:
@@ -186,19 +208,23 @@ 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 g++-multilib libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl4-gnutls-dev 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:
@@ -211,9 +237,13 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:linux
-
+########################################################################################################################
-
+####END####                               Run Verus CLI on Ubuntu Bionic (18.04)                             ####END####
-.osx:sierra: # fetch-params.sh needs to be fixed for MacOS
+########################################################################################################################
+########################################################################################################################
+####START####                             Run Verus CLI on MacOS Sierra (10.12.6)                          ####START####
+########################################################################################################################
+.macos:sierra:
   stage: test
   tags: ["Sierra"]
   script:
@@ -225,13 +255,17 @@ build:mac:
     expire_in: 1 week
   dependencies:
   - build:mac
-
+########################################################################################################################
-
+####END####                               Run Verus CLI on MacOS Sierra (10.12.6)                            ####END####
-.osx:high-sierra: # fetch-params.sh needs to be fixed for MacOS
+########################################################################################################################
+########################################################################################################################
+####START####                          Run Verus CLI on MacOS High Sierra (10.12.6)                        ####START####
+########################################################################################################################
+.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:
@@ -239,8 +273,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"]
@@ -253,8 +291,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
@@ -266,18 +311,21 @@ deploy:
   - build:mac
   script:
   - mkdir Windows && mkdir Linux && mkdir MacOS &&
-    mv $VERUS_CLI_WINDOWS Windows &&
+    mv ${VERUS_CLI_WINDOWS} Windows &&
-    mv $VERUS_CLI_LINUX Linux &&
+    mv ${VERUS_CLI_LINUX} Linux &&
-    mv $VERUS_CLI_MACOS MacOS
+    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/
+  - gsutil cp -r Windows Linux MacOS $STAGING/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/
   - curl -X POST
       -F token="$CI_JOB_TOKEN"
-      -F ref=dev
+      -F ref="$DOWNSTREAM_AGAMA_BRANCH"
-      -F variables\[UPSTREAM_CLI_BRANCH\]="$CI_COMMIT_REF_NAME"
+      -F variables\[UPSTREAM_TRIGGER_INFO\]="${POST_MESSAGE}"
-      -F variables\[VERUS_CLI_LINUX\]="$VERUS_CLI_LINUX"
+      -F variables\[VERUS_CLI_LINUX\]="${VERUS_CLI_LINUX}"
-      -F variables\[VERUS_CLI_WINDOWS\]="$VERUS_CLI_WINDOWS"
+      -F variables\[VERUS_CLI_WINDOWS\]="${VERUS_CLI_WINDOWS}"
-      -F variables\[VERUS_CLI_MACOS\]="$VERUS_CLI_MACOS"
+      -F variables\[VERUS_CLI_MACOS\]="${VERUS_CLI_MACOS}"
       "https://gitlab.com/api/v4/projects/8018592/trigger/pipeline"
+########################################################################################################################
+####END####                                           Deploy                                                 ####END####
+########################################################################################################################

README.md

@@ -1,10 +1,9 @@
-## VerusCoin version 0.3.13-beta
+## 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/)
 - [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.
@@ -56,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
 ```
 
 

doc/man/verus-cli/linux/README.txt

@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.3.13-beta
+VerusCoin Command Line Tools v0.4.0b
 
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon

doc/man/verus-cli/mac/README.txt

@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.3.13-beta
+VerusCoin Command Line Tools v0.4.0b
 Contents:
 komodod - VerusCoin's enhanced Komodo daemon.
 komodo-cli - VerusCoin's enhanced Komodo command line utility.

doc/man/verus-cli/windows/README.txt

@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.3.13-beta
+VerusCoin Command Line Tools v0.4.0b
 Contents:
 komodod.exe - VerusCoin's enhanced Komodo daemon
 komodo-cli.exe - VerusCoin's Komodo command line utility

kmd/linux/verus-cli/fetch-params

@@ -1,165 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-PARAMS_DIR="$HOME/.zcash-params"
-
-SPROUT_PKEY_NAME='sprout-proving.key'
-SPROUT_VKEY_NAME='sprout-verifying.key'
-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 '')"
-
-# fetch methods can be disabled with ZC_DISABLE_SOMETHING=1
-ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}"
-ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}"
-
-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_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
-
-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 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
-    # create lock file
-    eval "exec 200>/$lockfile"
-    # acquire the lock
-    flock -n 200 \
-        && return 0 \
-        || return 1
-}
-
-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"
-
-    fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
-    fetch_params "$SPROUT_VKEY_NAME" "$PARAMS_DIR/$SPROUT_VKEY_NAME" "4bd498dae0aacfd8e98dc306338d017d9c08dd0918ead18172bd0aec2fc5df82"
-}
-
-main
-rm -f /tmp/fetch_params.lock
-exit 0

kmd/linux/verus-cli/verus

@@ -1,5 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-./komodo-cli -ac_name=VRSC "$@"

kmd/linux/verus-cli/verusd

@@ -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 "$@"

kmd/mac/verus-cli/fetch-params

@@ -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

kmd/mac/verus-cli/verus

@@ -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 "$@"

kmd/mac/verus-cli/verusd

@@ -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 "$@"

kmd/windows/verus-cli/fetch-params.bat

@@ -1,21 +0,0 @@
-@echo off
-call :GET_CURRENT_DIR
-cd %THIS_DIR%
-IF NOT EXIST %APPDATA%\ZcashParams (
-MKDIR %APPDATA%\ZcashParams
-)
-IF NOT EXIST %APPDATA%\ZcashParams\sprout-proving.key (
-    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/sprout-proving.key -O %APPDATA%\ZcashParams\sprout-proving.key
-)
-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
-)
-goto :EOF
-:GET_CURRENT_DIR
-pushd %~dp0
-set THIS_DIR=%CD%
-popd
-goto :EOF
-

makeReleaseLinux.sh

@@ -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

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 }'`
+    DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'`
-    echo "copying $DYLIBS to $KMD_DIR"
+    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 }'`
+    DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'`
-    echo "copying $DYLIBS to $KMD_DIR"
+    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 }'`
+    DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'`
-    echo "copying indirect $DYLIBS to $KMD_DIR"
+    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 "
+        echo "Next lib is ${dylib} "
-        install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary
+        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 "
+        echo "Next lib is ${dylib} "
-        install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary
+        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
-
 

requirements-debian.txt

@@ -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

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.0b"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;
 extern uint32_t ASSETCHAINS_MAGIC;

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
+
+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)

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);
 

src/verus

@@ -1,2 +1,5 @@
 #!/bin/bash
-komodo-cli -ac_name=VRSC "$@"
+#set working directory to the location of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+./komodo-cli -ac_name=VRSC "$@"

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='-g'
 "$MAKE" "$@" V=1

zcutil/fetch-params.bat

@@ -0,0 +1,32 @@
+@echo off
+call :GET_CURRENT_DIR
+cd %THIS_DIR%
+IF NOT EXIST %APPDATA%\ZcashParams (
+MKDIR %APPDATA%\ZcashParams
+)
+IF NOT EXIST %APPDATA%\ZcashParams\sprout-proving.key (
+    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/sprout-proving.key -O %APPDATA%\ZcashParams\sprout-proving.key
+)
+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