fix rebase

Author: Mason Liang

aggregator/src/aggregation/blob_data.rs

@@ -721,6 +721,7 @@ impl BlobDataConfig {
 
         let challenge_digest_preimage_rlc_specified = &rows.last().unwrap().preimage_rlc;
         let challenge_digest_rlc_specified = &rows.last().unwrap().digest_rlc;
+        let versioned_hash_rlc = &rows.get(N_ROWS_DIGEST_RLC - 2).unwrap().digest_rlc;
 
         // ensure that on the last row of this section the is_boundary is turned on
         // which would enable the keccak table lookup for challenge_digest
@@ -794,6 +795,7 @@ impl BlobDataConfig {
         for (i, digest_rlc_specified) in std::iter::once(metadata_digest_rlc_specified)
             .chain(chunk_digest_evm_rlcs)
             .chain(std::iter::once(challenge_digest_rlc_specified))
+            .chain(std::iter::once(versioned_hash_rlc))
             .enumerate()
         {
             let digest_rows = rows
@@ -853,16 +855,22 @@ impl BlobDataConfig {
         for chunk in chunk_data_digests_bytes.chunks_exact(N_BYTES_U256) {
             chunk_data_digests.push(chunk.to_vec());
         }
+        let challenge_digest = assigned_rows
+            .iter()
+            .rev()
+            .take(N_BYTES_U256)
+            .map(|row| row.byte.clone())
+            .collect::<Vec<AssignedCell<Fr, Fr>>>();
         let export = AssignedBlobDataExport {
             num_valid_chunks,
             versioned_hash: assigned_rows
-                        .iter()
-                        .rev()
-                        .skip(N_BYTES_U256)
-                        .take(N_BYTES_U256)
-                        .map(|row| row.byte.clone())
-                        .rev()
-                        .collect(),
+                .iter()
+                .rev()
+                .skip(N_BYTES_U256)
+                .take(N_BYTES_U256)
+                .map(|row| row.byte.clone())
+                .rev()
+                .collect(),
             chunk_data_digests,
         };