logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-05-14 05:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse set_public_value_targets

Browse Source
This commit is contained in:
Robin Salen 2023-08-01 16:43:27 -04:00
parent 5b8740a729
commit bca3e09bba
No known key found for this signature in database
GPG Key ID: FB87BACFB3CB2007
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
evm/src/fixed_recursive_verifier.rs
View File

@ -46,8 +46,8 @@ use crate::proof::{PublicValues, PublicValuesTarget, StarkProofWithMetadata};
use crate::prover::prove; use crate::prover::prove;
use crate::recursive_verifier::{ use crate::recursive_verifier::{
add_common_recursion_gates, add_virtual_public_values, recursive_stark_circuit, add_common_recursion_gates, add_virtual_public_values, recursive_stark_circuit,
set_block_metadata_target, set_trie_roots_target, PlonkWrapperCircuit, PublicInputs, set_block_metadata_target, set_public_value_targets, set_trie_roots_target,
StarkWrapperCircuit, PlonkWrapperCircuit, PublicInputs, StarkWrapperCircuit,
}; };
use crate::stark::Stark; use crate::stark::Stark;
@ -813,25 +813,10 @@ where
&self.aggregation.circuit.verifier_only, &self.aggregation.circuit.verifier_only,
); );
set_block_metadata_target( set_public_value_targets(
&mut root_inputs, &mut root_inputs,
&self.root.public_values.block_metadata, &self.root.public_values,
&all_proof.public_values.block_metadata, &all_proof.public_values,
);
root_inputs.set_target(
self.root.public_values.cpu_trace_len,
F::from_canonical_usize(all_proof.public_values.cpu_trace_len),
);
set_trie_roots_target(
&mut root_inputs,
&self.root.public_values.trie_roots_before,
&all_proof.public_values.trie_roots_before,
);
set_trie_roots_target(
&mut root_inputs,
&self.root.public_values.trie_roots_after,
&all_proof.public_values.trie_roots_after,
); );
let root_proof = self.root.circuit.prove(root_inputs)?; let root_proof = self.root.circuit.prove(root_inputs)?;

5
evm/src/recursive_verifier.rs
View File

@ -636,7 +636,6 @@ pub(crate) fn set_stark_proof_target<F, C: GenericConfig<D, F = F>, W, const D:
set_fri_proof_target(witness, &proof_target.opening_proof, &proof.opening_proof); set_fri_proof_target(witness, &proof_target.opening_proof, &proof.opening_proof);
} }
#[allow(unused)] // TODO: used later?
pub(crate) fn set_public_value_targets<F, W, const D: usize>( pub(crate) fn set_public_value_targets<F, W, const D: usize>(
witness: &mut W, witness: &mut W,
public_values_target: &PublicValuesTarget, public_values_target: &PublicValuesTarget,
@ -660,6 +659,10 @@ pub(crate) fn set_public_value_targets<F, W, const D: usize>(
&public_values_target.block_metadata, &public_values_target.block_metadata,
&public_values.block_metadata, &public_values.block_metadata,
); );
witness.set_target(
public_values_target.cpu_trace_len,
F::from_canonical_usize(public_values.cpu_trace_len),
);
} }
pub(crate) fn set_trie_roots_target<F, W, const D: usize>( pub(crate) fn set_trie_roots_target<F, W, const D: usize>(