dequeue extension rows

Co-authored-by: Alan Szepieniec <[email protected]>
Co-authored-by: Ferdinand Sauer <[email protected]>

src/tests_and_benchmarks/ozk/programs/recufier/verify.rs

@@ -455,7 +455,8 @@ fn recufy() {
     // Check leafs
     // Dequeue base elements
     // Could be read from secret-in, but it's much more efficient to get them from memory
-    let base_table_rows: Box<Vec<[BFieldElement; 356]>> = proof_iter.next_as_masterbasetablerows();
+    let base_table_rows: Box<Vec<BaseRow<BFieldElement>>> =
+        proof_iter.next_as_masterbasetablerows();
     {
         let mut i: usize = 0;
         while i < fri.num_colinearity_checks as usize {
@@ -468,6 +469,8 @@ fn recufy() {
     {
         let _dummy: Box<Vec<Digest>> = proof_iter.next_as_authenticationstructure();
     }
+
+    // hash base rows to get leafs
     let mut leaf_digests_base: Vec<Digest> = Vec::<Digest>::default();
     {
         let mut i: usize = 0;
@@ -496,6 +499,23 @@ fn recufy() {
         }
     }
 
+    // dequeue extension elements
+    let ext_table_rows: Box<Vec<ExtensionRow>> = proof_iter.next_as_masterexttablerows();
+
+    // 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 {
+            leaf_digests_ext.push(tasm::tasm_hashing_algebraic_hasher_hash_varlen(
+                &ext_table_rows[i],
+                83 * 3,
+            ));
+            i += 1;
+        }
+    }
+    RecufyDebug::dump_digests(&leaf_digests_ext);
+
     // Ensure that sponge-states are in sync
     RecufyDebug::sponge_state(Tip5WithState::squeeze());
     return;

src/tests_and_benchmarks/ozk/rust_shadows.rs

@@ -324,11 +324,14 @@ pub(super) fn tasm_hashing_merkle_verify(
     assert!(mt_inclusion_proof.verify(root));
 }
 
-pub(super) fn tasm_hashing_algebraic_hasher_hash_varlen(
-    preimage: &[BFieldElement],
-    _length: usize,
+pub(super) fn tasm_hashing_algebraic_hasher_hash_varlen<T: BFieldCodec>(
+    preimage: &[T],
+    length: usize,
 ) -> Digest {
+    assert!(T::static_length().is_some());
+
     // Mutate sponge state the same way that Triton-VM does
+    let preimage = &preimage.iter().flat_map(|c| c.encode()).collect_vec()[..length];
     SPONGE_STATE.with_borrow_mut(|sponge| {
         HashVarlen.sponge_mutation(sponge.as_mut().unwrap(), preimage);
     });