fri_commitment

crypto/src/fiat_shamir/mod.rs

@@ -1 +1 @@
-mod transcript;
+pub mod transcript;

crypto/src/fiat_shamir/transcript.rs

@@ -1,6 +1,6 @@
 use sha3::{Digest, Sha3_256};
 
-struct Transcript {
+pub struct Transcript {
     hasher: Sha3_256,
 }
 
@@ -13,12 +13,12 @@ impl Transcript {
     }
 
     #[allow(unused)]
-    fn append(&mut self, new_data: &[u8]) {
+    pub fn append(&mut self, new_data: &[u8]) {
         self.hasher.update(&mut new_data.to_owned());
     }
 
     #[allow(unused)]
-    fn challenge(&mut self) -> [u8; 32] {
+    pub fn challenge(&mut self) -> [u8; 32] {
         let mut result_hash = [0_u8; 32];
         result_hash.copy_from_slice(&self.hasher.finalize_reset());
         self.hasher.update(result_hash);

crypto/src/merkle_tree/mod.rs

@@ -7,7 +7,7 @@ use std::{cell::RefCell, rc::Rc};
 
 pub struct MerkleTree<F: IsField, H: IsCryptoHash<F>> {
     leafs: Vec<TreeNode<F>>,
-    root: TreeNode<F>,
+    pub root: TreeNode<F>,
     hasher: H,
 }
 
@@ -165,7 +165,7 @@ pub struct Proof<F: IsField, H: IsCryptoHash<F>> {
     hasher: H,
 }
 
-type TreeNode<F> = Rc<RefCell<Node<F>>>;
+pub type TreeNode<F> = Rc<RefCell<Node<F>>>;
 
 fn build_tree_node<F: IsField>(hash: FieldElement<F>) -> TreeNode<F> {
     Rc::new(RefCell::new(Node {
@@ -176,8 +176,8 @@ fn build_tree_node<F: IsField>(hash: FieldElement<F>) -> TreeNode<F> {
 }
 
 #[derive(Clone, Debug, PartialEq)]
-struct Node<F: IsField> {
-    hash: FieldElement<F>,
+pub struct Node<F: IsField> {
+    pub hash: FieldElement<F>,
     parent: Option<TreeNode<F>>,
     sibiling: Option<TreeNode<F>>,
 }

prover/src/fri/fri_commitment.rs

@@ -1,25 +1,12 @@
 pub use super::{Polynomial, F, FE};
-use lambdaworks_crypto::{hash::traits::IsCryptoHash, merkle_tree};
+use lambdaworks_crypto::{hash::traits::IsCryptoHash, merkle_tree::MerkleTree};
+use lambdaworks_math::field::traits::IsField;
 
-pub struct FriCommitment {
+pub struct FriCommitment<F: IsField, H: IsCryptoHash<F>> {
     pub poly: Polynomial<FE>,
     pub domain: Vec<FE>,
     pub evaluation: Vec<FE>,
-    pub merkle_tree: String, // TODO!
+    pub merkle_tree: MerkleTree<F, H>, // TODO!
 }
 
-pub type FriCommitmentVec = Vec<FriCommitment>;
-
-// TODO!!!!
-#[derive(Clone)]
-struct TestHasher;
-
-impl IsCryptoHash<F> for TestHasher {
-    fn hash_one(&self, input: FE) -> FE {
-        input + input
-    }
-
-    fn hash_two(&self, left: FE, right: FE) -> FE {
-        left + right
-    }
-}
+pub type FriCommitmentVec<F, H> = Vec<FriCommitment<F, H>>;

prover/src/fri/fri_merkle_tree.rs

@@ -0,0 +1,31 @@
+pub use super::{Polynomial, F, FE};
+use lambdaworks_crypto::hash::traits::IsCryptoHash;
+
+// TODO!!!!
+#[derive(Clone)]
+pub struct FriTestHasher;
+
+impl IsCryptoHash<F> for FriTestHasher {
+    fn hash_one(&self, input: FE) -> FE {
+        input + input
+    }
+
+    fn hash_two(&self, left: FE, right: FE) -> FE {
+        left + right
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{FriTestHasher, FE};
+    use lambdaworks_crypto::merkle_tree::MerkleTree;
+
+    #[test]
+    fn build_merkle_tree_from_an_even_set_of_leafs() {
+        let merkle_tree = MerkleTree::build(
+            &[FE::new(1), FE::new(2), FE::new(3), FE::new(4)],
+            FriTestHasher,
+        );
+        assert_eq!(merkle_tree.root.borrow().hash, FE::new(20));
+    }
+}

prover/src/fri/mod.rs

@@ -1,8 +1,12 @@
 mod fri_commitment;
 mod fri_decommit;
 mod fri_functions;
+mod fri_merkle_tree;
 
-use fri_commitment::{FriCommitment, FriCommitmentVec};
+use crate::fri::fri_merkle_tree::FriTestHasher;
+use fri_commitment::FriCommitment; //, FriCommitmentVec};
+pub use lambdaworks_crypto::fiat_shamir::transcript::Transcript;
+use lambdaworks_crypto::merkle_tree::MerkleTree;
 use lambdaworks_math::field::{element::FieldElement, fields::u64_prime_field::U64PrimeField};
 pub use lambdaworks_math::polynomial::Polynomial;
 
@@ -19,23 +23,24 @@ pub fn fri_commitment(
     p_i: &Polynomial<FieldElement<F>>,
     domain_i: &[FE],
     evaluation_i: &[FE],
-    // merkle_tree0: ...
-    // transcript
-) -> FriCommitment {
+    transcript: &mut Transcript,
+) -> FriCommitment<F, FriTestHasher> {
     // Merkle tree:
     //     - ret_evaluation
     //     - root
     //     - hasher
-    // Create a new merkle tree with ret_evaluation
+    // Create a new merkle tree with evaluation_i
+    let merkle_tree = MerkleTree::build(&evaluation_i, FriTestHasher);
+    let root = merkle_tree.root.borrow().hash;
+    // TODO @@@ let bytes = root.as_bytes();
+    //transcript.append(bytes);
 
-    //let tree: merkle_tree::MerkleTree<FE, TestHasher>;
-    let ret = FriCommitment {
+    FriCommitment {
         poly: p_i.clone(),
-        domain: Vec::new(),
-        evaluation: Vec::new(),
-        merkle_tree: String::new(), // TODO!
-    };
-    ret
+        domain: domain_i.to_vec(),
+        evaluation: evaluation_i.to_vec(),
+        merkle_tree,
+    }
 }
 
 /*