From ade357cd3c50d74ae76a0957bcce7e1964962617 Mon Sep 17 00:00:00 2001 From: Alex English Date: Wed, 26 May 2021 21:29:10 -0700 Subject: [PATCH] Updated zcparam URLs, removed logic for downloading in parts. --- zcutil/fetch-params.bat | 4 ++-- zcutil/fetch-params.sh | 27 +++++++++------------------ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/zcutil/fetch-params.bat b/zcutil/fetch-params.bat index ef7135cfd..aa47ff00f 100644 --- a/zcutil/fetch-params.bat +++ b/zcutil/fetch-params.bat @@ -12,7 +12,7 @@ SET sapling-spend.params=8e48ffd23abb3a5fd9c5589204f32d9c31285a04b78096ba40a79b7 SET sapling-output.params=2f0ebbcbb9bb0bcffe95a397e7eba89c29eb4dde6191c339db88570e3f3fb0e4 SET sprout-groth16.params=b685d700c60328498fbde589c8c7c484c722b788b265b72af448a5bf0ee55b50 SET "ZPARAMS_DIR=%APPDATA%\ZcashParams" -SET ZPARAMS_URL=https://z.cash/downloads +SET ZPARAMS_URL=https://verus.io/zcparams CALL :MAIN @@ -84,4 +84,4 @@ FOR /f "skip=1 tokens=* delims=" %%# IN ('certutil -hashfile !file! SHA256') DO ) ) SET "%~2=!sha256sum!" -GOTO :EOF \ No newline at end of file +GOTO :EOF diff --git a/zcutil/fetch-params.sh b/zcutil/fetch-params.sh index 300e12341..d9a5af16f 100755 --- a/zcutil/fetch-params.sh +++ b/zcutil/fetch-params.sh @@ -13,7 +13,7 @@ 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://download.z.cash/downloads" +SPROUT_URL="https://verus.io/zcparams" SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo" SHA256CMD="$(command -v sha256sum || echo shasum)" @@ -107,26 +107,17 @@ function fetch_params { if ! [ -f "$output" ] then - for i in 1 2 - do - for method in wget ipfs curl failure; do - if "fetch_$method" "${filename}.part.${i}" "${dlname}.part.${i}"; then - echo "Download of part ${i} successful!" - break - fi - done - done - - for i in 1 2 - do - if ! [ -f "${dlname}.part.${i}" ] - then - fetch_failure + for method in wget ipfs curl failure; do + if "fetch_$method" "${filename}" "${dlname}"; then + echo "Download successful!" + break fi done - cat "${dlname}.part.1" "${dlname}.part.2" > "${dlname}" - rm "${dlname}.part.1" "${dlname}.part.2" + if ! [ -f "${dlname}" ] + then + fetch_failure + fi "$SHA256CMD" $SHA256ARGS -c <