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.

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

Crypto3 updated to master #20

Merged
merged 3 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 10 additions & 16 deletions bin/proof-generator/include/nil/proof-generator/prover.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,16 @@ namespace nil {
}

template<typename FRIScheme, typename FieldType>
typename FRIScheme::params_type create_fri_params(std::size_t degree_log, const int max_step = 1) {
typename FRIScheme::params_type params;
nil::crypto3::math::polynomial<typename FieldType::value_type> q = {0, 0, 1};

constexpr std::size_t expand_factor = 0;
typename FRIScheme::params_type create_fri_params(
std::size_t degree_log, const int max_step = 1, std::size_t expand_factor = 0) {
std::size_t r = degree_log - 1;

std::vector<std::shared_ptr<nil::crypto3::math::evaluation_domain<FieldType>>> domain_set =
nil::crypto3::math::calculate_domain_set<FieldType>(degree_log + expand_factor, r);

params.r = r;
params.D = domain_set;
params.max_degree = (1 << degree_log) - 1;
params.step_list = generate_random_step_list(r, max_step);

return params;
return typename FRIScheme::params_type(
(1 << degree_log) - 1, // max_degree
nil::crypto3::math::calculate_domain_set<FieldType>(degree_log + expand_factor, r),
generate_random_step_list(r, max_step),
expand_factor
);
}

} // namespace detail
Expand All @@ -126,8 +120,8 @@ namespace nil {
using BlueprintFieldType = typename curve_type::base_field_type;
constexpr std::size_t WitnessColumns = 15;
constexpr std::size_t PublicInputColumns = 1;
constexpr std::size_t ConstantColumns = 5;
constexpr std::size_t SelectorColumns = 35;
constexpr std::size_t ConstantColumns = 35;
constexpr std::size_t SelectorColumns = 36;

using ArithmetizationParams =
nil::crypto3::zk::snark::plonk_arithmetization_params<WitnessColumns, PublicInputColumns, ConstantColumns,
Expand Down
2 changes: 1 addition & 1 deletion libs/crypto3
Submodule crypto3 updated 3 files
+1 −1 libs/marshalling/zk
+1 −1 libs/math
+1 −1 libs/zk