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

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

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

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

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.

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

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 \

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;