Skip to content

Commit

Permalink
Submodules updated #83
Browse files Browse the repository at this point in the history
  • Loading branch information
ETatuzova committed Apr 27, 2024
1 parent 935bf10 commit 7a4c53c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ namespace nil {
bool verification_only = false;
CurvesVariant elliptic_curve_type = type_identity<nil::crypto3::algebra::curves::pallas>{};
HashesVariant hash_type = type_identity<nil::crypto3::hashes::keccak_1600<256>>{};
;

std::size_t lambda = 9;
std::size_t grind = 69;
std::size_t expand_factor = 2;
std::size_t max_quotient_chunks = 0;
};

std::optional<ProverOptions> parse_args(int argc, char* argv[]);
Expand Down
8 changes: 6 additions & 2 deletions bin/proof-generator/include/nil/proof-generator/prover.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
#include <nil/crypto3/zk/snark/arithmetization/plonk/constraint_system.hpp>
#include <nil/crypto3/zk/snark/arithmetization/plonk/params.hpp>
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/detail/placeholder_policy.hpp>
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/detail/profiling.hpp>
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/params.hpp>
#include <nil/crypto3/zk/snark/systems/plonk/placeholder/preprocessor.hpp>
#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/snark/systems/plonk/placeholder/detail/profiling.hpp>

#include <nil/blueprint/transpiler/recursive_verifier_generator.hpp>
#include <nil/marshalling/endianness.hpp>
Expand Down Expand Up @@ -128,6 +128,7 @@ namespace nil {
boost::filesystem::path json_file,
std::size_t lambda,
std::size_t expand_factor,
std::size_t max_quotient_chunks,
std::size_t grind
)
: circuit_file_(circuit_file_name)
Expand All @@ -137,6 +138,7 @@ namespace nil {
, json_file_(json_file)
, lambda_(lambda)
, expand_factor_(expand_factor)
, max_quotient_chunks_(max_quotient_chunks_)
, grind_(grind) {
std::cout << "Global constructor" << std::endl;
}
Expand Down Expand Up @@ -326,7 +328,8 @@ namespace nil {
*constraint_system_,
assignment_table.move_public_table(),
*table_description_,
*lpc_scheme_
*lpc_scheme_,
max_quotient_chunks_
)
);

Expand All @@ -344,6 +347,7 @@ namespace nil {
const boost::filesystem::path proof_file_;
const boost::filesystem::path json_file_;
const std::size_t expand_factor_;
const std::size_t max_quotient_chunks_;
const std::size_t lambda_;
const std::size_t grind_;

Expand Down
1 change: 1 addition & 0 deletions bin/proof-generator/src/arg_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ 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), "Expand factor")
("skip-verification", po::bool_switch(&prover_options.skip_verification), "Skip generated proof verifying step")
("verification-only", po::bool_switch(&prover_options.verification_only), "Read proof for verification instead of writing to it");
// clang-format on
Expand Down
1 change: 1 addition & 0 deletions bin/proof-generator/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ int run_prover(const nil::proof_generator::ProverOptions& prover_options) {
prover_options.json_file_path,
prover_options.lambda,
prover_options.expand_factor,
prover_options.max_quotient_chunks,
prover_options.grind
);
bool prover_result;
Expand Down
2 changes: 1 addition & 1 deletion libs/actor/zk
Submodule zk updated 30 files
+3 −2 include/nil/crypto3/zk/commitments/batched_commitment.hpp
+148 −72 include/nil/crypto3/zk/commitments/detail/polynomial/basic_fri.hpp
+17 −26 include/nil/crypto3/zk/commitments/detail/polynomial/proof_of_work.hpp
+4 −9 include/nil/crypto3/zk/commitments/polynomial/fri.hpp
+75 −44 include/nil/crypto3/zk/commitments/polynomial/kzg.hpp
+370 −0 include/nil/crypto3/zk/commitments/polynomial/kzg_v2.hpp
+69 −46 include/nil/crypto3/zk/commitments/polynomial/lpc.hpp
+30 −2 include/nil/crypto3/zk/commitments/type_traits.hpp
+5 −4 include/nil/crypto3/zk/snark/arithmetization/plonk/constraint.hpp
+72 −10 include/nil/crypto3/zk/snark/arithmetization/plonk/constraint_system.hpp
+49 −1 include/nil/crypto3/zk/snark/arithmetization/plonk/copy_constraint.hpp
+16 −0 include/nil/crypto3/zk/snark/arithmetization/plonk/table_description.hpp
+282 −0 include/nil/crypto3/zk/snark/systems/plonk/placeholder/detail/profiling.hpp
+179 −41 include/nil/crypto3/zk/snark/systems/plonk/placeholder/lookup_argument.hpp
+165 −45 include/nil/crypto3/zk/snark/systems/plonk/placeholder/permutation_argument.hpp
+109 −63 include/nil/crypto3/zk/snark/systems/plonk/placeholder/preprocessor.hpp
+0 −104 include/nil/crypto3/zk/snark/systems/plonk/placeholder/profiling.hpp
+3 −1 include/nil/crypto3/zk/snark/systems/plonk/placeholder/proof.hpp
+24 −15 include/nil/crypto3/zk/snark/systems/plonk/placeholder/prover.hpp
+114 −71 include/nil/crypto3/zk/snark/systems/plonk/placeholder/verifier.hpp
+41 −23 include/nil/crypto3/zk/transcript/fiat_shamir.hpp
+5 −2 test/commitment/fri.cpp
+514 −4 test/commitment/kzg.cpp
+26 −16 test/commitment/lpc.cpp
+12 −9 test/commitment/lpc_performance.cpp
+10 −11 test/commitment/proof_of_work.cpp
+99 −34 test/systems/plonk/placeholder/circuits.hpp
+7 −20 test/systems/plonk/placeholder/performance.cpp
+467 −100 test/systems/plonk/placeholder/placeholder.cpp
+35 −3 test/systems/plonk/plonk_constraint.cpp

0 comments on commit 7a4c53c

Please sign in to comment.