Implement Containers (Dictionary,Set,Array) on top of MerkleTree. And restructure the code. (#55)
* Implement Containers (Dictionary,Set,Array) on top of MerkleTree. And restructure the code.
- Reorganize the code grouping backends, middleware, frontend, (crypto) primitives.
- Add types Dictionary,Set,Array at the middleware layer, so that
it can be used both by the backend and frontend. The Dictionary, Set,
Array use the merkletree differently as specified at
f2575d1524/book/src/values.md (dictionary-array-set)
- The containers introduce the trait Container, which has the
method 'cm()'. At the current version this uses a merkletree
under the hood, and the method 'cm' returns the merkle root.
- Ideally neither frontend nor backend use the MerkleTree type, and they
use the wrappers {Dictionary,Set,Array}. Note that the current commit
the MerkleTree is used at the mock-backend to check internal values, but
not at the struct types.
- updated the spec's merkletree section updating the defined interface
- add github ci to run the tests
---------
Co-authored-by: Ahmad Afuni <root@ahmadafuni.com>
Co-authored-by: Eduard S. <eduardsanou@posteo.net>
This commit is contained in:
parent
f2575d1524
commit
bb865a4fea
14 changed files with 330 additions and 94 deletions
|
|
@ -1,189 +0,0 @@
|
|||
/// MerkleTree implementation for POD2.
|
||||
///
|
||||
/// Current implementation is a wrapper on top of Plonky2's MerkleTree, but the future iteration
|
||||
/// will replace it by the MerkleTree specified at https://0xparc.github.io/pod2/merkletree.html .
|
||||
use anyhow::{anyhow, Result};
|
||||
use itertools::Itertools;
|
||||
use plonky2::field::types::Field;
|
||||
use plonky2::hash::{
|
||||
hash_types::HashOut,
|
||||
merkle_proofs::{verify_merkle_proof, MerkleProof as PlonkyMerkleProof},
|
||||
merkle_tree::MerkleTree as PlonkyMerkleTree,
|
||||
poseidon::PoseidonHash,
|
||||
};
|
||||
use plonky2::plonk::config::GenericConfig;
|
||||
use plonky2::plonk::config::Hasher;
|
||||
use std::collections::HashMap;
|
||||
use std::iter::IntoIterator;
|
||||
|
||||
use crate::middleware::{Hash, Value, C, D, F};
|
||||
|
||||
const CAP_HEIGHT: usize = 0;
|
||||
|
||||
/// MerkleTree currently implements the MerkleTree interface with a wrapper on top of Plonky2's
|
||||
/// MerkleTree. A future iteration will replace it by the MerkleTree specified at
|
||||
/// https://0xparc.github.io/pod2/merkletree.html .
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct MerkleTree {
|
||||
tree: PlonkyMerkleTree<F, <C as GenericConfig<D>>::Hasher>,
|
||||
// keyindex: key -> index mapping. This is just for the current plonky-tree wrapper
|
||||
keyindex: HashMap<Hash, usize>,
|
||||
// kvs are a field in the MerkleTree in order to be able to iterate over the keyvalues. This is
|
||||
// specific of the current implementation (Plonky2's tree wrapper), in the next iteration this
|
||||
// will not be needed since the tree implementation itself will offer the hashmap
|
||||
// functionality.
|
||||
kvs: HashMap<Hash, Value>,
|
||||
}
|
||||
|
||||
pub struct MerkleProof {
|
||||
existence: bool,
|
||||
index: usize,
|
||||
proof: PlonkyMerkleProof<F, <C as GenericConfig<D>>::Hasher>,
|
||||
}
|
||||
|
||||
impl MerkleTree {
|
||||
pub fn new(kvs: &HashMap<Hash, Value>) -> Self {
|
||||
let mut keyindex: HashMap<Hash, usize> = HashMap::new();
|
||||
let mut leaves: Vec<Vec<F>> = Vec::new();
|
||||
// Note: current version iterates sorting by keys of the kvs, but the merkletree defined at
|
||||
// https://0xparc.github.io/pod2/merkletree.html will not need it since it will be
|
||||
// deterministic based on the keys values not on the order of the keys when added into the
|
||||
// tree.
|
||||
for (i, (k, v)) in kvs.iter().sorted_by_key(|kv| kv.0).enumerate() {
|
||||
let input: Vec<F> = [k.0, v.0].concat();
|
||||
let leaf = PoseidonHash::hash_no_pad(&input).elements;
|
||||
leaves.push(leaf.into());
|
||||
keyindex.insert(*k, i);
|
||||
}
|
||||
|
||||
// pad to a power of two if needed
|
||||
let leaf_empty: Vec<F> = vec![F::ZERO, F::ZERO, F::ZERO, F::ZERO];
|
||||
for _ in leaves.len()..leaves.len().next_power_of_two() {
|
||||
leaves.push(leaf_empty.clone());
|
||||
}
|
||||
|
||||
let tree = PlonkyMerkleTree::<F, <C as GenericConfig<D>>::Hasher>::new(leaves, CAP_HEIGHT);
|
||||
Self {
|
||||
tree,
|
||||
keyindex,
|
||||
kvs: kvs.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn root(&self) -> Result<Hash> {
|
||||
if self.tree.cap.is_empty() {
|
||||
return Err(anyhow!("empty tree"));
|
||||
}
|
||||
Ok(Hash(self.tree.cap.0[0].elements))
|
||||
}
|
||||
|
||||
pub fn prove(&self, key: &Hash) -> Result<MerkleProof> {
|
||||
let i = self.keyindex.get(&key).ok_or(anyhow!("key not in tree"))?;
|
||||
let proof = self.tree.prove(*i);
|
||||
Ok(MerkleProof {
|
||||
existence: true,
|
||||
index: *i,
|
||||
proof,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn prove_nonexistence(&self, _key: &Hash) -> Result<MerkleProof> {
|
||||
// mock method
|
||||
println!("WARNING: MerkleTree::verify_nonexistence is currently a mock");
|
||||
Ok(MerkleProof {
|
||||
existence: false,
|
||||
index: 0,
|
||||
proof: PlonkyMerkleProof { siblings: vec![] },
|
||||
})
|
||||
}
|
||||
|
||||
pub fn verify(root: Hash, proof: &MerkleProof, key: &Hash, value: &Value) -> Result<()> {
|
||||
if !proof.existence {
|
||||
return Err(anyhow!(
|
||||
"expected proof of existence, found proof of non-existence"
|
||||
));
|
||||
}
|
||||
let leaf = PoseidonHash::hash_no_pad(&[key.0, value.0].concat()).elements;
|
||||
let root = HashOut::from_vec(root.0.to_vec());
|
||||
verify_merkle_proof(leaf.into(), proof.index, root, &proof.proof)
|
||||
}
|
||||
|
||||
pub fn verify_nonexistence(
|
||||
_root: Hash,
|
||||
proof: &MerkleProof,
|
||||
_key: &Hash,
|
||||
_value: &Value,
|
||||
) -> Result<()> {
|
||||
// mock method
|
||||
if proof.existence {
|
||||
return Err(anyhow!(
|
||||
"expected proof of non-existence, found proof of existence"
|
||||
));
|
||||
}
|
||||
println!("WARNING: MerkleTree::verify_nonexistence is currently a mock");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn iter(&self) -> std::collections::hash_map::Iter<Hash, Value> {
|
||||
self.kvs.iter()
|
||||
}
|
||||
|
||||
pub fn kvs(&self) -> &HashMap<Hash, Value> {
|
||||
&self.kvs
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a MerkleTree {
|
||||
type Item = (&'a Hash, &'a Value);
|
||||
type IntoIter = std::collections::hash_map::Iter<'a, Hash, Value>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.kvs.iter()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
|
||||
use crate::middleware::hash_str;
|
||||
|
||||
#[test]
|
||||
fn test_merkletree() -> Result<()> {
|
||||
let (k0, v0) = (
|
||||
hash_str("key_0".into()),
|
||||
Value(hash_str("value_0".into()).0),
|
||||
);
|
||||
let (k1, v1) = (
|
||||
hash_str("key_1".into()),
|
||||
Value(hash_str("value_1".into()).0),
|
||||
);
|
||||
let (k2, v2) = (
|
||||
hash_str("key_2".into()),
|
||||
Value(hash_str("value_2".into()).0),
|
||||
);
|
||||
|
||||
let mut kvs = HashMap::new();
|
||||
kvs.insert(k0, v0);
|
||||
kvs.insert(k1, v1);
|
||||
kvs.insert(k2, v2);
|
||||
|
||||
let tree = MerkleTree::new(&kvs);
|
||||
|
||||
let proof = tree.prove(&k2)?;
|
||||
MerkleTree::verify(tree.root()?, &proof, &k2, &v2)?;
|
||||
|
||||
// expect verification to fail with different key / value
|
||||
assert!(MerkleTree::verify(tree.root()?, &proof, &k2, &v0).is_err());
|
||||
assert!(MerkleTree::verify(tree.root()?, &proof, &k0, &v2).is_err());
|
||||
|
||||
// non-existence proofs
|
||||
let proof_ne = tree.prove_nonexistence(&k2)?;
|
||||
let _ = MerkleTree::verify_nonexistence(tree.root()?, &proof_ne, &k2, &v2)?;
|
||||
|
||||
// expect verification of existence fail for nonexistence proof
|
||||
let _ = MerkleTree::verify(tree.root()?, &proof_ne, &k2, &v2).is_err();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue