diff --git a/bin/proof-generator/include/nil/proof-generator/arg_parser.hpp b/bin/proof-generator/include/nil/proof-generator/arg_parser.hpp index 902f657c..fe00a924 100644 --- a/bin/proof-generator/include/nil/proof-generator/arg_parser.hpp +++ b/bin/proof-generator/include/nil/proof-generator/arg_parser.hpp @@ -44,10 +44,11 @@ namespace nil { bool verification_only = false; CurvesVariant elliptic_curve_type = type_identity{}; HashesVariant hash_type = type_identity>{}; - ; + 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 parse_args(int argc, char* argv[]); diff --git a/bin/proof-generator/include/nil/proof-generator/prover.hpp b/bin/proof-generator/include/nil/proof-generator/prover.hpp index 1fa50bff..43eb2251 100644 --- a/bin/proof-generator/include/nil/proof-generator/prover.hpp +++ b/bin/proof-generator/include/nil/proof-generator/prover.hpp @@ -39,12 +39,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include @@ -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) @@ -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; } @@ -326,7 +328,8 @@ namespace nil { *constraint_system_, assignment_table.move_public_table(), *table_description_, - *lpc_scheme_ + *lpc_scheme_, + max_quotient_chunks_ ) ); @@ -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_; diff --git a/bin/proof-generator/src/arg_parser.cpp b/bin/proof-generator/src/arg_parser.cpp index 822e6974..249fdb3a 100644 --- a/bin/proof-generator/src/arg_parser.cpp +++ b/bin/proof-generator/src/arg_parser.cpp @@ -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 diff --git a/bin/proof-generator/src/main.cpp b/bin/proof-generator/src/main.cpp index db342db6..62422944 100644 --- a/bin/proof-generator/src/main.cpp +++ b/bin/proof-generator/src/main.cpp @@ -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; diff --git a/libs/actor/container b/libs/actor/container index e366de42..c0fb4660 160000 --- a/libs/actor/container +++ b/libs/actor/container @@ -1 +1 @@ -Subproject commit e366de4260bbdd39d237eacd6e63227f28461f3e +Subproject commit c0fb4660f9cd5f74f2db6f78a7b126f52720c28c diff --git a/libs/actor/zk b/libs/actor/zk index dbbf8faa..97a252c0 160000 --- a/libs/actor/zk +++ b/libs/actor/zk @@ -1 +1 @@ -Subproject commit dbbf8faafb6b4a53f2ee01f2d309f6ac7c8c7fbb +Subproject commit 97a252c02a4a512efccb057f6178ecee2f23e9aa diff --git a/libs/crypto3 b/libs/crypto3 index 40c981af..ac21223e 160000 --- a/libs/crypto3 +++ b/libs/crypto3 @@ -1 +1 @@ -Subproject commit 40c981afa78fa8442c2ac72893d39e8fadd066c2 +Subproject commit ac21223e770dbd91a8224fa1ee694f42ea752342 diff --git a/libs/transpiler b/libs/transpiler index 28c8d23b..94ec9afe 160000 --- a/libs/transpiler +++ b/libs/transpiler @@ -1 +1 @@ -Subproject commit 28c8d23b10548c1d287c530a425bb8853d642877 +Subproject commit 94ec9afe5a0948ca66fbdbfc55ec60ef3395c4e9