Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

final changes for v0.5 #89

Merged
merged 2 commits into from
Nov 4, 2021
Merged

final changes for v0.5 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17cfc24
remove redundant return
dtebbs Nov 3, 2021
414bea8
submodule: update zeth
dtebbs Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aggregator_server/aggregator_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, this return isn't needed.
We could stick to the approach used in Zeth though and change the returned type to a snark:keypair and declare the keypair in the function. However, we would have some copy of the keypair when return.
TL;DR is: this change looks good to me but we have some slight inconsistency between similar functions in Zeth and Zecale, so that would be valuable to clear that out (and probably move these functions in a namespace like libzeth::server that could then be used on zecale as libzeth::server::load_keypair)

(see: https://github.com/clearmatics/zeth/blob/develop/prover_server/prover_server.cpp#L44-L54 for ref)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not strictly a blocker for the release, but better code factorization will mean, less code to maintain and less inconsistencies.

}

static void write_keypair(
Expand Down
2 changes: 1 addition & 1 deletion depends/zeth
Open in desktop
Submodule zeth updated 30 files
+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