Padding in set target (#200)
* feat: handle padding in set_target * remove enable from MerkleClaimAndProof * Update src/backends/plonky2/circuits/mainpod.rs Co-authored-by: Ahmad Afuni <root@ahmadafuni.com> --------- Co-authored-by: Ahmad Afuni <root@ahmadafuni.com>
This commit is contained in:
GitHub
parent
17e6c2a092
commit
26a6b2d143
7 changed files with 87 additions and 143 deletions
|
|
@ -1,10 +1,6 @@
|
|||
//! Module that implements the MerkleTree specified at
|
||||
//! https://0xparc.github.io/pod2/merkletree.html .
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
fmt,
|
||||
iter::{self, IntoIterator},
|
||||
};
|
||||
use std::{collections::HashMap, fmt, iter::IntoIterator};
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use plonky2::field::types::Field;
|
||||
|
|
@ -266,94 +262,38 @@ impl MerkleProof {
|
|||
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct MerkleClaimAndProof {
|
||||
/// `enabled` determines if the merkleproof verification is enabled
|
||||
pub enabled: bool,
|
||||
pub root: Hash,
|
||||
pub key: RawValue,
|
||||
pub value: RawValue,
|
||||
/// The siblings in this proof are padded to max_depth
|
||||
pub proof: MerkleProof,
|
||||
}
|
||||
|
||||
impl MerkleClaimAndProof {
|
||||
pub fn empty(max_depth: usize) -> Self {
|
||||
pub fn empty() -> Self {
|
||||
Self {
|
||||
enabled: false,
|
||||
root: EMPTY_HASH,
|
||||
key: EMPTY_VALUE,
|
||||
value: EMPTY_VALUE,
|
||||
proof: MerkleProof {
|
||||
existence: true,
|
||||
siblings: iter::repeat(EMPTY_HASH).take(max_depth).collect(),
|
||||
siblings: vec![],
|
||||
other_leaf: None,
|
||||
},
|
||||
}
|
||||
}
|
||||
pub fn new(
|
||||
max_depth: usize,
|
||||
root: Hash,
|
||||
key: RawValue,
|
||||
value: Option<RawValue>,
|
||||
proof: &MerkleProof,
|
||||
) -> Result<Self> {
|
||||
if proof.siblings.len() > max_depth {
|
||||
Err(anyhow!(
|
||||
"Number of siblings ({}) exceeds maximum depth ({})",
|
||||
proof.siblings.len(),
|
||||
max_depth
|
||||
))
|
||||
} else {
|
||||
Ok(Self {
|
||||
enabled: true,
|
||||
root,
|
||||
key,
|
||||
value: value.unwrap_or(EMPTY_VALUE),
|
||||
proof: MerkleProof {
|
||||
existence: proof.existence,
|
||||
siblings: proof
|
||||
.siblings
|
||||
.iter()
|
||||
.cloned()
|
||||
.chain(iter::repeat(EMPTY_HASH))
|
||||
.take(max_depth)
|
||||
.collect(),
|
||||
other_leaf: proof.other_leaf,
|
||||
},
|
||||
})
|
||||
pub fn new(root: Hash, key: RawValue, value: Option<RawValue>, proof: MerkleProof) -> Self {
|
||||
Self {
|
||||
root,
|
||||
key,
|
||||
value: value.unwrap_or(EMPTY_VALUE),
|
||||
proof,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<MerkleClaimAndProof> for MerkleProof {
|
||||
type Error = anyhow::Error;
|
||||
fn try_from(mp: MerkleClaimAndProof) -> Result<Self> {
|
||||
if !mp.enabled {
|
||||
return Err(anyhow!("Not a valid Merkle proof."));
|
||||
}
|
||||
Ok(MerkleProof {
|
||||
existence: mp.proof.existence,
|
||||
// Trim padding (if any).
|
||||
siblings: mp
|
||||
.proof
|
||||
.siblings
|
||||
.into_iter()
|
||||
.rev()
|
||||
.skip_while(|s| s == &EMPTY_HASH)
|
||||
.collect::<Vec<_>>()
|
||||
.into_iter()
|
||||
.rev()
|
||||
.collect(),
|
||||
other_leaf: mp.proof.other_leaf,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for MerkleClaimAndProof {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
match MerkleProof::try_from(self.clone()) {
|
||||
Err(_) => write!(f, "∅"),
|
||||
Ok(mp) => mp.fmt(f),
|
||||
}
|
||||
self.proof.fmt(f)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -158,15 +158,28 @@ impl MerkleProofGadget {
|
|||
impl MerkleClaimAndProofTarget {
|
||||
/// assigns the given values to the targets
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn set_targets(&self, pw: &mut PartialWitness<F>, mp: &MerkleClaimAndProof) -> Result<()> {
|
||||
pw.set_bool_target(self.enabled, mp.enabled)?;
|
||||
pub fn set_targets(
|
||||
&self,
|
||||
pw: &mut PartialWitness<F>,
|
||||
enabled: bool,
|
||||
mp: &MerkleClaimAndProof,
|
||||
) -> Result<()> {
|
||||
pw.set_bool_target(self.enabled, enabled)?;
|
||||
pw.set_hash_target(self.root, HashOut::from_vec(mp.root.0.to_vec()))?;
|
||||
pw.set_target_arr(&self.key.elements, &mp.key.0)?;
|
||||
pw.set_target_arr(&self.value.elements, &mp.value.0)?;
|
||||
pw.set_bool_target(self.existence, mp.proof.existence)?;
|
||||
|
||||
assert_eq!(mp.proof.siblings.len(), self.max_depth);
|
||||
for (i, sibling) in mp.proof.siblings.iter().enumerate() {
|
||||
// pad siblings with zeros to length max_depth
|
||||
assert!(mp.proof.siblings.len() <= self.max_depth);
|
||||
for (i, sibling) in mp
|
||||
.proof
|
||||
.siblings
|
||||
.iter()
|
||||
.chain(iter::repeat(&EMPTY_HASH))
|
||||
.take(self.max_depth)
|
||||
.enumerate()
|
||||
{
|
||||
pw.set_hash_target(self.siblings[i], HashOut::from_vec(sibling.0.to_vec()))?;
|
||||
}
|
||||
|
||||
|
|
@ -250,18 +263,29 @@ impl MerkleProofExistenceGadget {
|
|||
|
||||
impl MerkleProofExistenceTarget {
|
||||
/// assigns the given values to the targets
|
||||
pub fn set_targets(&self, pw: &mut PartialWitness<F>, mp: &MerkleClaimAndProof) -> Result<()> {
|
||||
pub fn set_targets(
|
||||
&self,
|
||||
pw: &mut PartialWitness<F>,
|
||||
enabled: bool,
|
||||
mp: &MerkleClaimAndProof,
|
||||
) -> Result<()> {
|
||||
assert!(mp.proof.existence); // sanity check
|
||||
|
||||
pw.set_bool_target(self.enabled, mp.enabled)?;
|
||||
pw.set_bool_target(self.enabled, enabled)?;
|
||||
pw.set_hash_target(self.root, HashOut::from_vec(mp.root.0.to_vec()))?;
|
||||
pw.set_target_arr(&self.key.elements, &mp.key.0)?;
|
||||
pw.set_target_arr(&self.value.elements, &mp.value.0)?;
|
||||
|
||||
// pad siblings with zeros to length max_depth
|
||||
assert_eq!(mp.proof.siblings.len(), self.max_depth);
|
||||
|
||||
for (i, sibling) in mp.proof.siblings.iter().enumerate() {
|
||||
assert!(mp.proof.siblings.len() <= self.max_depth);
|
||||
for (i, sibling) in mp
|
||||
.proof
|
||||
.siblings
|
||||
.iter()
|
||||
.chain(iter::repeat(&EMPTY_HASH))
|
||||
.take(self.max_depth)
|
||||
.enumerate()
|
||||
{
|
||||
pw.set_hash_target(self.siblings[i], HashOut::from_vec(sibling.0.to_vec()))?;
|
||||
}
|
||||
|
||||
|
|
@ -515,7 +539,8 @@ pub mod tests {
|
|||
let targets = MerkleProofGadget { max_depth }.eval(&mut builder)?;
|
||||
targets.set_targets(
|
||||
&mut pw,
|
||||
&MerkleClaimAndProof::new(max_depth, tree.root(), key, Some(value), &proof)?,
|
||||
true,
|
||||
&MerkleClaimAndProof::new(tree.root(), key, Some(value), proof),
|
||||
)?;
|
||||
|
||||
// generate & verify proof
|
||||
|
|
@ -560,7 +585,8 @@ pub mod tests {
|
|||
let targets = MerkleProofExistenceGadget { max_depth }.eval(&mut builder)?;
|
||||
targets.set_targets(
|
||||
&mut pw,
|
||||
&MerkleClaimAndProof::new(max_depth, tree.root(), key, Some(value), &proof)?,
|
||||
true,
|
||||
&MerkleClaimAndProof::new(tree.root(), key, Some(value), proof),
|
||||
)?;
|
||||
|
||||
// generate & verify proof
|
||||
|
|
@ -634,7 +660,8 @@ pub mod tests {
|
|||
let targets = MerkleProofGadget { max_depth }.eval(&mut builder)?;
|
||||
targets.set_targets(
|
||||
&mut pw,
|
||||
&MerkleClaimAndProof::new(max_depth, tree.root(), key, Some(value), &proof)?,
|
||||
true,
|
||||
&MerkleClaimAndProof::new(tree.root(), key, Some(value), proof),
|
||||
)?;
|
||||
|
||||
// generate & verify proof
|
||||
|
|
@ -677,8 +704,8 @@ pub mod tests {
|
|||
|
||||
let targets = MerkleProofGadget { max_depth }.eval(&mut builder)?;
|
||||
// verification enabled & proof of existence
|
||||
let mut mp = MerkleClaimAndProof::new(max_depth, tree2.root(), key, Some(value), &proof)?;
|
||||
targets.set_targets(&mut pw, &mp)?;
|
||||
let mp = MerkleClaimAndProof::new(tree2.root(), key, Some(value), proof);
|
||||
targets.set_targets(&mut pw, true, &mp)?;
|
||||
|
||||
// generate proof, expecting it to fail (since we're using the wrong
|
||||
// root)
|
||||
|
|
@ -693,8 +720,7 @@ pub mod tests {
|
|||
|
||||
let targets = MerkleProofGadget { max_depth }.eval(&mut builder)?;
|
||||
// verification disabled & proof of existence
|
||||
mp.enabled = false;
|
||||
targets.set_targets(&mut pw, &mp)?;
|
||||
targets.set_targets(&mut pw, false, &mp)?;
|
||||
|
||||
// generate proof, should pass despite using wrong witness, since the
|
||||
// `enabled=false`
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ pub mod tests {
|
|||
use crate::{backends::plonky2::primitives::signature::SecretKey, middleware::Hash};
|
||||
|
||||
#[test]
|
||||
fn test_signature_gadget() -> Result<()> {
|
||||
fn test_signature_gadget_enabled() -> Result<()> {
|
||||
// generate a valid signature
|
||||
let sk = SecretKey::new_rand();
|
||||
let pk = sk.public_key();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue