From 95b8f04f77cae4bcaa327ef6f699941ba948b1f2 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 26 Oct 2018 09:29:57 -0700 Subject: [PATCH 1/2] Updating version --- .gitlab-ci.yml | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 308af2a8e..0ee0fe148 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: ####START#### PROJECT LEVEL VARIABLES ####START#### ######################################################################################################################## variables: - VERSION: 0.4.0b + VERSION: 0.4.0c 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 diff --git a/README.md b/README.md index 3b0e4d4f9..df152ff29 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## VerusCoin version 0.4.0b +## VerusCoin version 0.4.0c 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 85e0a9949..cb2c10f0f 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.0b +VerusCoin Command Line Tools v0.4.0c 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 7b4d8252e..367e52fce 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.0b +VerusCoin Command Line Tools v0.4.0c 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 0b7f17b71..aa71d8c3f 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.0b +VerusCoin Command Line Tools v0.4.0c 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 c799d9eaf..9588cb67e 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.0b" +#define VERUS_VERSION "0.4.0c" extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT; extern uint32_t ASSETCHAINS_CC; extern uint32_t ASSETCHAINS_MAGIC; From 08682464379391593fceb7b78bb42bbffaaaa62c Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 27 Oct 2018 18:00:53 -0700 Subject: [PATCH 2/2] Removing redundant verus script from src. Moving verus.bat from src to scr/fiat Adjusting gitlab-ci configuration and Mac release packaging script to comform to the changes. --- .gitlab-ci.yml | 4 ++-- makeReleaseMac.sh | 2 +- src/{ => fiat}/verus.bat | 0 src/verus | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) rename src/{ => fiat}/verus.bat (100%) delete mode 100755 src/verus diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ee0fe148..b26399a9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ build:linux: - mkdir verus-cli - cp src/komodod src/komodo-cli - src/verus + src/fiat/verus src/verusd doc/man/verus-cli/linux/README.txt zcutil/fetch-params.sh @@ -83,7 +83,7 @@ build:windows: - cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe - src/verus.bat + src/fiat/verus.bat src/verusd.bat doc/man/verus-cli/windows/README.txt zcutil/fetch-params.bat diff --git a/makeReleaseMac.sh b/makeReleaseMac.sh index 61dc5d45c..2ecf271cc 100755 --- a/makeReleaseMac.sh +++ b/makeReleaseMac.sh @@ -3,7 +3,7 @@ KMD_DIR=verus-cli mkdir ${KMD_DIR} -cp src/verus \ +cp src/fiat/verus \ src/verusd \ doc/man/verus-cli/mac/README.txt \ zcutil/fetch-params.sh \ diff --git a/src/verus.bat b/src/fiat/verus.bat similarity index 100% rename from src/verus.bat rename to src/fiat/verus.bat diff --git a/src/verus b/src/verus deleted file mode 100755 index 7e4109b59..000000000 --- a/src/verus +++ /dev/null @@ -1,5 +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 "$@"