-
Notifications
You must be signed in to change notification settings - Fork 317
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The first round of updating naming and adjusting some smaller things better matching the spec. Important to note - fixed logic in tapering, such that it starts at the last layer note the first - split labeling proofs and encoding proofs - add missing round of labeling proofs for the last layer - add missing checks for column proof - improve efficiency of the comm_r check
- Loading branch information
1 parent
fc438a2
commit f2fcbf7
Showing
23 changed files
with
388 additions
and
241 deletions.
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| use bellperson::{ConstraintSystem, SynthesisError}; | ||
| use fil_sapling_crypto::circuit::{boolean::Boolean, num}; | ||
| use fil_sapling_crypto::jubjub::JubjubEngine; | ||
| use paired::bls12_381::{Bls12, Fr}; | ||
|
|
||
| use crate::circuit::{constraint, create_label::create_label, uint64}; | ||
| use crate::drgraph::Graph; | ||
| use crate::fr32::fr_into_bytes; | ||
| use crate::hasher::Hasher; | ||
| use crate::stacked::{LabelingProof as VanillaLabelingProof, PublicParams}; | ||
| use crate::util::bytes_into_boolean_vec_be; | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct LabelingProof { | ||
| node: Option<u64>, | ||
| parents: Vec<Option<Fr>>, | ||
| } | ||
|
|
||
| impl LabelingProof { | ||
| /// Create an empty proof, used in `blank_circuit`s. | ||
| pub fn empty<H: Hasher>(params: &PublicParams<H>, layer: usize) -> Self { | ||
| let degree = if layer == 1 { | ||
| params.graph.base_graph().degree() | ||
| } else { | ||
| params.graph.degree() | ||
| }; | ||
| LabelingProof { | ||
| node: None, | ||
| parents: vec![None; degree], | ||
| } | ||
| } | ||
|
|
||
| fn create_label<CS: ConstraintSystem<Bls12>>( | ||
| mut cs: CS, | ||
| _params: &<Bls12 as JubjubEngine>::Params, | ||
| replica_id: &[Boolean], | ||
| node: Option<u64>, | ||
| parents: Vec<Option<Fr>>, | ||
| ) -> Result<num::AllocatedNum<Bls12>, SynthesisError> { | ||
| // get the parents into bits | ||
| let parents_bits: Vec<Vec<Boolean>> = parents | ||
| .iter() | ||
| .enumerate() | ||
| .map(|(i, val)| match val { | ||
| Some(val) => { | ||
| let bytes = fr_into_bytes::<Bls12>(val); | ||
| bytes_into_boolean_vec_be( | ||
| cs.namespace(|| format!("parents_{}_bits", i)), | ||
| Some(&bytes), | ||
| 256, | ||
| ) | ||
| } | ||
| None => bytes_into_boolean_vec_be( | ||
| cs.namespace(|| format!("parents_{}_bits", i)), | ||
| None, | ||
| 256, | ||
| ), | ||
| }) | ||
| .collect::<Result<Vec<Vec<Boolean>>, SynthesisError>>()?; | ||
|
|
||
| let node_num = uint64::UInt64::alloc(cs.namespace(|| "node"), node)?; | ||
|
|
||
| create_label( | ||
| cs.namespace(|| "create_label"), | ||
| replica_id, | ||
| parents_bits, | ||
| Some(node_num), | ||
| ) | ||
| } | ||
|
|
||
| pub fn synthesize<CS: ConstraintSystem<Bls12>>( | ||
| self, | ||
| mut cs: CS, | ||
| params: &<Bls12 as JubjubEngine>::Params, | ||
| replica_id: &[Boolean], | ||
| exp_encoded_node: &num::AllocatedNum<Bls12>, | ||
| ) -> Result<(), SynthesisError> { | ||
| let LabelingProof { node, parents } = self; | ||
|
|
||
| let key = Self::create_label( | ||
| cs.namespace(|| "create_label"), | ||
| params, | ||
| replica_id, | ||
| node, | ||
| parents, | ||
| )?; | ||
|
|
||
| // enforce equality | ||
| constraint::equal(&mut cs, || "equality_key", &exp_encoded_node, &key); | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| impl<H: Hasher> From<VanillaLabelingProof<H>> for LabelingProof { | ||
| fn from(vanilla_proof: VanillaLabelingProof<H>) -> Self { | ||
| let VanillaLabelingProof { parents, node, .. } = vanilla_proof; | ||
|
|
||
| LabelingProof { | ||
| node: Some(node), | ||
| parents: parents.into_iter().map(|p| Some(p.into())).collect(), | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.