Browse Source

Update the zkSNARK parameters.

pull/145/head
Sean Bowe 8 years ago
parent
commit
1744fec274
  1. 2
      qa/zcash/performance-measurements.sh
  2. 4
      src/init.cpp
  3. 4
      src/zcbenchmarks.cpp
  4. 12
      zcutil/fetch-params.sh

2
qa/zcash/performance-measurements.sh

@ -48,7 +48,7 @@ function zcashd_valgrind_stop {
cat valgrind.out
}
RAWTXWITHPOUR=0200000000000000000001000000000000000000000000000000000323f2850bf3444f4b4c5c09a6057ec7169190f45acb9e46984ab3dfcec4f06a4ca90fde5d902715a99c7941401c0e5648747cf504a5cbe3bdab88c32039c5aa5da9f762a8f80312931db58afe544fcb5d83da6cf2d08e1f7a383efb7a653d417e071560f9a07e379a9db1d4dc4a47ca2ac6e3af47600118461a7ba66350141662ede694951d57a6b826f5b0200137b9ab50ed7b5f6a1e837b291567c5cc5e5e6cae9f20d7730fb03dfa688b23b4957a1b0e7a89aad7decc778dff0bc0add47e8d93f457c548d9c0689f69491d931f06c000b55a0a87675353fbf187610d7255f662cc66524d5eb3b51f024ef7bda310915b835fba21eeeaa1cd39adf9f3045273d648b955ef270496385d6128386cd23f8bec8647942fe5750ca69c65c2fdad63060ddac4290ae85d5fbeacd392c59781a5fb640ac7c00aee10a4b1f64e3e1840fcb249ac2b4470afab4c0dbb8a87c033de2b583684e2eb2c5a4343b3983a4ded84b883902ec5bd1a9a6c536344b6d4a1e36ed738dbbe65b7515e95712837d1c5e4bf1f12ffcaf96a97af127283290e96930b3e629c4813439619ab3754af68eb85571e1e8a351a9b4d33736a75b5291911de3a68934c03495a706c3f9ce75f2721b03196cc4c336d3c5bc94789282cda62d45a57ef73716ac9e4ea5c6f22a054eb2ac81e9cf80474f7b5e4d23dabad1744ca850fd0ed63dd88b2a46b30d7c63aae899201f8e5b2a1c5321ff4bcfd019ab210c1e7b778ca40b0b86f5cfff527964ab9767b24b6c647fea3655e959b459dcde72a89526746c91cd32f049ba84ad483c4584fc17890b894091a5ca10a3833154c216d1934c4a36fa103a3ef0e889437f1f17056441fa34df7bfc98bda8475da37779901cf1d340cf3cadbf72ca62663bb9ffbd3a2804c689f3aa352b52469189fcbe0defc3a31fe53c5497b568853b7d64337712f23cd479664b5f5ae566e9744ad2463f729fbe9cf4906aac73c0f8266f7334a012fff3079ae13302200d7ac30ae6766768e7b418636674e32ad7870159478248a8d7eda0b7b92b49e0b357417984a158bffba6ff85efab3855a81300cad3ec3c5380dce6b0f9c72ffd4765b3030d571d527c47c6c641855abfc5bfa3b14c05a4232b899d84f45c829e6c1e9481c5e6fed7dbf2029d0d1c8e77e0abbd31ddf61aeae51d3f14a97cd63709dce681b30a575e5397d16901faa00e7bed4edd8bf60d8e1649f5338b11fed8e037ad68f119495f9d800f6fb26b21798855733fd4147314f9e3f834eecb433631a69e9fe119d35e3b64bb654ca78d3befa24af81fd34b9b585395c8e3b6fe3952cd720682f0c294e4b7a47dc68a284d61abd4276a8a0900afed40d32d4e1bb94a566766c1f3038dfa6e80a78c8dd4a0f1533bcacf591cccdc2a66905563caa4d041f179ca52dae880ab838d6d6ba2b917ebbb180704a30d279aa93ce44bf89d9aad387787610303ddf938f09974ced9e8a5c5b1162fd3c2fa7809f5add210f8bfeee0b6f6f670bb3b7b2c841cf929e262098927e91e05747fba0a66529197b21ee10faba97a0113014f1602df3d6467dc26ec462f282966c46aa8298efbb9c24103aa5bf48ef2808a241754e9e4e349df0626f9feac937221eb37606c4d40e4922827c3150ebe30330205d36d40f824c03ab45973c5a13e99fab321d755a4225a9110576edaa5b720ce968a7ecb9675031c622d3834cf5d59d6ef33b183df0a430713143df39fdf81f30a30e1d96abc49316d22567f9bd2e60d20130322eded241d97cb01cccf3bcde25314e0e0eb18258202233df9219ebfdcb1ca7005d028c48ee3e10b363fd66f2201712e06ac49c39114fcd156b7748c95b928eda60fe4e7043b1f53249281065e27dc0e75c820fb44200b18af63cab7ed6d2d93c03702a90552171f6f38cda7108a1ee5a0550771ef500ce371a8dd358316c28c032550674e4cb70edfc097f260b
RAWTXWITHPOUR=020000000000000000000100000000000000000000000000000000d7c612c817793191a1e68652121876d6b3bde40f4fa52bc314145ce6e5cdd259df64fc01b984cd264470d2493b27cb38032874c549fa188ea9ed246d881d01b6033614a202b4f7e64805076652aa036ff94997285df9ddd5a3d2b1220c08dfc9fafd306aa43429b34a0329755698ee934a358ebac3e8aaf06d51eaafb32ac82a0e0ba078e1ae3dc14231d885ffcafa66af334e8c6b9d444a52075c70466900fe6829c1bb02f56451246bedc77d271c6fcf51c1130331e5bf7691682d977af162dd79fbde8a64909ab7f2fc76d8ca9afaa9a065a88dc91d3e6606da73f58ade8e16dbded49b93002bf4aecb466a2d57bda375c4ed4e1b1f6d77f81bd4a2f0e28c2262b98b972370ffbf8742748fd3050332530b3c0a3176806c703e2e7b5530688a53be9e9cfc6228ab1e5e909848614b7279f316c5b4338289e055fbf9eb1bbecdb259d4777628e7c90e97c4c6f185f7c7ed57024e39651d94b6db8d2906d798f4fa82275abb64060264cbbd2e9657ca9934957bbf2fef7670013419ba56a2faa761bb7b4a9639f2f1a266a083d71c1a0f8e4fd3c83234c925ca255effe51a8a527a37132447366a00a57a6032cdcb0b4e85781fe6ab912e5e4f51a20764e5543a7fecec8a2ff3fb16496608f605f167aded4f71b9dc8fcb37d7006da32fc85a496e85755a13e3ed6708a80355212c028966ea3f3b4afdf28e3578d491add09a4bf04554d8486f232b7d66e0e57d4129166b8d22ec1bb7e85edf6c89ff4aa8b84b92e83625965e4fd531f6caf9c48656fdf6c6ee6b57a947c203213146103ea966fb907a9fd2a7ec3d90179a47dac944792055ff22a04f0c8841623159909f0f9d1ef3542aa9776723bce6b7ad1c8c4906494cccd226935f04ab6335a7c6807f9eaed8fc14183cbec8090ce10c1eb389a720034d96c6a4fad081ca70ad0b5a5ee0250b37d0c5745eb8fd8bfbb284ceb8df4d9ed8136f4c46fd0fb50ae8328bc8e55eae2ac986392e87658fae606647b7884b30fb95621c378ad36b3ace9bcfeaaf47b38fc815a604526e52995bf17448c91e2a3b072fdaf717d7dd4a2743c3a0460e65a2d3520313e1aafb0894ce7be6829b2f30b4f2a541dbbe37b455383a0d9ec2d06d9e2e2872935b7c77bc00dc9185b40e23c53041d4024a5e24747b84a7acf8abb6906eb2f05e5e82b7a995ce727e9d3a04304f46df202583aa09c440f712d08eb93c16de89d761baed8794d14cfc6a41000b10e835ee6ba661bb0da8f3811c85920d1a069055488eb8a10301c22a4d20bc297a2687e805e2988fdefb48d94bac775f39505f92c45bc7f02d1cda3357306909cd6c5fbaefc987b556a406cf7a1bef6867a3d809063332db8aa5c4e08380610a30f2629b1d1d8f0f2b8d2cd37d611f574c074bbc1236436667208d5077b08d0303c24de96169fba61de2d6c1e8def6e5ac409b3dc36eaafa25425f073d63a2d21d3095ff55cfd9c8e1dd1f9071d3d35465b403470ff2c631a9cbc3654a8a6279680c6cd975a8a6a7bf8971171b9eb1b5f6c9de58889022ca32e2d9df7280e8a1fd12306ed060c4748e4e1205f0eeaa30a6e06cd9f25fa2f1407d935846fd0101b80400f09065198362eeef213d974edfcb60a99230c05d7d572a16f78a64124ea1480c30531cfc54ef4adb571eef63a5feb614d79f840f17a4e84a5dfceae86679ac93015ac290d8e47b08215381d83f7116b82d4244231bc3ea50394f7e86cc4913810e3081e54cbf537fba6bb3191252b75393f33fe5c6bcaa73bc088c3fcf3e23ab4c13329f89f42094b05e57e8a10d8e61962cd200cd11470e1bc20ccfc05006f38517b8b000e40fc91358db1919054aa8c2b470a23da91f6469ca271fc44852b3cb4527f5c4cfc2ba376da776412b4b900cc3ea3da80205824631f6acab1f56c5d9cbeb96d72577e4428fccee81e2111802c7ce1ecf8b99ad3f22fd4aca719a48ce0b
case "$1" in
time)

