Merge branch 'dev' into dave-dev

.gitignore

@@ -1,6 +1,5 @@
 *.tar.gz
 *.deb
-*.exe
 src/bitcoin
 src/zcashd
 src/zcash-cli
@@ -122,6 +121,9 @@ src/komodod
 src/komodo-tx
 src/komodo-test
 src/wallet-utility
+src/komodo-cli.exe
+src/komodod.exe
+src/komodo-tx.exe
 
 #output during builds, symbol tables?
 *.dSYM

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

@@ -0,0 +1,21 @@
+@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
+

src/chainparams.cpp

@@ -176,6 +176,8 @@ public:
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();
         // guarantees the first two characters, when base58 encoded, are "zc"
         base58Prefixes[ZCPAYMENT_ADDRRESS] = {22,154};
+        // guarantees the first 4 characters, when base58 encoded, are "ZiVK"
+        base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
         // guarantees the first two characters, when base58 encoded, are "SK"
         base58Prefixes[ZCSPENDING_KEY] = {171,54};
 
@@ -499,6 +501,8 @@ public:
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[ZCPAYMENT_ADDRRESS] = {20,81};
+        // guarantees the first 4 characters, when base58 encoded, are "ZiVt"
+        base58Prefixes[ZCVIEWING_KEY]  = {0xA8,0xAC,0x0C};
         base58Prefixes[ZCSPENDING_KEY] = {177,235};
 
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));