update examples

examples/email_mask/src/main.nr

@@ -1,8 +1,8 @@
 use dep::zkemail::{
     KEY_LIMBS_2048, dkim::RSAPubkey, headers::body_hash::get_body_hash,
-    standard_outputs, Sequence, masking::mask_text
+    Sequence, masking::mask_text
 };
-use dep::std::{collections::bounded_vec::BoundedVec, hash::sha256_var};
+use dep::std::{collections::bounded_vec::BoundedVec, hash::{pedersen_hash, sha256_var}};
 
 global MAX_EMAIL_HEADER_LENGTH: u32 = 512;
 global MAX_EMAIL_BODY_LENGTH: u32 = 1024;
@@ -55,6 +55,7 @@ fn main(
     let masked_body = mask_text(body, body_mask);
 
     // hash the pubkey and signature for the standard outputs
-    let standard_out = standard_outputs(pubkey.modulus, signature);
+    let email_nullifier = pedersen_hash(signature);
+    let standard_out = [pubkey.hash(), email_nullifier];
     (standard_out, masked_header, masked_body)
 }

examples/extract_addresses/src/main.nr

@@ -1,12 +1,10 @@
 use dep::zkemail::{
-    KEY_LIMBS_2048, dkim::RSAPubkey,
-    headers::{body_hash::get_body_hash, email_address::get_email_address}, standard_outputs, Sequence,
-    MAX_EMAIL_ADDRESS_LENGTH
+    KEY_LIMBS_2048, dkim::RSAPubkey, headers::email_address::get_email_address, Sequence,
+    MAX_EMAIL_ADDRESS_LENGTH,
 };
-use dep::std::{collections::bounded_vec::BoundedVec, hash::sha256_var};
+use dep::std::{collections::bounded_vec::BoundedVec, hash::pedersen_hash};
 
 global MAX_EMAIL_HEADER_LENGTH: u32 = 512;