4
src/init.cpp

@ -603,8 +603,8 @@ static void ZC_LoadParams()
struct timeval tv_start, tv_end;
float elapsed;
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z4-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z4-verification.key";
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z5-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z5-verifying.key";
pzcashParams = ZCJoinSplit::Unopened();

4
src/zcbenchmarks.cpp

@ -44,8 +44,8 @@ double benchmark_sleep()
double benchmark_parameter_loading()
{
// FIXME: this is duplicated with the actual loading code
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z4-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z4-verification.key";
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z5-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z5-verifying.key";
timer_start();

12
zcutil/fetch-params.sh

@ -4,8 +4,8 @@ set -eu
PARAMS_DIR="$HOME/.zcash-params"
REGTEST_PKEY_NAME='z4-proving.key'
REGTEST_VKEY_NAME='z4-verification.key'
REGTEST_PKEY_NAME='z5-proving.key'
REGTEST_VKEY_NAME='z5-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,9 +86,9 @@ cd "$PARAMS_DIR"
# Now verify their hashes:
echo 'Verifying parameter file integrity via sha256sum...'
shasum -a 256 --check <<EOF
25014d1a836b180b9afc847b98feb9fadf43afd2875ecf1a026c2aed0d74f5d0 regtest/$REGTEST_PKEY_NAME
25014d1a836b180b9afc847b98feb9fadf43afd2875ecf1a026c2aed0d74f5d0 testnet3/$REGTEST_PKEY_NAME
e6b1afb87d24b41a9abc9e3500c0758f377c172505cd5795bac713b5de737388 regtest/$REGTEST_VKEY_NAME
e6b1afb87d24b41a9abc9e3500c0758f377c172505cd5795bac713b5de737388 testnet3/$REGTEST_VKEY_NAME
72bd11091a1747de09fcfcddabbb1b4b6146a68ae2025bf732c1bee160366b75 regtest/$REGTEST_PKEY_NAME
72bd11091a1747de09fcfcddabbb1b4b6146a68ae2025bf732c1bee160366b75 testnet3/$REGTEST_PKEY_NAME
239ddba9249bdd1f4ba7654b17a960bd319c1cefcd3cd79883b422d0f4a806da regtest/$REGTEST_VKEY_NAME
239ddba9249bdd1f4ba7654b17a960bd319c1cefcd3cd79883b422d0f4a806da testnet3/$REGTEST_VKEY_NAME
EOF

Loading…
Cancel
Save