Remove the constraint system from the alpha proving key.

diff --git a/src/init.cpp b/src/init.cpp
index ff15894919e309726f6470313b6e57d8b193cd46..19ac9792da6b7f491f5aa2a4526c5b0576c6a46f 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -605,8 +605,8 @@ static void ZC_LoadParams()
     struct timeval tv_start, tv_end;
     float elapsed;
 
-    boost::filesystem::path pk_path = ZC_GetParamsDir() / "z5-proving.key";
-    boost::filesystem::path vk_path = ZC_GetParamsDir() / "z5-verifying.key";
+    boost::filesystem::path pk_path = ZC_GetParamsDir() / "z7-proving.key";
+    boost::filesystem::path vk_path = ZC_GetParamsDir() / "z7-verifying.key";
 
     pzcashParams = ZCJoinSplit::Unopened();
 

diff --git a/src/zcbenchmarks.cpp b/src/zcbenchmarks.cpp
index 1c9ae74884ffb65a24108da1501d613137b8f796..abe631f8b657bf4f65e68b0c4ab01e0265e956df 100644 (file)
--- a/src/zcbenchmarks.cpp
+++ b/src/zcbenchmarks.cpp
@@ -50,8 +50,8 @@ double benchmark_sleep()
 double benchmark_parameter_loading()
 {
     // FIXME: this is duplicated with the actual loading code
-    boost::filesystem::path pk_path = ZC_GetParamsDir() / "z5-proving.key";
-    boost::filesystem::path vk_path = ZC_GetParamsDir() / "z5-verifying.key";
+    boost::filesystem::path pk_path = ZC_GetParamsDir() / "z7-proving.key";
+    boost::filesystem::path vk_path = ZC_GetParamsDir() / "z7-verifying.key";
 
     timer_start();
 

diff --git a/zcutil/fetch-params.sh b/zcutil/fetch-params.sh
index 9736c667e4b693db8fec5ec573925228366be9a6..a28b3182c4d3829db37a88357f354ae8aed2d021 100755 (executable)
--- a/zcutil/fetch-params.sh
+++ b/zcutil/fetch-params.sh
@@ -4,8 +4,8 @@ set -eu
 
 PARAMS_DIR="$HOME/.zcash-params"
 
-REGTEST_PKEY_NAME='z5-proving.key'
-REGTEST_VKEY_NAME='z5-verifying.key'
+REGTEST_PKEY_NAME='z7-proving.key'
+REGTEST_VKEY_NAME='z7-verifying.key'
 REGTEST_PKEY_URL="https://z.cash/downloads/$REGTEST_PKEY_NAME"
 REGTEST_VKEY_URL="https://z.cash/downloads/$REGTEST_VKEY_NAME"
 REGTEST_DIR="$PARAMS_DIR/regtest"
@@ -86,8 +86,8 @@ cd "$PARAMS_DIR"
 # Now verify their hashes:
 echo 'Verifying parameter file integrity via sha256sum...'
 shasum -a 256 --check <<EOF
-72bd11091a1747de09fcfcddabbb1b4b6146a68ae2025bf732c1bee160366b75  regtest/$REGTEST_PKEY_NAME
-72bd11091a1747de09fcfcddabbb1b4b6146a68ae2025bf732c1bee160366b75  testnet3/$REGTEST_PKEY_NAME
+18bf2599787a2ed6ee4218d433983d15195944f8a40e09ef9cb80c186c142bc3  regtest/$REGTEST_PKEY_NAME
+18bf2599787a2ed6ee4218d433983d15195944f8a40e09ef9cb80c186c142bc3  testnet3/$REGTEST_PKEY_NAME
 239ddba9249bdd1f4ba7654b17a960bd319c1cefcd3cd79883b422d0f4a806da  regtest/$REGTEST_VKEY_NAME
 239ddba9249bdd1f4ba7654b17a960bd319c1cefcd3cd79883b422d0f4a806da  testnet3/$REGTEST_VKEY_NAME
 EOF