From ec4451c688cfe027ebfbd894284b3ab199a7ee47 Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 2 Jun 2018 09:44:41 -0700 Subject: [PATCH 1/6] Update README, adding fetch-params.sh --- kmd/mac/verus-cli/README.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kmd/mac/verus-cli/README.txt b/kmd/mac/verus-cli/README.txt index dc474ec4d..8131295ee 100644 --- a/kmd/mac/verus-cli/README.txt +++ b/kmd/mac/verus-cli/README.txt @@ -1,9 +1,10 @@ VerusCoin Command Line Tools v0.3.3-beta Contents: -komodod - the Komodo daemon -komodo-cli - Komodo command line utility +komodod - VerusCoin's enhanced Komodo daemon. +komodo-cli - VerusCoin's enhanced Komodo command line utility. verus - wrapper for komodo-cli that applies the command to the VRSC coin -verusd - wrapper for komodod that sets the VerusCoin parameters to defaults properly. +verusd - wrapper for komodod that sets the VerusCoin parameters to defaults properly +fetch_params.sh - utility to download the zcash parameters needed to start the VerusCoin command line tools and scripts The first time on a new system you will need to run ./fetchparams.sh before using komodod or verusd. You will need to install xcode from the Apple App Store and run the following two commands before running the command line tools: From e68844becf5fb3bf9cf3c81f1c6673bc52c6745f Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 2 Jun 2018 10:03:14 -0700 Subject: [PATCH 2/6] Update Mac and Windows READMEs as well. --- kmd/linux/verus-cli/README.txt | 4 ++-- kmd/windows/verus-cli/README.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index 6a11e966a..303105448 100644 --- a/kmd/linux/verus-cli/README.txt +++ b/kmd/linux/verus-cli/README.txt @@ -1,7 +1,7 @@ VerusCoin Command Line Tools v0.3.3-beta Contents: -komodod - the Komodo daemon -komodo-cli - Komodo command line utility +komodod - VerusCoin's enhanced Komodo daemon +komodo-cli - VerusCoin's Komodo command line utility verus - wrapper for komodo-cli that applies the command to the VRSC coin verusd - wrapper for komodod that sets the VerusCoin parameters to defaults properly diff --git a/kmd/windows/verus-cli/README.txt b/kmd/windows/verus-cli/README.txt index 0020cfe20..1a0bc19ed 100644 --- a/kmd/windows/verus-cli/README.txt +++ b/kmd/windows/verus-cli/README.txt @@ -1,7 +1,7 @@ VerusCoin Command Line Tools v0.3.3-beta Contents: -komodod.exe - the Komodo daemon -komodo-cli.exe - Komodo command line utility +komodod.exe - VerusCoin's enhanced Komodo daemon +komodo-cli.exe - iVerusCoin's Komodo command line utility verus.bat - wrapper for komodo-cli that applies the command to the VRSC coin verusd.bat - wrapper for komodod that sets the VerusCoin parameters to defaults properly From 88fd814555c500ad5888b398c22cb3d9bcc7ba5a Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 2 Jun 2018 14:29:12 -0700 Subject: [PATCH 3/6] Document command line arguement passing with = in Windows README. --- kmd/windows/verus-cli/README.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kmd/windows/verus-cli/README.txt b/kmd/windows/verus-cli/README.txt index 1a0bc19ed..88db1c863 100644 --- a/kmd/windows/verus-cli/README.txt +++ b/kmd/windows/verus-cli/README.txt @@ -5,6 +5,12 @@ komodo-cli.exe - iVerusCoin's Komodo command line utility verus.bat - wrapper for komodo-cli that applies the command to the VRSC coin verusd.bat - wrapper for komodod that sets the VerusCoin parameters to defaults properly +The first time on a new system you will need to run ./fetchparams.sh before using komodod or verusd. +Many virus scanniong products interfere with the VerusCoin tool's ability to open ports and will need to be configfured to allow what the scanner says is unsafe behavior. Extreme cases can result in the virus scanner deleting Agama.exe or moving it to "protect" the system. You will needs to disable those features and re-extract the verus-cli-windows.zip file if that happens. Run verusd.bat to launch komodod, and use verus.bat to run commands such as: verus.bat stop Which signals komodod.exe (if it is running) to stop running. + +Note that if you pass in command line options to verus.bat or verusd.bat that include an = like -ac_veruspos=50 you must surround it with double quotes like this: +verusd.bat "-ac_veruspos=50" +Otherwise Windows will drop the = and pass the two values in as separate command line options. From f248d6a61cb77d792a26e57235d96ad708e8e429 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 2 Jun 2018 16:44:58 -0700 Subject: [PATCH 4/6] travis clean up --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8c43acd2..bea4c6a1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,8 @@ matrix: exclude: - compiler: gcc install: -- if [ $TRAVIS_OS_NAME = linux ]; then sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && - travis_retry sudo apt-get -y update && travis_retry sudo apt-get -y install -qq $PACKAGES; fi +- sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list +- travis_retry sudo apt-get -y update && travis_retry sudo apt-get -y install -qq $PACKAGES - if [ -n "$RUST_TARGET" ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH && rustup target add $RUST_TARGET; fi before_script: From 36d8ef6b7b1e0da771c475c7ad2ab7fab60bcb2e Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sat, 2 Jun 2018 23:01:58 -0700 Subject: [PATCH 5/6] Fix "setgenerate true 0" to properly stake --- src/rpcmining.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index c9bbd967d..f475a4258 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -32,7 +32,7 @@ using namespace std; -extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH; +extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH, ASSETCHAINS_LWMAPOS; /** * Return average network hashes per second based on the last 'lookup' blocks, @@ -320,7 +320,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp) if (params.size() > 1) { nGenProcLimit = params[1].get_int(); - if (nGenProcLimit == 0) + if (ASSETCHAINS_LWMAPOS == 0 && nGenProcLimit == 0) fGenerate = false; } From cf98848cd4dc24436493a8a1f37919945df780b2 Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sun, 3 Jun 2018 09:19:41 -0700 Subject: [PATCH 6/6] return 0 for hash rate rather than stale value when not generating --- src/rpcmining.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index f475a4258..d80996b8b 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -375,12 +375,12 @@ UniValue getmininginfo(const UniValue& params, bool fHelp) obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH) { - obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); - obj.push_back(Pair("networksolps", getnetworksolps(params, false))); + obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); + obj.push_back(Pair("networksolps", getnetworksolps(params, false))); } else { - obj.push_back(Pair("localhashps" , getlocalsolps(params, false))); + obj.push_back(Pair("localhashps" , GetBoolArg("-gen", false) ? getlocalsolps(params, false) : (double)0.0)); } obj.push_back(Pair("networkhashps", getnetworksolps(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));