Skip to content

Commit

Permalink
Added challenge aggregation stage.
Browse files Browse the repository at this point in the history
  • Loading branch information
Iluvmagick committed Sep 12, 2024
1 parent 9cd637c commit 55992a2
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 15 deletions.
2 changes: 2 additions & 0 deletions bin/proof-producer/include/nil/proof-generator/arg_parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ namespace nil {
boost::filesystem::path circuit_file_path;
boost::filesystem::path assignment_table_file_path;
boost::filesystem::path assignment_description_file_path;
std::vector<boost::filesystem::path> challenge_value_files;
boost::filesystem::path output_challenge_file = "aggregated_challenge.dat";
boost::log::trivial::severity_level log_level = boost::log::trivial::severity_level::info;
CurvesVariant elliptic_curve_type = type_identity<nil::crypto3::algebra::curves::pallas>{};
HashesVariant hash_type = type_identity<nil::crypto3::hashes::keccak_1600<256>>{};
Expand Down
57 changes: 51 additions & 6 deletions bin/proof-producer/include/nil/proof-generator/prover.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/proof.hpp>
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/prover.hpp>
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/verifier.hpp>
#include <nil/crypto3/zk/transcript/fiat_shamir.hpp>

#include <nil/blueprint/transpiler/recursive_verifier_generator.hpp>

Expand Down Expand Up @@ -102,15 +103,17 @@ namespace nil {
ALL = 0,
PREPROCESS = 1,
PROVE = 2,
VERIFY = 3
VERIFY = 3,
GENERATE_AGGREGATED_CHALLENGE = 4
};

ProverStage prover_stage_from_string(const std::string& stage) {
static std::unordered_map<std::string, ProverStage> stage_map = {
{"all", ProverStage::ALL},
{"preprocess", ProverStage::PREPROCESS},
{"prove", ProverStage::PROVE},
{"verify", ProverStage::VERIFY}
{"verify", ProverStage::VERIFY},
{"generate-aggregated-challenge", ProverStage::GENERATE_AGGREGATED_CHALLENGE}
};
auto it = stage_map.find(stage);
if (it == stage_map.end()) {
Expand Down Expand Up @@ -276,12 +279,12 @@ namespace nil {
return true;
}

// This includes not only the common data, but also merkle trees, polynomials, etc, everything that a
// This includes not only the common data, but also merkle trees, polynomials, etc, everything that a
// public preprocessor generates.
bool save_public_preprocessed_data_to_file(boost::filesystem::path preprocessed_data_file) {
using namespace nil::crypto3::marshalling::types;

BOOST_LOG_TRIVIAL(info) << "Writing all preprocessed public data to " <<
BOOST_LOG_TRIVIAL(info) << "Writing all preprocessed public data to " <<
preprocessed_data_file << std::endl;
using PreprocessedPublicDataType = typename PublicPreprocessedData::preprocessed_data_type;

Expand Down Expand Up @@ -322,7 +325,7 @@ namespace nil {
bool save_commitment_state_to_file(boost::filesystem::path commitment_scheme_state_file) {
using namespace nil::crypto3::marshalling::types;

BOOST_LOG_TRIVIAL(info) << "Writing commitment_state to " <<
BOOST_LOG_TRIVIAL(info) << "Writing commitment_state to " <<
commitment_scheme_state_file << std::endl;

auto marshalled_lpc_state = fill_commitment_scheme<Endianness, LpcScheme>(
Expand Down Expand Up @@ -415,7 +418,7 @@ namespace nil {

auto marshalled_assignment_description =
nil::crypto3::marshalling::types::fill_assignment_table_description<Endianness, BlueprintField>(
*table_description_
*table_description_
);
bool res = nil::proof_generator::detail::encode_marshalling_to_file(
assignment_description_file,
Expand Down Expand Up @@ -485,6 +488,48 @@ namespace nil {
return true;
}

bool generate_aggregated_challenge_to_file(
const std::vector<boost::filesystem::path> &aggregate_input_files,
const boost::filesystem::path &output_challenge_file
) {
if (aggregate_input_files.empty()) {
BOOST_LOG_TRIVIAL(error) << "No input files for challenge aggregation";
return false;
}
BOOST_LOG_TRIVIAL(info) << "Generating aggregated challenge to " << output_challenge_file;
// check that we can access all input files
for (const auto &input_file : aggregate_input_files) {
BOOST_LOG_TRIVIAL(info) << "Reading challenge from " << input_file;
if (!nil::proof_generator::can_read_from_file(input_file.string())) {
BOOST_LOG_TRIVIAL(error) << "Can't read file " << input_file;
return false;
}
}
// create the transcript
using transcript_hash_type = typename PlaceholderParams::transcript_hash_type;
using transcript_type = crypto3::zk::transcript::fiat_shamir_heuristic_sequential<transcript_hash_type>;
using challenge_marshalling_type =
nil::crypto3::marshalling::types::field_element<
TTypeBase, typename BlueprintField::value_type>;
transcript_type transcript;
// read challenges from input files and add them to the transcript
for (const auto &input_file : aggregate_input_files) {
auto challenge = detail::decode_marshalling_from_file<challenge_marshalling_type>(input_file);
if (!challenge) {
BOOST_LOG_TRIVIAL(error) << "Failed to read challenge from " << input_file;
return false;
}
transcript(challenge->value());
}
// produce the aggregated challenge
auto output_challenge = transcript.template challenge<BlueprintField>();
// marshall the challenge
challenge_marshalling_type marshalled_challenge(output_challenge);
// write the challenge to the output file
return detail::encode_marshalling_to_file<challenge_marshalling_type>
(output_challenge_file, marshalled_challenge);
}

private:
const std::size_t expand_factor_;
const std::size_t max_quotient_chunks_;
Expand Down
8 changes: 6 additions & 2 deletions bin/proof-producer/src/arg_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace nil {
// clang-format off
auto options_appender = config.add_options()
("stage", make_defaulted_option(prover_options.stage),
"Stage of the prover to run, one of (all, preprocess, prove, verify). Defaults to 'all'.")
"Stage of the prover to run, one of (all, preprocess, prove, verify, generate-aggregated-challenge). Defaults to 'all'.")
("proof,p", make_defaulted_option(prover_options.proof_file_path), "Proof file")
("json,j", make_defaulted_option(prover_options.json_file_path), "JSON proof file")
("common-data", make_defaulted_option(prover_options.preprocessed_common_data_path), "Preprocessed common data file")
Expand All @@ -88,7 +88,11 @@ namespace nil {
("lambda-param", make_defaulted_option(prover_options.lambda), "Lambda param (9)")
("grind-param", make_defaulted_option(prover_options.grind), "Grind param (69)")
("expand-factor,x", make_defaulted_option(prover_options.expand_factor), "Expand factor")
("max-quotient-chunks,q", make_defaulted_option(prover_options.max_quotient_chunks), "Maximum quotient polynomial parts amount");
("max-quotient-chunks,q", make_defaulted_option(prover_options.max_quotient_chunks), "Maximum quotient polynomial parts amount")
("challenge-value-file,u", po::value<std::vector<boost::filesystem::path>>(&prover_options.challenge_value_files),
"Challenge value files. Used with 'generate-aggregated-challenge' stage. Each file has to be added separately")
("output-challenge-file", po::value<boost::filesystem::path>(&prover_options.output_challenge_file),
"Output challenge file. Used with 'generate-aggregated-challenge' stage");

// clang-format on
po::options_description cmdline_options("nil; Proof Producer");
Expand Down
20 changes: 13 additions & 7 deletions bin/proof-producer/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ int run_prover(const nil::proof_generator::ProverOptions& prover_options) {
try {
switch (nil::proof_generator::detail::prover_stage_from_string(prover_options.stage)) {
case nil::proof_generator::detail::ProverStage::ALL:
prover_result =
prover_result =
prover.read_circuit(prover_options.circuit_file_path) &&
prover.read_assignment_table(prover_options.assignment_table_file_path) &&
prover.preprocess_public_data() &&
prover.preprocess_private_data() &&
prover.generate_to_file(
prover_options.proof_file_path,
prover_options.proof_file_path,
prover_options.json_file_path,
false/*don't skip verification*/) &&
false/*don't skip verification*/) &&
prover.save_preprocessed_common_data_to_file(prover_options.preprocessed_common_data_path) &&
prover.save_public_preprocessed_data_to_file(prover_options.preprocessed_public_data_path) &&
prover.save_commitment_state_to_file(prover_options.commitment_scheme_state_path);
break;
case nil::proof_generator::detail::ProverStage::PREPROCESS:
prover_result =
prover_result =
prover.read_circuit(prover_options.circuit_file_path) &&
prover.read_assignment_table(prover_options.assignment_table_file_path) &&
prover.save_assignment_description(prover_options.assignment_description_file_path) &&
Expand All @@ -72,20 +72,26 @@ int run_prover(const nil::proof_generator::ProverOptions& prover_options) {
prover.read_assignment_table(prover_options.assignment_table_file_path) &&
prover.read_public_preprocessed_data_from_file(prover_options.preprocessed_public_data_path) &&
prover.read_commitment_scheme_from_file(prover_options.commitment_scheme_state_path) &&
prover.preprocess_private_data() &&
prover.preprocess_private_data() &&
prover.generate_to_file(
prover_options.proof_file_path,
prover_options.json_file_path,
true/*skip verification*/);
break;
case nil::proof_generator::detail::ProverStage::VERIFY:
prover_result =
prover_result =
prover.read_circuit(prover_options.circuit_file_path) &&
prover.read_preprocessed_common_data_from_file(prover_options.preprocessed_common_data_path) &&
prover.read_assignment_description(prover_options.assignment_description_file_path) &&
prover.verify_from_file(prover_options.proof_file_path);
break;
}
case nil::proof_generator::detail::ProverStage::GENERATE_AGGREGATED_CHALLENGE:
prover_result =
prover.generate_aggregated_challenge_to_file(
prover_options.challenge_value_files,
prover_options.output_challenge_file
);
}
} catch (const std::exception& e) {
BOOST_LOG_TRIVIAL(error) << e.what();
return 1;
Expand Down

0 comments on commit 55992a2

Please sign in to comment.