Merge pull request #293 from openmina/fix-block-proof

Fix block proof generation
openmina · Mar 22, 2024 · 391586c · 391586c
2 parents 7bf752f + 9b10aef
commit 391586c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs
@@ -1009,7 +1009,7 @@ pub mod consensus {
             let slot_as_field = CheckedN32::from_field(slot_as_field);
 
             let (q, _) = slot_as_field.div_mod(
-                &CheckedN32::from_field(constants.slots_per_window.to_field()),
+                &CheckedN32::from_field(constants.slots_per_sub_window.to_field()),
                 w,
             );
             Self { inner: q }

diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs
@@ -4762,14 +4762,19 @@ mod tests {
         }
 
         // Block proof
-        {
-            let data = std::fs::read(base_dir.join("block_input-2775525-0.bin")).unwrap();
+        for (filename, fps_filename) in [
+            ("block_input-2775525-0.bin", Some("block_fps.txt")),
+            ("block_prove_inputs_7.bin", None),
+        ] {
+            let data = std::fs::read(base_dir.join(filename)).unwrap();
 
             let blockchain_input: v2::ProverExtendBlockchainInputStableV2 =
                 read_binprot(&mut data.as_slice());
 
             let mut witnesses: Witness<Fp> = Witness::new::<StepBlockProof>();
-            witnesses.ocaml_aux = read_witnesses("block_fps.txt").unwrap();
+            if let Some(filename) = fps_filename {
+                witnesses.ocaml_aux = read_witnesses(filename).unwrap();
+            };
 
             let WrapProof { proof, .. } = generate_block_proof(
                 BlockParams {