clearmatics · AntoineRondelet · Jul 23, 2020 · Jun 17, 2020 · Jul 14, 2020 · Jul 15, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,38 +39,42 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   endif ()
 endif ()
 
-# Configure a header file to pass some of the CMake settings
-# to the source code
-configure_file(
-  "${PROJECT_SOURCE_DIR}/zeth_config.h.in"
-  "${PROJECT_BINARY_DIR}/zeth_config.h"
+# Default curve to use with zeth. Only useful for applications since all
+# library functions should be parameterized by type. Note, this is
+# intentionally independent of the libff variable `CURVE` to help ensure that
+# library code remains fully parameterized (and to avoid unnecessary rebuilds
+# of libff caused by changing compiler command line).
+set(
+  ZETH_CURVE
+  "ALT_BN128"
+  CACHE
+  STRING
+  "Default curve: one of BLS12_377, BW6_761, ALT_BN128, BN128, EDWARDS, MNT4, MNT6"
 )
 
-# Flags and compilation options to chose the type of zksnark
+# Configure a header file to pass some of the CMake settings
+# Option selecting the zk-SNARK scheme.
 set(
-  ZKSNARK
+  ZETH_SNARK
   "GROTH16"
   CACHE
   STRING
   "Default snark: one of PGHR13, GROTH16"
 )
 
+# Write configuration variables to the config header.
+configure_file(
+  "${PROJECT_SOURCE_DIR}/zeth_config.h.in"
+  "${PROJECT_BINARY_DIR}/zeth_config.h"
+)
+
 # Run only fast test (e.g. on CI machine)
 option(
   FAST_TESTS_ONLY
   "Include only fast-running tests"
   OFF
 )
 
-# Flags and compilation options for use with libsnark
-set(
-  CURVE
-  "ALT_BN128"
-  CACHE
-  STRING
-  "Default curve: one of ALT_BN128, BN128, EDWARDS, MNT4, MNT6"
-)
-
 set(
   DEPENDS_DIR
   "${CMAKE_CURRENT_SOURCE_DIR}/depends"
@@ -179,15 +183,8 @@ else()
   " No guarantees can be made if another compiler is used.")
 endif()
 
-add_definitions(-DCURVE_${CURVE})
-add_definitions(-DZKSNARK_${ZKSNARK})
-
 enable_testing()
 
-if(${CURVE} STREQUAL "BN128")
-  add_definitions(-DBN_SUPPORT_SNARK=1)
-endif()
-
 if("${VERBOSE}")
   add_definitions(-DVERBOSE=1)
 endif()
@@ -288,8 +285,12 @@ endif()
 
 # Add all local subdirecetories
 add_subdirectory(libzeth)
-add_subdirectory(prover_server)
-# For now the MPC for Groth16 only is tailored to the alt_bn128 pairing group
-if(${ZKSNARK} STREQUAL "GROTH16")
-  add_subdirectory(mpc_tools)
+
+# If zeth is being used as a dependency, skip the tools build
+if ("${IS_ZETH_PARENT}")
+  add_subdirectory(prover_server)
+  # For now the MPC for Groth16 only is tailored to the alt_bn128 pairing group
+  if(${ZETH_SNARK} STREQUAL "GROTH16")
+    add_subdirectory(mpc_tools)
+  endif()
 endif()
diff --git a/README.md b/README.md
@@ -84,8 +84,8 @@ Some flags to the `cmake` command can control the build configuration.
 a release or debug build.
 
 By default, zeth makes use 
F438
of the GROTH16 zk-snark. To chose a different
-zksnark run the following: ``` cmake -DZKSNARK=$ZKSNARK .. ``` where `$ZKSNARK`
-is `PGHR13` (see https://eprint.iacr.org/2013/279,
+zksnark run the following: ``` cmake -DZETH_SNARK=$ZKSNARK .. ``` where
+`$ZETH_SNARK` is `PGHR13` (see https://eprint.iacr.org/2013/279,
 http://eprint.iacr.org/2013/879) or `GROTH16`(see
 https://eprint.iacr.org/2016/260).
 

diff --git a/depends/libsnark b/depends/libsnark
diff --git a/libzeth/CMakeLists.txt b/libzeth/CMakeLists.txt
@@ -28,12 +28,6 @@ ExternalProject_Get_Property(libsodium INSTALL_DIR)
 set(libsodium_INCLUDE_DIR "${INSTALL_DIR}/include")
 set(libsodium_LIBRARY "${INSTALL_DIR}/lib/libsodium.a")
 
-# Add the binary tree to the search path for include files
-# so that we will find zethConfig.h
-include_directories(${PROJECT_BINARY_DIR})
-
-string(TOLOWER ${ZKSNARK} ZKSNARK_NAME)
-
 # zeth library
 file(
   GLOB_RECURSE

diff --git a/libzeth/circuits/circuit_types.hpp b/libzeth/circuits/circuit_types.hpp
@@ -10,26 +10,18 @@
 #include "libzeth/circuits/mimc/mimc_mp.hpp"
 #include "libzeth/core/include_libsnark.hpp"
 
-#include <libff/common/default_types/ec_pp.hpp>
-
 // Types that must be common across all executable, defined once here. Outside
 // of tests, these should not be set anywhere else in the code. Do not include
-// this file in code that is generic (parameterized on ppT or FieldT).
+// this file in code that is intended to be parameterized by hash type.
 
 namespace libzeth
 {
 
-// Use the pairing from build configuration
-using ppT = libff::default_ec_pp;
-
-// Field type for the pairing.
-using FieldT = libff::Fr<ppT>;
-
 // Hash used for the commitments and PRFs
-using HashT = BLAKE2s_256<FieldT>;
+template<typename FieldT> using HashT = BLAKE2s_256<FieldT>;
 
 // Hash function to be used in the Merkle Tree
-using HashTreeT = MiMC_mp_gadget<FieldT>;
+template<typename FieldT> using HashTreeT = MiMC_mp_gadget<FieldT>;
 
 } // namespace libzeth
 

diff --git a/libzeth/circuits/circuit_wrapper.hpp b/libzeth/circuits/circuit_wrapper.hpp
@@ -36,20 +36,20 @@ class circuit_wrapper
         joinsplit_g;
 
 public:
-    using FieldT = libff::Fr<ppT>;
+    using Field = libff::Fr<ppT>;
 
     circuit_wrapper();
 
     // Generate the trusted setup
     typename snarkT::KeypairT generate_trusted_setup() const;
 
     // Retrieve the constraint system (intended for debugging purposes).
-    libsnark::protoboard<FieldT> get_constraint_system() const;
+    libsnark::protoboard<Field> get_constraint_system() const;
 
     // Generate a proof and returns an extended proof
     extended_proof<ppT, snarkT> prove(
-        const FieldT &root,
-        const std::array<joinsplit_input<FieldT, TreeDepth>, NumInputs> &inputs,
+        const Field &root,
+        const std::array<joinsplit_input<Field, TreeDepth>, NumInputs> &inputs,
         const std::array<zeth_note, NumOutputs> &outputs,
         const bits64 &vpub_in,
         const bits64 &vpub_out,

diff --git a/libzeth/circuits/circuit_wrapper.tcc b/libzeth/circuits/circuit_wrapper.tcc
@@ -46,8 +46,8 @@ typename snarkT::KeypairT circuit_wrapper<
    NumOutputs,
     TreeDepth>::generate_trusted_setup() const
 {
-    libsnark::protoboard<FieldT> pb;
-    joinsplit_gadget<FieldT, HashT, HashTreeT, NumInputs, NumOutputs, TreeDepth>
+    libsnark::protoboard<Field> pb;
+    joinsplit_gadget<Field, HashT, HashTreeT, NumInputs, NumOutputs, TreeDepth>
         g(pb);
     g.generate_r1cs_constraints();
 
@@ -73,8 +73,8 @@ libsnark::protoboard<libff::Fr<ppT>> circuit_wrapper<
     NumOutputs,
     TreeDepth>::get_constraint_system() const
 {
-    libsnark::protoboard<FieldT> pb;
-    joinsplit_gadget<FieldT, HashT, HashTreeT, NumInputs, NumOutputs, TreeDepth>
+    libsnark::protoboard<Field> pb;
+    joinsplit_gadget<Field, HashT, HashTreeT, NumInputs, NumOutputs, TreeDepth>
         g(pb);
     g.generate_r1cs_constraints();
     return pb;
@@ -97,8 +97,8 @@ extended_proof<ppT, snarkT> circuit_wrapper<
     NumOutputs,
     TreeDepth>::
     prove(
-        const FieldT &root,
-        const std::array<joinsplit_input<FieldT, TreeDepth>, NumInputs> &inputs,
+        const Field &root,
+        const std::array<joinsplit_input<Field, TreeDepth>, NumInputs> &inputs,
         const std::array<zeth_note, NumOutputs> &outputs,
         const bits64 &vpub_in,
         const bits64 &vpub_out,
@@ -128,9 +128,9 @@ extended_proof<ppT, snarkT> circuit_wrapper<
         throw std::invalid_argument("invalid joinsplit balance");
     }
 
-    libsnark::protoboard<FieldT> pb;
+    libsnark::protoboard<Field> pb;
 
-    joinsplit_gadget<FieldT, HashT, HashTreeT, NumInputs, NumOutputs, TreeDepth>
+    joinsplit_gadget<Field, HashT, HashTreeT, NumInputs, NumOutputs, TreeDepth>
         g(pb);
     g.generate_r1cs_constraints();
     g.generate_r1cs_witness(

diff --git a/libzeth/snarks/default/default_api_handler.hpp b/libzeth/snarks/default/default_api_handler.hpp
diff --git a/libzeth/snarks/default/default_snark.hpp b/libzeth/snarks/default/default_snark.hpp
diff --git a/libzeth/snarks/groth16/groth16_api_handler.hpp b/libzeth/snarks/groth16/groth16_api_handler.hpp
@@ -8,7 +8,7 @@
 #include "libzeth/core/extended_proof.hpp"
 #include "libzeth/snarks/groth16/groth16_snark.hpp"
 
-#include <api/snark_messages.grpc.pb.h>
+#include <api/snark_messages.pb.h>
 
 namespace libzeth
 {

diff --git a/libzeth/snarks/pghr13/pghr13_api_handler.hpp b/libzeth/snarks/pghr13/pghr13_api_handler.hpp
@@ -5,10 +5,11 @@
 #ifndef __ZETH_SNARKS_PGHR13_PGHR13_API_HANDLER_HPP__
 #define __ZETH_SNARKS_PGHR13_PGHR13_API_HANDLER_HPP__
 
-#include "api/snark_messages.grpc.pb.h"
 #include "libzeth/core/extended_proof.hpp"
 #include "libzeth/snarks/pghr13/pghr13_snark.hpp"
 
+#include <api/snark_messages.pb.h>
+
 namespace libzeth
 {
+1 −1		depends/libff
+2 −2		libsnark/gadgetlib1/constraint_profiling.hpp
+6 −2		libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp
+40 −4		libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.tcc
+1 −1		libsnark/gadgetlib2/adapters.cpp