feat: program refactor #651
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ctian1
reviewed
May 8, 2024
prover/src/lib.rs
Outdated
Comment on lines
576
to
602
| // TODO: this is very subject to change as groth16 e2e is stabilized | ||
| // Convert pv.vkey_digest to a bn254 field element | ||
| let vkey_hash = babybears_to_bn254(&pv.sp1_vk_digest); | ||
| let mut vkey_hash = Bn254Fr::zero(); | ||
| for (i, word) in pv.sp1_vk_digest.iter().enumerate() { | ||
| if i == 0 { | ||
| // Truncate top 3 bits | ||
| vkey_hash = Bn254Fr::from_canonical_u32(word.as_canonical_u32() & 0x1fffffffu32); | ||
| } else { | ||
| vkey_hash *= Bn254Fr::from_canonical_u64(1 << 32); | ||
| vkey_hash += Bn254Fr::from_canonical_u32(word.as_canonical_u32()); | ||
| } | ||
| } | ||
|
|
||
| // Convert pv.committed_value_digest to a bn254 field element | ||
| let committed_values_digest_bytes: [BabyBear; 32] = | ||
| words_to_bytes(&pv.committed_value_digest) | ||
| .try_into() | ||
| .unwrap(); | ||
| let committed_values_digest = babybear_bytes_to_bn254(&committed_values_digest_bytes); | ||
| let mut committed_values_digest = Bn254Fr::zero(); | ||
| for (i, word) in pv.committed_value_digest.iter().enumerate() { | ||
| for (j, byte) in word.0.iter().enumerate() { | ||
| if i == 0 && j == 0 { | ||
| // Truncate top 3 bits | ||
| committed_values_digest = | ||
| Bn254Fr::from_canonical_u32(byte.as_canonical_u32() & 0x1f); | ||
| } else { | ||
| committed_values_digest *= Bn254Fr::from_canonical_u32(256); | ||
| committed_values_digest += Bn254Fr::from_canonical_u32(byte.as_canonical_u32()); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
this code was moved out already, should be as it is in main
prover/src/lib.rs
Outdated
Comment on lines
606
to
607
| witness.commited_values_digest = committed_values_digest; | ||
| witness.vkey_hash = vkey_hash; |
Comment on lines
+419
to
+450
| let (shard_proofs, kinds) = | ||
| batch.iter().cloned().unzip::<_, _, Vec<_>, Vec<_>>(); | ||
|
|
||
| let input = SP1ReduceMemoryLayout { | ||
| compress_vk: &self.compress_vk, | ||
| recursive_machine: &self.compress_machine, | ||
| shard_proofs, | ||
| kinds, | ||
| is_complete, | ||
| }; | ||
|
|
||
| let mut runtime = RecursionRuntime::<Val<InnerSC>, Challenge<InnerSC>, _>::new( | ||
| &self.compress_program, | ||
| self.compress_machine.config().perm.clone(), | ||
| ); | ||
|
|
||
| let mut witness_stream = Vec::new(); | ||
| witness_stream.extend(input.write()); | ||
|
|
||
| runtime.witness_stream = witness_stream.into(); | ||
| runtime.run(); | ||
| runtime.print_stats(); | ||
|
|
||
| let mut recursive_challenger = self.compress_machine.config().challenger(); | ||
| let mut proof = self.compress_machine.prove::<LocalProver<_, _>>( | ||
| &self.compress_pk, | ||
| runtime.record, | ||
| &mut recursive_challenger, | ||
| ); | ||
|
|
||
| debug_assert_eq!(proof.shard_proofs.len(), 1); | ||
| (proof.shard_proofs.pop().unwrap(), ReduceProgramType::Reduce) |
There was a problem hiding this comment.
shouldn't this be a call to verify_batch or some function
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.