Pass all unit tests

zkemail · Oct 5, 2024 · 69d57b9 · 69d57b9
1 parent e3eb05a
commit 69d57b9
Show file tree

Hide file tree

Showing 13 changed files with 622 additions and 129 deletions.
diff --git a/packages/apis/src/decomposed_defs/email_addr_with_name.json b/packages/apis/src/decomposed_defs/email_addr_with_name.json
diff --git a/packages/apis/src/decomposed_defs/from_addr.json b/packages/apis/src/decomposed_defs/from_addr.json
@@ -10,7 +10,7 @@
     },
     {
       "is_public": true,
-      "regex_def": "[A-Za-z0-9!#$%&'*+=?\\-\\^_`{|}~./@]+@[A-Za-z0-9.\\-]+"
+      "regex_def": "[^<>]+"
     },
     {
       "is_public": false,

diff --git a/packages/apis/src/decomposed_defs/to_addr.json b/packages/apis/src/decomposed_defs/to_addr.json
@@ -10,7 +10,7 @@
     },
     {
       "is_public": true,
-      "regex_def": "[A-Za-z0-9!#$%&'*+=?\\-\\^_`{|}~./@]+@[a-zA-Z0-9.\\-]+"
+      "regex_def": "[^<>]+"
     },
     {
       "is_public": false,

diff --git a/packages/apis/src/extract_substrs.rs b/packages/apis/src/extract_substrs.rs
@@ -89,12 +89,12 @@ pub fn extract_email_domain_idxes(
     extract_substr_idxes(input_str, &serde_json::from_str(regex_config).unwrap())
 }
 
-pub fn extract_email_addr_with_name_idxes(
-    input_str: &str,
-) -> Result<Vec<(usize, usize)>, ExtractSubstrssError> {
-    let regex_config = include_str!("./decomposed_defs/email_addr_with_name.json");
-    extract_substr_idxes(input_str, &serde_json::from_str(regex_config).unwrap())
-}
+// pub fn extract_email_addr_with_name_idxes(
+//     input_str: &str,
+// ) -> Result<Vec<(usize, usize)>, ExtractSubstrssError> {
+//     let regex_config = include_str!("./decomposed_defs/email_addr_with_name.json");
+//     extract_substr_idxes(input_str, &serde_json::from_str(regex_config).unwrap())
+// }
 
 pub fn extract_from_all_idxes(
     input_str: &str,
@@ -166,20 +166,20 @@ mod test {
         assert_eq!(idxes, vec![(17, 38)]);
     }
 
-    #[test]
-    fn test_email_addr_with_name_valid1() {
-        let input_str = "from:[email protected] <[email protected]>";
-        let idxes = extract_email_addr_with_name_idxes(input_str).unwrap();
-        assert_eq!(idxes, vec![(18, 39)]);
-    }
-
-    #[test]
-    fn test_email_addr_with_name_valid2() {
-        // "末神 奏宙" has 13 bytes.
-        let input_str = "from:\"末神 奏宙\" <[email protected]>";
-        let idxes = extract_email_addr_with_name_idxes(input_str).unwrap();
-        assert_eq!(idxes, vec![(22, 43)]);
-    }
+    // #[test]
+    // fn test_email_addr_with_name_valid1() {
+    //     let input_str = "from:[email protected] <[email protected]>";
+    //     let idxes = extract_email_addr_with_name_idxes(input_str).unwrap();
+    //     assert_eq!(idxes, vec![(18, 39)]);
+    // }
+
+    // #[test]
+    // fn test_email_addr_with_name_valid2() {
+    //     // "末神 奏宙" has 13 bytes.
+    //     let input_str = "from:\"末神 奏宙\" <[email protected]>";
+    //     let idxes = extract_email_addr_with_name_idxes(input_str).unwrap();
+    //     assert_eq!(idxes, vec![(22, 43)]);
+    // }
 
     #[test]
     fn test_email_from_all_valid() {

diff --git a/packages/apis/src/wasm.rs b/packages/apis/src/wasm.rs
@@ -47,12 +47,12 @@ pub fn extractEmailDomainIdxes(inputStr: &str) -> Array {
     extractSubstrIdxes(inputStr, JsValue::from_str(regex_config))
 }
 
-#[wasm_bindgen]
-#[allow(non_snake_case)]
-pub fn extractEmailAddrWithNameIdxes(inputStr: &str) -> Array {
-    let regex_config = include_str!("./decomposed_defs/email_addr_with_name.json");
-    extractSubstrIdxes(inputStr, JsValue::from_str(regex_config))
-}
+// #[wasm_bindgen]
+// #[allow(non_snake_case)]
+// pub fn extractEmailAddrWithNameIdxes(inputStr: &str) -> Array {
+//     let regex_config = include_str!("./decomposed_defs/email_addr_with_name.json");
+//     extractSubstrIdxes(inputStr, JsValue::from_str(regex_config))
+// }
 
 #[wasm_bindgen]
 #[allow(non_snake_case)]

diff --git a/packages/circom/circuits/common/email_addr_with_name_regex.circom b/packages/circom/circuits/common/email_addr_with_name_regex.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.5;
 
 include "@zk-email/zk-regex-circom/circuits/regex_helpers.circom";
-include "./reversed_email_addr_with_name_regex.circom";
+include "./reversed_bracket_regex.circom";
 
 template EmailAddrWithNameRegex(msg_bytes) {
 	signal input msg[msg_bytes];
@@ -13,7 +13,7 @@ template EmailAddrWithNameRegex(msg_bytes) {
 	for(var i=0; i<msg_bytes; i++) {
 		reversed_msg[i] <== msg[msg_bytes - i - 1];
 	}
-	(out, reversed_reveal0) <== ReversedEmailAddrWithNameRegex(msg_bytes)(reversed_msg);
+	(out, reversed_reveal0) <== ReversedBracketRegex(msg_bytes)(reversed_msg);
 	for(var i=0; i<msg_bytes; i++) {
 		reveal0[i] <== reversed_reveal0[msg_bytes - i - 1];
 	}

diff --git a/packages/circom/circuits/common/from_addr.json b/packages/circom/circuits/common/from_addr.json
diff --git a/packages/circom/circuits/common/from_addr_regex.circom b/packages/circom/circuits/common/from_addr_regex.circom
@@ -1,9 +1,9 @@
 pragma circom 2.1.5;
 
-include "@zk-email/zk-regex-circom/circuits/regex_helpers.circom";
-include "@zk-email/zk-regex-circom/circuits/common/from_all_regex.circom";
-include "@zk-email/zk-regex-circom/circuits/common/email_addr_regex.circom";
-include "@zk-email/zk-regex-circom/circuits/common/email_addr_with_name_regex.circom";
+include "../regex_helpers.circom";
+include "./from_all_regex.circom";
+include "./email_addr_regex.circom";
+include "./email_addr_with_name_regex.circom";
 
 
 template FromAddrRegex(msg_bytes) {

diff --git a/...common/reversed_email_addr_with_name.json → ...com/circuits/common/reversed_bracket.json b/...common/reversed_email_addr_with_name.json → ...com/circuits/common/reversed_bracket.json
@@ -6,7 +6,7 @@
         },
         {
             "is_public": true,
-            "regex_def": "[a-zA-Z0-9.\\-]+@[A-Za-z0-9!#$%&'*+=?\\-\\^_`{|}~./@]+"
+            "regex_def": "[^<>]+"
         },
         {
             "is_public": false,