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.

Sign up for GitHub

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

Jump to bottom

324 marshalling parts for distributed fri #326

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

324 marshalling parts for distributed fri #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f1cb82
Creating structures for aggregated FRI.
martun Sep 11, 2024
49ef6ba
Dividing LPC and FRI into stages and creating structures for aggregat…
martun Sep 11, 2024
fa50644
Added some more fri marshalling variants.
Iluvmagick Sep 8, 2024
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
650 changes: 447 additions & 203 deletions libs/marshalling/zk/include/nil/crypto3/marshalling/zk/types/commitments/fri.hpp
View file
Open in desktop

Large diffs are not rendered by default.

103 changes: 89 additions & 14 deletions libs/marshalling/zk/test/fri_commitment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,46 @@ void test_fri_proof(typename FRI::proof_type &proof, typename nil::crypto3::mars
BOOST_CHECK(proof == constructed_val_read);
}

template<typename Endianness, typename FRI>
void test_fri_aggregated_proof(
std::vector<typename FRI::partial_proof_type> &partial_proofs,
std::vector<typename FRI::query_proof_type> &query_proofs,
typename nil::crypto3::marshalling::types::batch_info_type batch_info,
const typename FRI::params_type& params
) {
using TTypeBase = nil::marshalling::field_type<Endianness>;

auto og_proof = typename FRI::aggregated_proof_type{partial_proofs, query_proofs};

auto filled_proof = nil::crypto3::marshalling::types::fill_fri_aggregated_proof<Endianness, FRI>(
og_proof, params
);
auto _proof = nil::crypto3::marshalling::types::make_fri_aggregated_proof<Endianness, FRI>(
filled_proof, batch_info
);
BOOST_CHECK(partial_proofs == _proof.partial_proofs);
BOOST_CHECK(query_proofs == _proof.query_proofs);
BOOST_CHECK(og_proof == _proof);

std::vector<std::uint8_t> cv;
cv.resize(filled_proof.length(), 0x00);
auto write_iter = cv.begin();
auto status = filled_proof.write(write_iter, cv.size());
BOOST_CHECK(status == nil::marshalling::status_type::success);

typename nil::crypto3::marshalling::types::fri_aggregated_proof_type<TTypeBase, FRI> test_val_read;
auto read_iter = cv.begin();
status = test_val_read.read(read_iter, cv.size());
BOOST_CHECK(status == nil::marshalling::status_type::success);
typename FRI::aggregated_proof_type constructed_val_read =
nil::crypto3::marshalling::types::make_fri_aggregated_proof<Endianness, FRI>(
test_val_read, batch_info
);
BOOST_CHECK(partial_proofs == constructed_val_read.partial_proofs);
BOOST_CHECK(query_proofs == constructed_val_read.query_proofs);
BOOST_CHECK(og_proof == constructed_val_read);
}

BOOST_FIXTURE_TEST_SUITE(marshalling_fri_proof_elements, zk::test_tools::random_test_initializer<algebra::curves::bls12<381>::scalar_field_type>)
static constexpr std::size_t lambda = 40;
static constexpr std::size_t m = 2;
Expand Down Expand Up @@ -184,13 +224,13 @@ BOOST_FIXTURE_TEST_SUITE(marshalling_fri_proof_elements, zk::test_tools::random_
);

auto proof = generate_random_fri_proof<FRI>(
2, 5,
fri_params.step_list,
lambda,
false,
batch_info,
alg_random_engines.template get_alg_engine<field_type>(),
generic_random_engine
2, 5,
fri_params.step_list,
lambda,
false,
batch_info,
alg_random_engines.template get_alg_engine<field_type>(),
generic_random_engine
);
test_fri_proof<Endianness, FRI>(proof, batch_info, fri_params);
}
Expand All @@ -205,16 +245,51 @@ BOOST_FIXTURE_TEST_SUITE(marshalling_fri_proof_elements, zk::test_tools::random_
typename FRI::params_type fri_params(1, 11, lambda, 4, true);

auto proof = generate_random_fri_proof<FRI>(
2, 5,
fri_params.step_list,
lambda,
true,
batch_info,
alg_random_engines.template get_alg_engine<field_type>(),
generic_random_engine
);
test_fri_proof<Endianness, FRI>(proof, batch_info, fri_params);
}

BOOST_AUTO_TEST_CASE(fri_aggregated_proof_Test) {
nil::crypto3::marshalling::types::batch_info_type batch_info;
batch_info[0] = 1;
batch_info[1] = 5;
batch_info[3] = 6;
batch_info[4] = 3;

typename FRI::params_type fri_params(1, 11, lambda, 4, true);
// we just generate a vector of random proofs for this test
std::vector<typename FRI::proof_type> proofs;
for (std::size_t i = 0; i < 10; i++) {
proofs.push_back(generate_random_fri_proof<FRI>(
2, 5,
fri_params.step_list,
lambda,
true,
batch_info,
alg_random_engines.template get_alg_engine<field_type>(),
generic_random_engine
);
test_fri_proof<Endianness, FRI>(proof, batch_info, fri_params);
));
}
std::vector<typename FRI::partial_proof_type> partial_proofs;
for (std::size_t i = 0; i < 10; i++) {
partial_proofs.push_back(proofs[i]);
}
std::vector<typename FRI::query_proof_type> query_proofs;
for (std::size_t i = 0; i < 10; i++) {
for (std::size_t j = 0; j < proofs[i].query_proofs.size(); j++) {
query_proofs.push_back(proofs[i].query_proofs[j]);
}
}
test_fri_aggregated_proof<Endianness, FRI>(partial_proofs, query_proofs, batch_info, fri_params);
}

BOOST_AUTO_TEST_SUITE_END()


Expand Down Expand Up @@ -246,11 +321,11 @@ BOOST_AUTO_TEST_CASE(marshalling_fri_basic_test) {
// Setup params
std::size_t degree_log = std::ceil(std::log2(d - 1));
typename fri_type::params_type fri_params(
3, /*max_step*/
degree_log,
lambda,
2 //expand_factor
);
3, /*max_step*/
degree_log,
lambda,
2 //expand_factor
);

// commit
math::polynomial<typename field_type::value_type> f = {{
Expand Down
Loading
Loading