Merge branch 'dev' into dave-dev

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

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
 

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:

kmd/windows/verus-cli/README.txt

@@ -1,10 +1,16 @@
 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
 
+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.

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;
     }
 
@@ -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()));