-global MAX_EMAIL_BODY_LENGTH: u32 = 1024;
 
 /**
  * Verify an arbitrary email signed by a 2048-bit RSA DKIM signature and extract sender and recipient addresses
@@ -30,26 +28,23 @@ fn main(
     from_header_sequence: Sequence,
     from_address_sequence: Sequence,
     to_header_sequence: Sequence,
-    to_address_sequence: Sequence
-) -> pub ([Field; 2], BoundedVec<u8, MAX_EMAIL_ADDRESS_LENGTH>, BoundedVec<u8, MAX_EMAIL_ADDRESS_LENGTH>) {
+    to_address_sequence: Sequence,
+    ) -> pub ([Field; 2], BoundedVec<u8, MAX_EMAIL_ADDRESS_LENGTH>, BoundedVec<u8, MAX_EMAIL_ADDRESS_LENGTH>) {
     // check the body and header lengths are within bounds
     assert(header.len() <= MAX_EMAIL_HEADER_LENGTH);
 
     // verify the dkim signature over the header
     pubkey.verify_dkim_signature(header, signature);
 
     // extract to and from email addresses
-    let from = comptime {
-        "from".as_bytes()
-    };
-    let to = comptime {
-        "to".as_bytes()
-    };
+    let from = comptime { "from".as_bytes() };
+    let to = comptime { "to".as_bytes() };
     // 16k gate cost? has to be able to be brought down
     let from_address = get_email_address(header, from_header_sequence, from_address_sequence, from);
     let to_address = get_email_address(header, to_header_sequence, to_address_sequence, to);
 
     // hash the pubkey and signature for the standard outputs
-    let standard_out = standard_outputs(pubkey.modulus, signature);
+    let email_nullifier = pedersen_hash(signature);
+    let standard_out = [pubkey.hash(), email_nullifier];
     (standard_out, from_address, to_address)
 }

examples/partial_hash/src/main.nr

@@ -1,7 +1,8 @@
 use dep::zkemail::{
     KEY_LIMBS_2048, dkim::RSAPubkey, headers::body_hash::get_body_hash,
-    partial_hash::partial_sha256_var_end, standard_outputs, Sequence
+    partial_hash::partial_sha256_var_end, Sequence
 };
+use std::hash::pedersen_hash;
 
 global MAX_EMAIL_HEADER_LENGTH: u32 = 512;
 global MAX_PARTIAL_EMAIL_BODY_LENGTH: u32 = 192;
@@ -52,5 +53,6 @@ fn main(
     );
 
     // hash the pubkey and signature for the standard outputs
-    standard_outputs(pubkey.modulus, signature)
+    let email_nullifier = pedersen_hash(signature);
+    [pubkey.hash(), email_nullifier]
 }

examples/remove_soft_line_breaks/src/main.nr

@@ -1,8 +1,8 @@
 use zkemail::{
-    KEY_LIMBS_2048, dkim::RSAPubkey, headers::body_hash::get_body_hash,
-    standard_outputs, Sequence, remove_soft_line_breaks::remove_soft_line_breaks
+    KEY_LIMBS_2048, dkim::RSAPubkey, headers::body_hash::get_body_hash, Sequence,
+    remove_soft_line_breaks::remove_soft_line_breaks,
 };
-use std::hash::sha256_var;
+use std::hash::{pedersen_hash, sha256_var};
 
 global MAX_EMAIL_HEADER_LENGTH: u32 = 512;
 global MAX_EMAIL_BODY_LENGTH: u32 = 1024;
@@ -28,7 +28,7 @@ fn main(
     pubkey: RSAPubkey<KEY_LIMBS_2048>,
     signature: [Field; KEY_LIMBS_2048],
     body_hash_index: u32,
-    dkim_header_sequence: Sequence
+    dkim_header_sequence: Sequence,
 ) -> pub [Field; 2] {
     // check the body and header lengths are within bounds
     assert(header.len() <= MAX_EMAIL_HEADER_LENGTH);
@@ -48,17 +48,19 @@ fn main(
 
     // compare the body hashes
     assert(
-        signed_body_hash == computed_body_hash, "SHA256 hash computed over body does not match body hash found in DKIM-signed header"
+        signed_body_hash == computed_body_hash,
+        "SHA256 hash computed over body does not match body hash found in DKIM-signed header",
     );
 
     // ~ 37,982 constraints
     // ensure the decoded body is the same as the original body
     assert(
         remove_soft_line_breaks(body.storage(), decoded_body.storage()),
-        "Decoded body does not properly remove soft line breaks"
+        "Decoded body does not properly remove soft line breaks",
     );
 
     // ~ 10,255 constraints
     // hash the pubkey and signature for the standard outputs
-    standard_outputs(pubkey.modulus, signature)
+    let email_nullifier = pedersen_hash(signature);
+    [pubkey.hash(), email_nullifier]
 }

examples/verify_email_1024_bit_dkim/src/main.nr

@@ -1,8 +1,8 @@
 use dep::zkemail::{
     KEY_LIMBS_1024, dkim::RSAPubkey, headers::body_hash::get_body_hash,
-    standard_outputs, Sequence
+    Sequence
 };
-use dep::std::{collections::bounded_vec::BoundedVec, hash::sha256_var};
+use dep::std::{collections::bounded_vec::BoundedVec, hash::{sha256_var, pedersen_hash}};
 
 global MAX_EMAIL_HEADER_LENGTH: u32 = 512;
 global MAX_EMAIL_BODY_LENGTH: u32 = 1024;
@@ -48,5 +48,6 @@ fn main(
     );
 
     // hash the pubkey and signature for the standard outputs
-    standard_outputs(pubkey.modulus, signature)
+    let email_nullifier = pedersen_hash(signature);
+    [pubkey.hash(), email_nullifier]
 }

examples/verify_email_2048_bit_dkim/src/main.nr

@@ -1,8 +1,8 @@
 use dep::zkemail::{
     KEY_LIMBS_2048, dkim::RSAPubkey, headers::body_hash::get_body_hash,
-    standard_outputs, Sequence
+    Sequence
 };
-use dep::std::{collections::bounded_vec::BoundedVec, hash::sha256_var};
+use dep::std::{collections::bounded_vec::BoundedVec, hash::{sha256_var, pedersen_hash}};
 
 global MAX_EMAIL_HEADER_LENGTH: u32 = 512;
 global MAX_EMAIL_BODY_LENGTH: u32 = 1024;
@@ -52,5 +52,6 @@ fn main(
 
     // ~ 10,255 constraints
     // hash the pubkey and signature for the standard outputs
-    standard_outputs(pubkey.modulus, signature)
+    let email_nullifier = pedersen_hash(signature);
+    [pubkey.hash(), email_nullifier]
 }