Skip to content

Commit

Permalink
test: Recufier verify extension leafs
Browse files Browse the repository at this point in the history 
Co-authored-by: Alan Szepieniec <[email protected]>
  • Loading branch information
@Sword-Smith @aszepieniec
Sword-Smith and aszepieniec committed Mar 18, 2024
1 parent 39bc56d commit e73834f
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 45 deletions.
38 changes: 32 additions & 6 deletions src/tests_and_benchmarks/ozk/programs/recufier/fri_verify.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub(crate) mod test {
pub(crate) struct StarkProofExtraction {
pub(crate) fri_proof_stream: StarkProofStream,
pub(crate) base_tree_authentication_paths: Vec<Vec<Digest>>,
// ext_tree_authentication_paths: Vec<Vec<Digest>>,
pub(crate) ext_tree_authentication_paths: Vec<Vec<Digest>>,
// quot_tree_authentication_paths: Vec<Vec<Digest>>,
}

Expand Down Expand Up @@ -134,7 +134,7 @@ pub(crate) mod test {
proof_stream.sample_scalars(Challenges::SAMPLE_COUNT);

// Extension-table Merkle root
proof_stream
let ext_mt_root = proof_stream
.dequeue()
.unwrap()
.try_into_merkle_root()
Expand Down Expand Up @@ -203,15 +203,15 @@ pub(crate) mod test {
.unwrap()
.try_into_authentication_structure()
.unwrap();
let fri_indexed_leaves = fri_verify_result
let fri_indexed_base_leaves = fri_verify_result
.iter()
.map(|(index, _)| *index)
.zip(base_table_leaf_digests)
.collect_vec();
let tree_height = fri.domain.length.ilog2() as usize;
let base_tree_inclusion_proof = MerkleTreeInclusionProof::<Tip5> {
tree_height,
indexed_leaves: fri_indexed_leaves,
indexed_leaves: fri_indexed_base_leaves,
authentication_structure: base_authentication_structure,
_hasher: std::marker::PhantomData,
};
Expand All @@ -220,12 +220,38 @@ pub(crate) mod test {
println!("base_tree_auth_paths: {}", err);
}
let base_tree_auth_paths = base_tree_auth_paths.unwrap();
// let base_tree_authentication_paths =MerkleTree::

let ext_table_rows = proof_stream
.dequeue()
.unwrap()
.try_into_master_ext_table_rows()
.unwrap();
let ext_table_leaf_digests = ext_table_rows.iter().map(Tip5::hash).collect_vec();
let ext_authentication_structure = proof_stream
.dequeue()
.unwrap()
.try_into_authentication_structure()
.unwrap();
let fri_indexed_ext_leafs = fri_verify_result
.iter()
.map(|(index, _)| *index)
.zip(ext_table_leaf_digests)
.collect_vec();
let ext_tree_inclusion_proof = MerkleTreeInclusionProof::<Tip5> {
tree_height,
indexed_leaves: fri_indexed_ext_leafs,
authentication_structure: ext_authentication_structure,
_hasher: std::marker::PhantomData,
};
assert!(ext_tree_inclusion_proof.clone().verify(ext_mt_root));
let ext_tree_auth_paths = ext_tree_inclusion_proof
.into_authentication_paths()
.unwrap();

StarkProofExtraction {
fri_proof_stream,
base_tree_authentication_paths: base_tree_auth_paths,
// ext_tree_authentication_paths: todo!(),
ext_tree_authentication_paths: ext_tree_auth_paths,
// quot_tree_authentication_paths: todo!(),
}
}
Expand Down
102 changes: 63 additions & 39 deletions src/tests_and_benchmarks/ozk/programs/recufier/verify.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,32 +130,32 @@ impl Recufier {
) -> [XFieldElement; 596] {
let initial_zerofier_inv: XFieldElement =
(out_of_domain_point_curr_row - BFieldElement::one()).inverse();
RecufyDebug::dump_xfe(initial_zerofier_inv);
println!("initial_zerofier_inv: {initial_zerofier_inv:?}");
// RecufyDebug::dump_xfe(initial_zerofier_inv);
// println!("initial_zerofier_inv: {initial_zerofier_inv:?}");
let consistency_zerofier_inv: XFieldElement =
(out_of_domain_point_curr_row.mod_pow_u32(padded_height) - BFieldElement::one())
.inverse();
println!("consistency_zerofier_inv: {consistency_zerofier_inv:?}");
RecufyDebug::dump_xfe(consistency_zerofier_inv);
// println!("consistency_zerofier_inv: {consistency_zerofier_inv:?}");
// RecufyDebug::dump_xfe(consistency_zerofier_inv);
let except_last_row: XFieldElement =
out_of_domain_point_curr_row - trace_domain_generator.inverse();
println!("except_last_row: {except_last_row:?}");
RecufyDebug::dump_xfe(except_last_row);
// println!("except_last_row: {except_last_row:?}");
// RecufyDebug::dump_xfe(except_last_row);
let transition_zerofier_inv: XFieldElement = except_last_row * consistency_zerofier_inv;
println!("transition_zerofier_inv: {transition_zerofier_inv:?}");
RecufyDebug::dump_xfe(transition_zerofier_inv);
// println!("transition_zerofier_inv: {transition_zerofier_inv:?}");
// RecufyDebug::dump_xfe(transition_zerofier_inv);
let terminal_zerofier_inv: XFieldElement = except_last_row.inverse();
println!("terminal_zerofier_inv: {terminal_zerofier_inv:?}");
// println!("terminal_zerofier_inv: {terminal_zerofier_inv:?}");
// i.e., only last row
RecufyDebug::dump_xfe(terminal_zerofier_inv);
// RecufyDebug::dump_xfe(terminal_zerofier_inv);

let mut evaluated_constraints: [XFieldElement; 596] =
tasm::tasm_recufier_master_ext_table_air_constraint_evaluation();
println!("evaluated_constraints: {evaluated_constraints:?}");
// println!("evaluated_constraints: {evaluated_constraints:?}");

let categories_running_sum_lengths: [usize; 4] =
Recufier::constraint_evaluation_lengths_running_sum();
println!("categories_running_sum_lengths: {categories_running_sum_lengths:?}");
// println!("categories_running_sum_lengths: {categories_running_sum_lengths:?}");
let mut i: usize = 0;
while i < categories_running_sum_lengths[0] {
evaluated_constraints[i] *= initial_zerofier_inv;
Expand Down Expand Up @@ -307,95 +307,95 @@ fn recufy() {
BFieldElement::new(2749753857496185052),
BFieldElement::new(14083115970614877960),
]));
println!("program_digest:\n{program_digest}");
// println!("program_digest:\n{program_digest}");
let parameters: Box<StarkParameters> = Box::<StarkParameters>::new(StarkParameters::default());

Tip5WithState::init();
let encoded_claim: Vec<BFieldElement> = Recufier::encode_claim(*program_digest);
println!("encoded_claim: {}", encoded_claim.iter().join(","));
// println!("encoded_claim: {}", encoded_claim.iter().join(","));
RecufyDebug::dump_bfes(&encoded_claim);
Tip5WithState::pad_and_absorb_all(&encoded_claim);

let inner_proof_iter: VmProofIter = VmProofIter::new();
let mut proof_iter: Box<VmProofIter> = Box::<VmProofIter>::new(inner_proof_iter);
let log_2_padded_height: Box<u32> = proof_iter.next_as_log2paddedheight();
println!("log_2_padded_height: {log_2_padded_height}");
// println!("log_2_padded_height: {log_2_padded_height}");
let padded_height: u32 = 1 << *log_2_padded_height;
println!("padded_height: {padded_height}");
// println!("padded_height: {padded_height}");
RecufyDebug::dump_u32(padded_height);

let fri: Box<FriVerify> = Box::<FriVerify>::new(parameters.derive_fri(padded_height));

let base_merkle_tree_root: Box<Digest> = proof_iter.next_as_merkleroot();
println!("base_merkle_tree_root: {base_merkle_tree_root:?}");
// println!("base_merkle_tree_root: {base_merkle_tree_root:?}");
RecufyDebug::dump_digest(*base_merkle_tree_root);

let challenges: Box<Challenges> =
tasm::tasm_recufier_challenges_new_empty_input_and_output_59_4(*program_digest);
println!("challenges: {:?}", challenges.challenges);
// println!("challenges: {:?}", challenges.challenges);
RecufyDebug::dump_xfes(&challenges.challenges.to_vec());

let extension_tree_merkle_root: Box<Digest> = proof_iter.next_as_merkleroot();
println!("extension_tree_merkle_root: {extension_tree_merkle_root:?}");
// println!("extension_tree_merkle_root: {extension_tree_merkle_root:?}");
RecufyDebug::dump_digest(*extension_tree_merkle_root);

let quot_codeword_weights: [XFieldElement; 596] =
<[XFieldElement; 596]>::try_from(Tip5WithState::sample_scalars(Recufier::num_quotients()))
.unwrap();
println!("quot_codeword_weights: {quot_codeword_weights:?}");
// println!("quot_codeword_weights: {quot_codeword_weights:?}");
RecufyDebug::dump_xfes(&quot_codeword_weights.to_vec());
let quotient_codeword_merkle_root: Box<Digest> = proof_iter.next_as_merkleroot();
println!("quotient_codeword_merkle_root: {quotient_codeword_merkle_root:?}");
// println!("quotient_codeword_merkle_root: {quotient_codeword_merkle_root:?}");
RecufyDebug::dump_digest(*quotient_codeword_merkle_root);

let trace_domain_generator: BFieldElement =
ArithmeticDomain::generator_for_length(padded_height as u64);
println!("trace_domain_generator: {trace_domain_generator:?}");
// println!("trace_domain_generator: {trace_domain_generator:?}");
RecufyDebug::dump_bfe(trace_domain_generator);

let ___out_of_domain_point_curr_row: Vec<XFieldElement> = Tip5WithState::sample_scalars(1);
let out_of_domain_point_curr_row: XFieldElement = ___out_of_domain_point_curr_row[0];
println!("out_of_domain_point_curr_row: {out_of_domain_point_curr_row:?}");
// println!("out_of_domain_point_curr_row: {out_of_domain_point_curr_row:?}");
RecufyDebug::dump_xfe(out_of_domain_point_curr_row);
let out_of_domain_point_next_row: XFieldElement =
out_of_domain_point_curr_row * trace_domain_generator;
println!("out_of_domain_point_next_row: {out_of_domain_point_next_row:?}");
// println!("out_of_domain_point_next_row: {out_of_domain_point_next_row:?}");
RecufyDebug::dump_xfe(out_of_domain_point_next_row);
let out_of_domain_point_curr_row_pow_num_segments: XFieldElement =
tasm::tasm_arithmetic_xfe_to_the_fourth(out_of_domain_point_curr_row);
println!("out_of_domain_point_curr_row_pow_num_segments: {out_of_domain_point_curr_row_pow_num_segments:?}");
// println!("out_of_domain_point_curr_row_pow_num_segments: {out_of_domain_point_curr_row_pow_num_segments:?}");
RecufyDebug::dump_xfe(out_of_domain_point_curr_row_pow_num_segments);

let out_of_domain_curr_base_row: Box<Box<BaseRow<XFieldElement>>> =
proof_iter.next_as_outofdomainbaserow();
println!("out_of_domain_curr_base_row: {out_of_domain_curr_base_row:?}");
// println!("out_of_domain_curr_base_row: {out_of_domain_curr_base_row:?}");
RecufyDebug::dump_xfes(&out_of_domain_curr_base_row.to_vec());
let out_of_domain_curr_ext_row: Box<Box<ExtensionRow>> = proof_iter.next_as_outofdomainextrow();
println!("out_of_domain_curr_ext_row: {out_of_domain_curr_ext_row:?}");
// println!("out_of_domain_curr_ext_row: {out_of_domain_curr_ext_row:?}");
RecufyDebug::dump_xfes(&out_of_domain_curr_ext_row.to_vec());
let out_of_domain_next_base_row: Box<Box<BaseRow<XFieldElement>>> =
proof_iter.next_as_outofdomainbaserow();
println!("out_of_domain_next_base_row: {out_of_domain_next_base_row:?}");
// println!("out_of_domain_next_base_row: {out_of_domain_next_base_row:?}");
RecufyDebug::dump_xfes(&out_of_domain_next_base_row.to_vec());
let out_of_domain_next_ext_row: Box<Box<ExtensionRow>> = proof_iter.next_as_outofdomainextrow();
println!("out_of_domain_next_ext_row: {out_of_domain_next_ext_row:?}");
// println!("out_of_domain_next_ext_row: {out_of_domain_next_ext_row:?}");
RecufyDebug::dump_xfes(&out_of_domain_next_ext_row.to_vec());
let out_of_domain_curr_row_quot_segments: Box<[XFieldElement; 4]> =
proof_iter.next_as_outofdomainquotientsegments();
println!("out_of_domain_curr_row_quot_segments: {out_of_domain_curr_row_quot_segments:?}");
// println!("out_of_domain_curr_row_quot_segments: {out_of_domain_curr_row_quot_segments:?}");
RecufyDebug::dump_xfes(&out_of_domain_curr_row_quot_segments.to_vec());

let quotient_summands: [XFieldElement; 596] = Recufier::quotient_summands(
out_of_domain_point_curr_row,
padded_height,
trace_domain_generator,
);
println!("quotient_summands: {quotient_summands:?}");
// println!("quotient_summands: {quotient_summands:?}");
RecufyDebug::dump_xfes(&quotient_summands.to_vec());

let out_of_domain_quotient_value: XFieldElement =
tasm::tasm_array_inner_product_of_596_xfes(quot_codeword_weights, quotient_summands);
println!("out_of_domain_quotient_value: {out_of_domain_quotient_value:?}");
// println!("out_of_domain_quotient_value: {out_of_domain_quotient_value:?}");
RecufyDebug::dump_xfe(out_of_domain_quotient_value);

let sum_of_evaluated_out_of_domain_quotient_segments: XFieldElement =
Expand All @@ -405,8 +405,8 @@ fn recufy() {
);

RecufyDebug::dump_xfe(sum_of_evaluated_out_of_domain_quotient_segments);
println!("sum_of_evaluated_out_of_domain_quotient_segments: {sum_of_evaluated_out_of_domain_quotient_segments:?}");
println!("out_of_domain_quotient_value: {out_of_domain_quotient_value:?}");
// println!("sum_of_evaluated_out_of_domain_quotient_segments: {sum_of_evaluated_out_of_domain_quotient_segments:?}");
// println!("out_of_domain_quotient_value: {out_of_domain_quotient_value:?}");
assert!(sum_of_evaluated_out_of_domain_quotient_segments == out_of_domain_quotient_value);

// Fiat-shamir 2
Expand Down Expand Up @@ -459,8 +459,8 @@ fn recufy() {
proof_iter.next_as_masterbasetablerows();
{
let mut i: usize = 0;
while i < fri.num_colinearity_checks as usize {
RecufyDebug::dump_bfes(&base_table_rows[i].to_vec());
while i < 2 * fri.num_colinearity_checks as usize {
// RecufyDebug::dump_bfes(&base_table_rows[i].to_vec());
i += 1;
}
}
Expand All @@ -474,7 +474,7 @@ fn recufy() {
let mut leaf_digests_base: Vec<Digest> = Vec::<Digest>::default();
{
let mut i: usize = 0;
while i < fri.num_colinearity_checks as usize {
while i < 2 * fri.num_colinearity_checks as usize {
leaf_digests_base.push(tasm::tasm_hashing_algebraic_hasher_hash_varlen(
&base_table_rows[i],
356,
Expand All @@ -488,7 +488,7 @@ fn recufy() {
let merkle_tree_height: u32 = fri.domain_length.ilog2();
{
let mut i: usize = 0;
while i < fri.num_colinearity_checks as usize {
while i < 2 * fri.num_colinearity_checks as usize {
tasm::tasm_hashing_merkle_verify(
*base_merkle_tree_root,
revealed_fri_indices_and_elements[i].0,
Expand All @@ -502,11 +502,16 @@ fn recufy() {
// dequeue extension elements
let ext_table_rows: Box<Vec<ExtensionRow>> = proof_iter.next_as_masterexttablerows();

// dequeue extension rows' authentication structure but ignore it (divination instead)
{
let _dummy: Box<Vec<Digest>> = proof_iter.next_as_authenticationstructure();
}

// hash extension rows to get leafs
let mut leaf_digests_ext: Vec<Digest> = Vec::<Digest>::default();
{
let mut i: usize = 0;
while i < fri.num_colinearity_checks as usize {
while i < 2 * fri.num_colinearity_checks as usize {
leaf_digests_ext.push(tasm::tasm_hashing_algebraic_hasher_hash_varlen(
&ext_table_rows[i],
83 * 3,
Expand All @@ -516,6 +521,20 @@ fn recufy() {
}
RecufyDebug::dump_digests(&leaf_digests_ext);

// Merkle verify (extension tree)
{
let mut i: usize = 0;
while i < 2 * fri.num_colinearity_checks as usize {
tasm::tasm_hashing_merkle_verify(
*extension_tree_merkle_root,
revealed_fri_indices_and_elements[i].0,
leaf_digests_ext[i],
merkle_tree_height,
);
i += 1;
}
}

// Ensure that sponge-states are in sync
RecufyDebug::sponge_state(Tip5WithState::squeeze());
return;
Expand Down Expand Up @@ -595,6 +614,11 @@ mod tests {
.into_iter()
.flatten()
.collect_vec(),
proof_extraction
.ext_tree_authentication_paths
.into_iter()
.flatten()
.collect_vec(),
]
.concat();
NonDeterminism::default()
Expand Down
6 changes: 6 additions & 0 deletions src/tests_and_benchmarks/ozk/rust_shadows.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,12 @@ pub(super) fn tasm_hashing_merkle_verify(
assert!(mt_inclusion_proof.verify(root));
}

pub(super) fn verify_nd_digests_is_empty() -> bool {

Check warning on line 327 in src/tests_and_benchmarks/ozk/rust_shadows.rs

View workflow job for this annotation

GitHub Actions / format, lint, test (ubuntu-latest) 

function `verify_nd_digests_is_empty` is never used

Check warning on line 327 in src/tests_and_benchmarks/ozk/rust_shadows.rs

View workflow job for this annotation

GitHub Actions / format, lint, test (windows-latest) 

function `verify_nd_digests_is_empty` is never used

Check warning on line 327 in src/tests_and_benchmarks/ozk/rust_shadows.rs

View workflow job for this annotation

GitHub Actions / format, lint, test (macos-latest) 

function `verify_nd_digests_is_empty` is never used
ND_DIGESTS.with_borrow(|ndds| assert!(ndds.is_empty(), "Length was: {}", ndds.len()));

true
}

pub(super) fn tasm_hashing_algebraic_hasher_hash_varlen<T: BFieldCodec>(
preimage: &[T],
length: usize,
Expand Down

0 comments on commit e73834f

Please sign in to comment.