Mt refactor

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
     branches:
       - main
-      - cap-rollup
+      - mt-refactor
   schedule:
     - cron: "0 0 * * 1"
   workflow_dispatch:

flake.nix

@@ -16,6 +16,7 @@
 
   inputs.rust-overlay.url = "github:oxalica/rust-overlay";
   inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
+  inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
   outputs = { self, nixpkgs, flake-utils, flake-compat, rust-overlay, pre-commit-hooks, ... }:
     flake-utils.lib.eachDefaultSystem (system:
@@ -58,15 +59,15 @@
                 entry = "cargo sort -w";
                 pass_filenames = false;
               };
-              license-header-c-style = {
-                enable = true;
-                description =
-                  "Ensure files with c-style comments have license header";
-                entry = ''
-                  insert_license --license-filepath .license-header  --comment-style "//"'';
-                types_or = [ "rust" ];
-                pass_filenames = true;
-              };
+              # license-header-c-style = {
+              #   enable = true;
+              #   description =
+              #     "Ensure files with c-style comments have license header";
+              #   entry = ''
+              #     insert_license --license-filepath .license-header  --comment-style "//"'';
+              #   types_or = [ "rust" ];
+              #   pass_filenames = true;
+              # };
             };
           };
         };

primitives/Cargo.toml

@@ -30,10 +30,14 @@ itertools = { version = "0.10.1", default-features = false, features = [ "use_al
 jf-relation = { path = "../relation", default-features = false }
 jf-utils = { path = "../utilities" }
 merlin = { version = "3.0.0", default-features = false }
+num-bigint = { version = "0.4.3", default-features = false }
+num-traits = { version = "0.2.15", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
 rayon = { version = "1.5.0", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sha2 = { version = "0.10.1", default-features = false }
+sha3 = { version = "0.10.5", default-features = false }
+typenum = { version = "1.15.0", default-features = false }
 zeroize = { version = "1.3", default-features = false }
 
 [dev-dependencies]
@@ -47,6 +51,7 @@ ark-ed-on-bn254 = "0.3.0"
 bincode = "1.0"
 criterion = "0.3.1"
 quickcheck = "1.0.0"
+hashbrown = "0.13.1"
 
 [[bench]]
 name = "merkle_path"

primitives/benches/merkle_path.rs

@@ -7,47 +7,47 @@
 #![deny(warnings)]
 #[macro_use]
 extern crate criterion;
-use ark_ed_on_bls12_381::Fq as Fq381;
-use ark_std::rand::{prelude::SliceRandom, Rng};
+// use ark_ed_on_bls12_381::Fq as Fq381;
+// use ark_std::rand::{prelude::SliceRandom, Rng};
 use criterion::Criterion;
-use jf_primitives::merkle_tree::{
-    MerkleLeafProof, MerklePath, MerklePathNode, MerkleTree, NodePos, NodeValue,
-};
-use std::time::Duration;
-
-const BENCH_NAME: &str = "merkle_path_height_20";
-
-fn twenty_hashes(c: &mut Criterion) {
-    let mut benchmark_group = c.benchmark_group(BENCH_NAME);
-    benchmark_group.sample_size(10);
-    benchmark_group.measurement_time(Duration::new(10, 0));
-
-    let mut rng = ark_std::test_rng();
-
-    let leaf: Fq381 = rng.gen();
-    let base: NodeValue<Fq381> = rng.gen();
-    let mut sibs = vec![];
-    for _ in 0..20 {
-        let pos = *[NodePos::Left, NodePos::Middle, NodePos::Right]
-            .choose(&mut rng)
-            .unwrap();
-        let sibling1: NodeValue<_> = rng.gen();
-        let sibling2: NodeValue<_> = rng.gen();
-        sibs.push(MerklePathNode {
-            sibling1,
-            sibling2,
-            pos,
-        });
-    }
-
-    let sibs = MerklePath { nodes: sibs };
-
-    let num_inputs = 0;
-    benchmark_group.bench_with_input(BENCH_NAME, &num_inputs, move |b, &_num_inputs| {
-        b.iter(|| MerkleTree::check_proof(base, 0, &MerkleLeafProof::new(leaf, sibs.clone())))
-    });
-
-    benchmark_group.finish();
+// use jf_primitives::merkle_tree::{
+//     MerkleLeafProof, MerklePath, MerklePathNode, MerkleTree, NodePos,
+// NodeValue, };
+// use std::time::Duration;
+
+// const BENCH_NAME: &str = "merkle_path_height_20";
+
+fn twenty_hashes(_c: &mut Criterion) {
+    // let mut benchmark_group = c.benchmark_group(BENCH_NAME);
+    // benchmark_group.sample_size(10);
+    // benchmark_group.measurement_time(Duration::new(10, 0));
+
+    // let mut rng = ark_std::test_rng();
+
+    // let leaf: Fq381 = rng.gen();
+    // let base: NodeValue<Fq381> = rng.gen();
+    // let mut sibs = vec![];
+    // for _ in 0..20 {
+    //     let pos = *[NodePos::Left, NodePos::Middle, NodePos::Right]
+    //         .choose(&mut rng)
+    //         .unwrap();
+    //     let sibling1: NodeValue<_> = rng.gen();
+    //     let sibling2: NodeValue<_> = rng.gen();
+    //     sibs.push(MerklePathNode {
+    //         sibling1,
+    //         sibling2,
+    //         pos,
+    //     });
+    // }
+
+    // let sibs = MerklePath { nodes: sibs };
+
+    // let num_inputs = 0;
+    // benchmark_group.bench_with_input(BENCH_NAME, &num_inputs, move |b,
+    // &_num_inputs| {     b.iter(|| MerkleTree::check_proof(base, 0,
+    // &MerkleLeafProof::new(leaf, sibs.clone()))) });
+
+    // benchmark_group.finish();
 }
 
 fn bench(c: &mut Criterion) {

primitives/src/circuit/mod.rs

@@ -7,7 +7,8 @@
 //! Circuit implementation of various crypto primitives.
 pub mod commitment;
 pub mod elgamal;
-pub mod merkle_tree;
+// TODO(Chengyu): implement merkle_tree gadgets
+// pub mod merkle_tree;
 pub mod prf;
 pub mod rescue;
 pub mod signature;