Merge pull request #89 from clearmatics/v0.5-final-fixes

final changes for v0.5
clearmatics · Nov 4, 2021 · c5a16fd · c5a16fd
2 parents 67560f6 + 414bea8
commit c5a16fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/aggregator_server/aggregator_server.cpp b/aggregator_server/aggregator_server.cpp
@@ -81,7 +81,7 @@ static void load_keypair(
         keypair_file.c_str(), std::ios_base::in | std::ios_base::binary);
     in.exceptions(
         std::ios_base::eofbit | std::ios_base::badbit | std::ios_base::failbit);
-    return wsnark::keypair_read_bytes(keypair, in);
+    wsnark::keypair_read_bytes(keypair, in);
 }
 
 static void write_keypair(

diff --git a/depends/zeth b/depends/zeth
+1 −1		CMakeLists.txt
+2 −2		CONTRIBUTING.md
+1 −1		client/zeth/cli/utils.py
+1 −1		client/zeth/core/mimc.py
+3 −3		client/zeth/core/mixer_client.py
+2 −2		debug/analyzer/parse_r1cs.py
+1 −1		depends/libsnark
+1 −1		libzeth/circuits/blake2s/blake2s_comp.tcc
+2 −2		libzeth/circuits/joinsplit.tcc
+3 −2		libzeth/circuits/mimc/mimc_permutation.hpp
+1 −1		libzeth/circuits/notes/note.hpp
+1 −1		libzeth/core/chacha_rng.cpp
+1 −1		libzeth/core/utils.hpp
+1 −1		libzeth/mpc/groth16/mpc_hash.cpp
+1 −1		libzeth/mpc/groth16/mpc_utils.tcc
+4 −4		libzeth/mpc/groth16/phase2.hpp
+1 −1		libzeth/serialization/stream_utils.hpp
+3 −3		libzeth/tests/circuits/blake2s_test.cpp
+1 −1		libzeth/tests/mpc/groth16/mpc_test.cpp
+2 −2		libzeth/tests/prover/prover_test.cpp
+2 −2		mpc_tools/mpc_phase2/cli/README.md
+1 −1		mpc_tools/mpc_phase2/cli/mpc_linear_combination.cpp
+3 −2		mpc_tools/mpc_phase2/cli/mpc_phase2_verify_transcript.cpp
+1 −1		proto/zeth/api/ec_group_messages.proto
+1 −1		scripts/mimc_constraints.sage
+1 −1		scripts/test-zeth-cli
+1 −1		scripts/test-zeth-cli-token
+1 −1		zeth_contracts/contracts/LibGroth16AltBN128.sol
+1 −1		zeth_contracts/contracts/LibGroth16BLS12_377.sol
+1 −1		zeth_tool/README.md