From d9ef8f622ee0ebd27ba83668316c81b2a177afb2 Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Thu, 2 Aug 2018 12:18:13 -0600
Subject: [PATCH] Check the hash of the (Sapling+) zk-SNARK parameters during
 initialization.

---
 depends/packages/librustzcash.mk | 4 ++--
 src/gtest/main.cpp               | 5 ++++-
 src/init.cpp                     | 5 ++++-
 src/test/test_bitcoin.cpp        | 5 ++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/depends/packages/librustzcash.mk b/depends/packages/librustzcash.mk
index aeff4d890..46cf909f1 100644
--- a/depends/packages/librustzcash.mk
+++ b/depends/packages/librustzcash.mk
@@ -3,8 +3,8 @@ $(package)_version=0.1
 $(package)_download_path=https://github.com/zcash/$(package)/archive/
 $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
 $(package)_download_file=$($(package)_git_commit).tar.gz
-$(package)_sha256_hash=1700c1699552f3aa4db8de265399bc6606ae976b6741f7bbeb0b89f24abf9f7f
-$(package)_git_commit=f55a654901dc6278dd5738f06f2e70263fccd96b
+$(package)_sha256_hash=4d022b66e554efbf6db01b2a282e312e8a1b492c4680299ae8c26629882eb46b
+$(package)_git_commit=f5d2afb4eabac29b1b1cc860d66e45a5b48b4f88
 $(package)_dependencies=rust $(rust_crates)
 $(package)_patches=cargo.config
 
diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp
index be7ddd33c..43820f1df 100644
--- a/src/gtest/main.cpp
+++ b/src/gtest/main.cpp
@@ -40,8 +40,11 @@ int main(int argc, char **argv) {
 
   librustzcash_init_zksnark_params(
       sapling_spend_str.c_str(),
+      "35f6afd7d7514531aaa9fa529bdcddf116865f02abdd42164322bb1949227d82bdae295cad9c7b98d4bbbb00e045fa17aca79c90f53433a66bce4e82b6a1936d",
       sapling_output_str.c_str(),
-      sprout_groth16_str.c_str()
+      "f9d0b98ea51830c4974878f1b32bb68b2bf530e2e0ae09cd2a9b609d6fda37f1a1928e2d1ca91c31835c75dcc16057db53a807cc5cb37ebcfb753aa843a8ac21",
+      sprout_groth16_str.c_str(),
+      "7a6723311162cb0c664c742d2fa42278195ade98ba3f21ef4fa02b82c83aed696e107e389ac7b3b0f33f417aeefe5be775d117910a473a422b4a1b97489fbdd6"
   );
   
   testing::InitGoogleMock(&argc, argv);
diff --git a/src/init.cpp b/src/init.cpp
index 8c50acc78..71630ac95 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -738,8 +738,11 @@ static void ZC_LoadParams(
 
         librustzcash_init_zksnark_params(
             sapling_spend_str.c_str(),
+            "35f6afd7d7514531aaa9fa529bdcddf116865f02abdd42164322bb1949227d82bdae295cad9c7b98d4bbbb00e045fa17aca79c90f53433a66bce4e82b6a1936d",
             sapling_output_str.c_str(),
-            sprout_groth16_str.c_str()
+            "f9d0b98ea51830c4974878f1b32bb68b2bf530e2e0ae09cd2a9b609d6fda37f1a1928e2d1ca91c31835c75dcc16057db53a807cc5cb37ebcfb753aa843a8ac21",
+            sprout_groth16_str.c_str(),
+            "7a6723311162cb0c664c742d2fa42278195ade98ba3f21ef4fa02b82c83aed696e107e389ac7b3b0f33f417aeefe5be775d117910a473a422b4a1b97489fbdd6"
         );
 
         gettimeofday(&tv_end, 0);
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 4f97b9ca6..95e60a93d 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -51,8 +51,11 @@ JoinSplitTestingSetup::JoinSplitTestingSetup()
 
     librustzcash_init_zksnark_params(
         sapling_spend_str.c_str(),
+        "35f6afd7d7514531aaa9fa529bdcddf116865f02abdd42164322bb1949227d82bdae295cad9c7b98d4bbbb00e045fa17aca79c90f53433a66bce4e82b6a1936d",
         sapling_output_str.c_str(),
-        sprout_groth16_str.c_str()
+        "f9d0b98ea51830c4974878f1b32bb68b2bf530e2e0ae09cd2a9b609d6fda37f1a1928e2d1ca91c31835c75dcc16057db53a807cc5cb37ebcfb753aa843a8ac21",
+        sprout_groth16_str.c_str(),
+        "7a6723311162cb0c664c742d2fa42278195ade98ba3f21ef4fa02b82c83aed696e107e389ac7b3b0f33f417aeefe5be775d117910a473a422b4a1b97489fbdd6"
     );
 }