Merge pull request #458 from gcharang/dev

adds fetch-params script that still uses zcash url

zcutil/VerusCoin.xml

@@ -252,7 +252,7 @@
                     <filename>${windows_folder_appdata}/ZcashParams/sprout-proving.key</filename>
                     <progressText>Zcash Params file: sprout-proving.key</progressText>
                     <showMessageOnError>0</showMessageOnError>
-                    <url>https://komodoplatform.com/downloads/sprout-proving.key</url>
+                    <url>https://z.cash/downloads/sprout-proving.key.deprecated-sworn-elves</url>
                 </httpGet>
             </actionList>
             <ruleList>
@@ -274,7 +274,7 @@
                     <filename>${windows_folder_appdata}/ZcashParams/sprout-verifying.key</filename>
                     <progressText>Zcash Params file: sprout-verifying.key</progressText>
                     <showMessageOnError>0</showMessageOnError>
-                    <url>https://komodoplatform.com/downloads/sprout-verifying.key</url>
+                    <url>https://z.cash/downloads/sprout-verifying.key</url>
                 </httpGet>
             </actionList>
             <ruleList>

zcutil/fetch-params-alt.bat

@@ -0,0 +1,32 @@
+@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://komodoplatform.com/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://komodoplatform.com/downloads/sprout-verifying.key -O "%APPDATA%"\ZcashParams\sprout-verifying.key
+)
+IF NOT EXIST "%APPDATA%"\ZcashParams\sapling-spend.params (
+    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://komodoplatform.com/downloads/sapling-spend.params -O "%APPDATA%"\ZcashParams\sapling-spend.params
+)
+IF NOT EXIST "%APPDATA%"\ZcashParams\sapling-output.params (
+    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://komodoplatform.com/downloads/sapling-output.params -O "%APPDATA%"\ZcashParams\sapling-output.params
+)
+IF NOT EXIST "%APPDATA%"\ZcashParams\sprout-groth16.params (
+    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://komodoplatform.com/downloads/sprout-groth16.params -O "%APPDATA%"\ZcashParams\sprout-groth16.params
+)
+goto :EOF
+:GET_CURRENT_DIR
+pushd %~dp0
+set THIS_DIR=%CD%
+popd
+goto :EOF

zcutil/fetch-params.bat

@@ -6,23 +6,23 @@ 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://komodoplatform.com/downloads/sprout-proving.key -O "%APPDATA%"\ZcashParams\sprout-proving.key
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-proving.key.deprecated-sworn-elves -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://komodoplatform.com/downloads/sprout-verifying.key -O "%APPDATA%"\ZcashParams\sprout-verifying.key
+    .\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
 )
 IF NOT EXIST "%APPDATA%"\ZcashParams\sapling-spend.params (
     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://komodoplatform.com/downloads/sapling-spend.params -O "%APPDATA%"\ZcashParams\sapling-spend.params
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sapling-spend.params -O "%APPDATA%"\ZcashParams\sapling-spend.params
 )
 IF NOT EXIST "%APPDATA%"\ZcashParams\sapling-output.params (
     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://komodoplatform.com/downloads/sapling-output.params -O "%APPDATA%"\ZcashParams\sapling-output.params
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sapling-output.params -O "%APPDATA%"\ZcashParams\sapling-output.params
 )
 IF NOT EXIST "%APPDATA%"\ZcashParams\sprout-groth16.params (
     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://komodoplatform.com/downloads/sprout-groth16.params -O "%APPDATA%"\ZcashParams\sprout-groth16.params
+    .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-groth16.params -O "%APPDATA%"\ZcashParams\sprout-groth16.params
 )
 goto :EOF
 :GET_CURRENT_DIR

zcutil/fetch-params.sh

@@ -8,12 +8,13 @@ else
     PARAMS_DIR="$HOME/.zcash-params"
 fi
 
+SPROUT_PKEY_REALNAME='sprout-proving.key.deprecated-sworn-elves'
 SPROUT_PKEY_NAME='sprout-proving.key'
 SPROUT_VKEY_NAME='sprout-verifying.key'
 SAPLING_SPEND_NAME='sapling-spend.params'
 SAPLING_OUTPUT_NAME='sapling-output.params'
 SAPLING_SPROUT_GROTH16_NAME='sprout-groth16.params'
-SPROUT_URL="https://komodoplatform.com/downloads"
+SPROUT_URL="https://z.cash/downloads"
 SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo"
 
 SHA256CMD="$(command -v sha256sum || echo shasum)"
@@ -195,7 +196,7 @@ EOF
     cd "$PARAMS_DIR"
 
     # Sprout parameters:
-    fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
+    fetch_params "$SPROUT_PKEY_REALNAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
     fetch_params "$SPROUT_VKEY_NAME" "$PARAMS_DIR/$SPROUT_VKEY_NAME" "4bd498dae0aacfd8e98dc306338d017d9c08dd0918ead18172bd0aec2fc5df82"
 
     # Sapling parameters: