diff --git a/bin/proof-generator/include/nil/proof-generator/prover.hpp b/bin/proof-generator/include/nil/proof-generator/prover.hpp index 794ca308..24bba35e 100644 --- a/bin/proof-generator/include/nil/proof-generator/prover.hpp +++ b/bin/proof-generator/include/nil/proof-generator/prover.hpp @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -117,6 +117,7 @@ namespace nil { template typename FRIScheme::params_type create_fri_params( std::size_t degree_log, + std::size_t lambda, const int max_step = 1, std::size_t expand_factor = 0 ) { @@ -126,7 +127,8 @@ namespace nil { (1 << degree_log) - 1, // max_degree nil::crypto3::math::calculate_domain_set(degree_log + expand_factor, r), generate_random_step_list(r, max_step), - expand_factor + expand_factor, + lambda ); } } // namespace detail @@ -256,8 +258,7 @@ namespace nil { private: using BlueprintField = typename CurveType::base_field_type; - using LpcParams = nil::crypto3::zk::commitments:: - list_polynomial_commitment_params; + using LpcParams = nil::crypto3::zk::commitments::list_polynomial_commitment_params; using Lpc = nil::crypto3::zk::commitments::list_polynomial_commitment; using LpcScheme = typename nil::crypto3::zk::commitments::lpc_commitment_scheme; using CircuitParams = nil::crypto3::zk::snark::placeholder_circuit_params; @@ -278,7 +279,7 @@ namespace nil { BOOST_LOG_TRIVIAL(info) << "Verifying proof..."; bool verification_result = nil::crypto3::zk::snark::placeholder_verifier::process( - *public_preprocessed_data_, + public_preprocessed_data_->common_data, proof, *table_description_, *constraint_system_, @@ -328,9 +329,12 @@ namespace nil { // Lambdas and grinding bits should be passed threw preprocessor directives std::size_t table_rows_log = std::ceil(std::log2(table_description_->rows_amount)); - fri_params_.emplace( - detail::create_fri_params(table_rows_log, 1, expand_factor_) - ); + fri_params_.emplace(detail::create_fri_params( + table_rows_log, + all_lambda_params[LambdaParamIdx], + 1, + expand_factor_ + )); std::size_t permutation_size = table_description_->witness_columns + table_description_->public_input_columns + component_constant_columns_; diff --git a/libs/actor/zk b/libs/actor/zk index 92923be8..06a44326 160000 --- a/libs/actor/zk +++ b/libs/actor/zk @@ -1 +1 @@ -Subproject commit 92923be84628ab60f9179b43f49679e4d86ff011 +Subproject commit 06a443260c5179faa70e62a37a7949240edc3ceb diff --git a/libs/crypto3 b/libs/crypto3 index d9f4661d..8d6d6cba 160000 --- a/libs/crypto3 +++ b/libs/crypto3 @@ -1 +1 @@ -Subproject commit d9f4661d01510f5221ecc179c4253c7798719a99 +Subproject commit 8d6d6cbac6a0e1e6a92d7c0a667fdb2504668251 diff --git a/libs/transpiler b/libs/transpiler index cc7cfa8c..28c8d23b 160000 --- a/libs/transpiler +++ b/libs/transpiler @@ -1 +1 @@ -Subproject commit cc7cfa8ca54572ae93efd7343a690c3d1e5dce49 +Subproject commit 28c8d23b10548c1d287c530a425bb8853d642877