-
|
-
- | - Good luck! - | -||||
| - Powered by - ZK Email - | -||||
-
|
-
]*>)'
+ });
+ console.log(circuitInputs.padded_body.length);
+ log("\n\nGenerated Inputs:", circuitInputs, "\n\n");
+
+ await promisify(fs.writeFile)(args.inputFile, JSON.stringify(circuitInputs, null, 2));
+
+ log("Inputs written to", args.inputFile);
+
+ if (args.prove) {
+ const dir = path.dirname(args.inputFile);
+ const { proof, publicSignals } = await snarkjs.groth16.fullProve(circuitInputs, path.join(dir, "email_auth_with_body_parsing_with_qp_encoding.wasm"), path.join(dir, "email_auth_with_body_parsing_with_qp_encoding.zkey"), console);
+ await promisify(fs.writeFile)(path.join(dir, "email_auth_with_body_parsing_with_qp_encoding_proof.json"), JSON.stringify(proof, null, 2));
+ await promisify(fs.writeFile)(path.join(dir, "email_auth_with_body_parsing_with_qp_encoding_public.json"), JSON.stringify(publicSignals, null, 2));
+ log("✓ Proof for email auth circuit generated");
+ }
}
process.exit(0);
}
diff --git a/packages/circuits/src/email_auth_template.circom b/packages/circuits/src/email_auth_template.circom
index 13069d82..9a07d485 100644
--- a/packages/circuits/src/email_auth_template.circom
+++ b/packages/circuits/src/email_auth_template.circom
@@ -16,6 +16,7 @@ include "./utils/hex2int.circom";
include "./utils/email_addr_commit.circom";
include "./regexes/invitation_code_with_prefix_regex.circom";
include "./regexes/invitation_code_regex.circom";
+include "./regexes/command_regex.circom";
include "@zk-email/zk-regex-circom/circuits/common/from_addr_regex.circom";
include "@zk-email/zk-regex-circom/circuits/common/email_addr_regex.circom";
include "@zk-email/zk-regex-circom/circuits/common/email_domain_regex.circom";
@@ -34,7 +35,6 @@ template EmailAuth(n, k, max_header_bytes, max_subject_bytes, recipient_enabled)
signal input public_key[k]; // RSA public key (modulus), k parts of n bits each.
signal input signature[k]; // RSA signature, k parts of n bits each.
signal input padded_header_len; // length of in email data including the padding
- // signal input sender_relayer_rand; // Private randomness of the relayer
signal input account_code;
signal input from_addr_idx; // Index of the from email address (= sender email address) in the email header
signal input subject_idx; // Index of the subject in the header
@@ -46,7 +46,7 @@ template EmailAuth(n, k, max_header_bytes, max_subject_bytes, recipient_enabled)
var email_max_bytes = email_max_bytes_const();
var subject_field_len = compute_ints_size(max_subject_bytes);
var domain_len = domain_len_const();
- var domain_filed_len = compute_ints_size(domain_len);
+ var domain_field_len = compute_ints_size(domain_len);
var k2_chunked_size = k >> 1;
if(k % 2 == 1) {
k2_chunked_size += 1;
@@ -55,7 +55,7 @@ template EmailAuth(n, k, max_header_bytes, max_subject_bytes, recipient_enabled)
var code_len = invitation_code_len_const();
- signal output domain_name[domain_filed_len];
+ signal output domain_name[domain_field_len];
signal output public_key_hash;
signal output email_nullifier;
signal output timestamp;
@@ -69,7 +69,6 @@ template EmailAuth(n, k, max_header_bytes, max_subject_bytes, recipient_enabled)
email_verifier.pubkey <== public_key;
email_verifier.signature <== signature;
email_verifier.emailHeaderLength <== padded_header_len;
- signal header_hash[256] <== email_verifier.sha;
public_key_hash <== email_verifier.pubkeyHash;
// FROM HEADER REGEX
@@ -182,7 +181,7 @@ template EmailAuth(n, k, max_header_bytes, max_subject_bytes, recipient_enabled)
cm_rand_input[k2_chunked_size] <== 1;
signal cm_rand <== Poseidon(k2_chunked_size+1)(cm_rand_input);
signal replaced_email_addr_regex_reveal[max_subject_bytes];
- for(var i=0; i 2048)
+// * max_header_bytes - max number of bytes in the email header
+// * max_body_bytes - max number of bytes in the email body
+// * max_command_bytes - max number of bytes in the command
+// * recipient_enabled - whether the email address commitment of the recipient = email address in the subject is exposed
+// * is_qp_encoded - whether the email body is qp encoded
+template EmailAuthWithBodyParsing(n, k, max_header_bytes, max_body_bytes, max_command_bytes, recipient_enabled, is_qp_encoded) {
+ signal input padded_header[max_header_bytes]; // email data (only header part)
+ signal input padded_header_len; // length of in email data including the padding
+ signal input public_key[k]; // RSA public key (modulus), k parts of n bits each.
+ signal input signature[k]; // RSA signature, k parts of n bits each.
+ signal input body_hash_idx; // index of the bodyhash in the header
+ signal input precomputed_sha[32]; // precomputed sha256 of the email body
+ signal input padded_body[max_body_bytes]; // email data (only body part)
+ signal input padded_body_len; // length of in email data including the padding
+ signal input account_code;
+ signal input from_addr_idx; // Index of the from email address (= sender email address) in the email header
+ signal input domain_idx; // Index of the domain name in the from email address
+ signal input timestamp_idx; // Index of the timestamp in the header
+ signal input code_idx; // index of the invitation code in the header
+ signal input command_idx; // index of the command in the body
+ /// Note: padded_cleaned_body is only used for qp encoded email body,
+ /// for non-qp encoded email body, it should be equal to padded_body
+ signal input padded_cleaned_body[max_body_bytes]; // cleaned email body
+
+ var email_max_bytes = email_max_bytes_const();
+ var command_field_len = compute_ints_size(max_command_bytes);
+ var domain_len = domain_len_const();
+ var domain_field_len = compute_ints_size(domain_len);
+ var k2_chunked_size = k >> 1;
+ if(k % 2 == 1) {
+ k2_chunked_size += 1;
+ }
+ var timestamp_len = timestamp_len_const();
+ var code_len = invitation_code_len_const();
+
+ signal output domain_name[domain_field_len];
+ signal output public_key_hash;
+ signal output email_nullifier;
+ signal output timestamp;
+ signal output masked_command[command_field_len];
+ signal output account_salt;
+ signal output is_code_exist;
+
+ // Verify Email Signature
+ component email_verifier = EmailVerifier(max_header_bytes, max_body_bytes, n, k, 0, is_qp_encoded, 0);
+ email_verifier.emailHeader <== padded_header;
+ email_verifier.emailHeaderLength <== padded_header_len;
+ email_verifier.pubkey <== public_key;
+ email_verifier.signature <== signature;
+ email_verifier.bodyHashIndex <== body_hash_idx;
+ email_verifier.precomputedSHA <== precomputed_sha;
+ email_verifier.emailBody <== padded_body;
+ email_verifier.emailBodyLength <== padded_body_len;
+ if (is_qp_encoded == 1) {
+ email_verifier.decodedEmailBodyIn <== padded_cleaned_body;
+ }
+ public_key_hash <== email_verifier.pubkeyHash;
+
+ // FROM HEADER REGEX
+ signal from_regex_out, from_regex_reveal[max_header_bytes];
+ (from_regex_out, from_regex_reveal) <== FromAddrRegex(max_header_bytes)(padded_header);
+ from_regex_out === 1;
+ signal is_valid_from_addr_idx <== LessThan(log2Ceil(max_header_bytes))([from_addr_idx, max_header_bytes]);
+ is_valid_from_addr_idx === 1;
+ signal from_email_addr[email_max_bytes];
+ from_email_addr <== SelectRegexReveal(max_header_bytes, email_max_bytes)(from_regex_reveal, from_addr_idx);
+
+ // DOMAIN NAME HEADER REGEX
+ signal domain_regex_out, domain_regex_reveal[email_max_bytes];
+ (domain_regex_out, domain_regex_reveal) <== EmailDomainRegex(email_max_bytes)(from_email_addr);
+ domain_regex_out === 1;
+ signal is_valid_domain_idx <== LessThan(log2Ceil(email_max_bytes))([domain_idx, email_max_bytes]);
+ is_valid_domain_idx === 1;
+ signal domain_name_bytes[domain_len];
+ domain_name_bytes <== SelectRegexReveal(email_max_bytes, domain_len)(domain_regex_reveal, domain_idx);
+ domain_name <== Bytes2Ints(domain_len)(domain_name_bytes);
+
+ signal sign_hash;
+ signal sign_ints[k2_chunked_size];
+ (sign_hash, sign_ints) <== HashSign(n,k)(signature);
+ email_nullifier <== EmailNullifier()(sign_hash);
+
+ // Timestamp regex + convert to decimal format
+ signal timestamp_regex_out, timestamp_regex_reveal[max_header_bytes];
+ (timestamp_regex_out, timestamp_regex_reveal) <== TimestampRegex(max_header_bytes)(padded_header);
+ signal timestamp_str[timestamp_len];
+ signal is_valid_timestamp_idx <== LessThan(log2Ceil(max_header_bytes))([timestamp_idx, max_header_bytes]);
+ is_valid_timestamp_idx === 1;
+ timestamp_str <== SelectRegexReveal(max_header_bytes, timestamp_len)(timestamp_regex_reveal, timestamp_idx);
+ signal raw_timestamp <== Digit2Int(timestamp_len)(timestamp_str);
+ timestamp <== timestamp_regex_out * raw_timestamp;
+
+ // Extract the command from the body
+ signal command_regex_out, command_regex_reveal[max_body_bytes];
+ if (is_qp_encoded != 1) {
+ (command_regex_out, command_regex_reveal) <== CommandRegex(max_body_bytes)(padded_body);
+ } else {
+ (command_regex_out, command_regex_reveal) <== CommandRegex(max_body_bytes)(padded_cleaned_body);
+ }
+ command_regex_out === 1;
+ signal is_valid_command_idx <== LessThan(log2Ceil(max_command_bytes))([command_idx, max_command_bytes]);
+ is_valid_command_idx === 1;
+ signal command_all[max_command_bytes];
+ command_all <== SelectRegexReveal(max_body_bytes, max_command_bytes)(command_regex_reveal, command_idx);
+
+ signal prefixed_code_regex_out, prefixed_code_regex_reveal[max_command_bytes];
+ (prefixed_code_regex_out, prefixed_code_regex_reveal) <== InvitationCodeWithPrefixRegex(max_command_bytes)(command_all);
+ is_code_exist <== prefixed_code_regex_out;
+ signal removed_code[max_command_bytes];
+ for(var i = 0; i < max_command_bytes; i++) {
+ removed_code[i] <== is_code_exist * prefixed_code_regex_reveal[i];
+ }
+ signal command_email_addr_regex_out, command_email_addr_regex_reveal[max_command_bytes];
+ (command_email_addr_regex_out, command_email_addr_regex_reveal) <== EmailAddrRegex(max_command_bytes)(command_all);
+ signal is_command_email_addr_exist <== command_email_addr_regex_out;
+ signal removed_command_email_addr[max_command_bytes];
+ for(var i = 0; i < max_command_bytes; i++) {
+ removed_command_email_addr[i] <== is_command_email_addr_exist * command_email_addr_regex_reveal[i];
+ }
+ signal masked_command_bytes[max_command_bytes];
+ for(var i = 0; i < max_command_bytes; i++) {
+ masked_command_bytes[i] <== command_all[i] - removed_code[i] - removed_command_email_addr[i];
+ }
+ masked_command <== Bytes2Ints(max_command_bytes)(masked_command_bytes);
+
+ // INVITATION CODE REGEX
+ signal code_regex_out, code_regex_reveal[max_body_bytes];
+ if (is_qp_encoded != 1) {
+ (code_regex_out, code_regex_reveal) <== InvitationCodeRegex(max_body_bytes)(padded_body);
+ } else {
+ (code_regex_out, code_regex_reveal) <== InvitationCodeRegex(max_body_bytes)(padded_cleaned_body);
+ }
+ is_code_exist * (1 - code_regex_out) === 0;
+ signal replaced_code_regex_reveal[max_body_bytes];
+ for(var i=0; i]*>)"
},
{
"is_public": true,
- "regex_def": "[0-9]+"
+ "regex_def": "[^<>/]+"
},
{
"is_public": false,
- "regex_def": "."
+ "regex_def": "
"
}
]
}
diff --git a/packages/circuits/src/regexes/command_regex.circom b/packages/circuits/src/regexes/command_regex.circom
new file mode 100644
index 00000000..3c4de75f
--- /dev/null
+++ b/packages/circuits/src/regexes/command_regex.circom
@@ -0,0 +1,1365 @@
+pragma circom 2.1.5;
+
+include "@zk-email/zk-regex-circom/circuits/regex_helpers.circom";
+
+// regex: (]*>)[^<>/]+
+template CommandRegex(msg_bytes) {
+ signal input msg[msg_bytes];
+ signal output out;
+
+ var num_bytes = msg_bytes+1;
+ signal in[num_bytes];
+ in[0]<==255;
+ for (var i = 0; i < msg_bytes; i++) {
+ in[i+1] <== msg[i];
+ }
+
+ component eq[82][num_bytes];
+ component lt[38][num_bytes];
+ component and[167][num_bytes];
+ component multi_or[36][num_bytes];
+ signal states[num_bytes+1][56];
+ signal states_tmp[num_bytes+1][56];
+ signal from_zero_enabled[num_bytes+1];
+ from_zero_enabled[num_bytes] <== 0;
+ component state_changed[num_bytes];
+
+ for (var i = 1; i < 56; i++) {
+ states[0][i] <== 0;
+ }
+
+ for (var i = 0; i < num_bytes; i++) {
+ state_changed[i] = MultiOR(55);
+ states[i][0] <== 1;
+ eq[0][i] = IsEqual();
+ eq[0][i].in[0] <== in[i];
+ eq[0][i].in[1] <== 60;
+ and[0][i] = AND();
+ and[0][i].a <== states[i][0];
+ and[0][i].b <== eq[0][i].out;
+ states_tmp[i+1][1] <== 0;
+ eq[1][i] = IsEqual();
+ eq[1][i].in[0] <== in[i];
+ eq[1][i].in[1] <== 100;
+ and[1][i] = AND();
+ and[1][i].a <== states[i][1];
+ and[1][i].b <== eq[1][i].out;
+ states[i+1][2] <== and[1][i].out;
+ eq[2][i] = IsEqual();
+ eq[2][i].in[0] <== in[i];
+ eq[2][i].in[1] <== 105;
+ and[2][i] = AND();
+ and[2][i].a <== states[i][2];
+ and[2][i].b <== eq[2][i].out;
+ states[i+1][3] <== and[2][i].out;
+ eq[3][i] = IsEqual();
+ eq[3][i].in[0] <== in[i];
+ eq[3][i].in[1] <== 118;
+ and[3][i] = AND();
+ and[3][i].a <== states[i][3];
+ and[3][i].b <== eq[3][i].out;
+ states[i+1][4] <== and[3][i].out;
+ eq[4][i] = IsEqual();
+ eq[4][i].in[0] <== in[i];
+ eq[4][i].in[1] <== 32;
+ and[4][i] = AND();
+ and[4][i].a <== states[i][4];
+ and[4][i].b <== eq[4][i].out;
+ states[i+1][5] <== and[4][i].out;
+ and[5][i] = AND();
+ and[5][i].a <== states[i][5];
+ and[5][i].b <== eq[2][i].out;
+ states[i+1][6] <== and[5][i].out;
+ and[6][i] = AND();
+ and[6][i].a <== states[i][6];
+ and[6][i].b <== eq[1][i].out;
+ states[i+1][7] <== and[6][i].out;
+ eq[5][i] = IsEqual();
+ eq[5][i].in[0] <== in[i];
+ eq[5][i].in[1] <== 61;
+ and[7][i] = AND();
+ and[7][i].a <== states[i][7];
+ and[7][i].b <== eq[5][i].out;
+ states[i+1][8] <== and[7][i].out;
+ eq[6][i] = IsEqual();
+ eq[6][i].in[0] <== in[i];
+ eq[6][i].in[1] <== 51;
+ and[8][i] = AND();
+ and[8][i].a <== states[i][8];
+ and[8][i].b <== eq[6][i].out;
+ states[i+1][9] <== and[8][i].out;
+ eq[7][i] = IsEqual();
+ eq[7][i].in[0] <== in[i];
+ eq[7][i].in[1] <== 68;
+ and[9][i] = AND();
+ and[9][i].a <== states[i][9];
+ and[9][i].b <== eq[7][i].out;
+ states[i+1][10] <== and[9][i].out;
+ eq[8][i] = IsEqual();
+ eq[8][i].in[0] <== in[i];
+ eq[8][i].in[1] <== 34;
+ and[10][i] = AND();
+ and[10][i].a <== states[i][10];
+ and[10][i].b <== eq[8][i].out;
+ lt[0][i] = LessEqThan(8);
+ lt[0][i].in[0] <== 1;
+ lt[0][i].in[1] <== in[i];
+ lt[1][i] = LessEqThan(8);
+ lt[1][i].in[0] <== in[i];
+ lt[1][i].in[1] <== 33;
+ and[11][i] = AND();
+ and[11][i].a <== lt[0][i].out;
+ and[11][i].b <== lt[1][i].out;
+ lt[2][i] = LessEqThan(8);
+ lt[2][i].in[0] <== 35;
+ lt[2][i].in[1] <== in[i];
+ lt[3][i] = LessEqThan(8);
+ lt[3][i].in[0] <== in[i];
+ lt[3][i].in[1] <== 121;
+ and[12][i] = AND();
+ and[12][i].a <== lt[2][i].out;
+ and[12][i].b <== lt[3][i].out;
+ eq[9][i] = IsEqual();
+ eq[9][i].in[0] <== in[i];
+ eq[9][i].in[1] <== 123;
+ eq[10][i] = IsEqual();
+ eq[10][i].in[0] <== in[i];
+ eq[10][i].in[1] <== 124;
+ eq[11][i] = IsEqual();
+ eq[11][i].in[0] <== in[i];
+ eq[11][i].in[1] <== 125;
+ eq[12][i] = IsEqual();
+ eq[12][i].in[0] <== in[i];
+ eq[12][i].in[1] <== 126;
+ eq[13][i] = IsEqual();
+ eq[13][i].in[0] <== in[i];
+ eq[13][i].in[1] <== 127;
+ and[13][i] = AND();
+ and[13][i].a <== states[i][11];
+ multi_or[0][i] = MultiOR(7);
+ multi_or[0][i].in[0] <== and[11][i].out;
+ multi_or[0][i].in[1] <== and[12][i].out;
+ multi_or[0][i].in[2] <== eq[9][i].out;
+ multi_or[0][i].in[3] <== eq[10][i].out;
+ multi_or[0][i].in[4] <== eq[11][i].out;
+ multi_or[0][i].in[5] <== eq[12][i].out;
+ multi_or[0][i].in[6] <== eq[13][i].out;
+ and[13][i].b <== multi_or[0][i].out;
+ lt[4][i] = LessEqThan(8);
+ lt[4][i].in[0] <== 128;
+ lt[4][i].in[1] <== in[i];
+ lt[5][i] = LessEqThan(8);
+ lt[5][i].in[0] <== in[i];
+ lt[5][i].in[1] <== 191;
+ and[14][i] = AND();
+ and[14][i].a <== lt[4][i].out;
+ and[14][i].b <== lt[5][i].out;
+ and[15][i] = AND();
+ and[15][i].a <== states[i][12];
+ and[15][i].b <== and[14][i].out;
+ lt[6][i] = LessEqThan(8);
+ lt[6][i].in[0] <== 35;
+ lt[6][i].in[1] <== in[i];
+ lt[7][i] = LessEqThan(8);
+ lt[7][i].in[0] <== in[i];
+ lt[7][i].in[1] <== 106;
+ and[16][i] = AND();
+ and[16][i].a <== lt[6][i].out;
+ and[16][i].b <== lt[7][i].out;
+ eq[14][i] = IsEqual();
+ eq[14][i].in[0] <== in[i];
+ eq[14][i].in[1] <== 108;
+ eq[15][i] = IsEqual();
+ eq[15][i].in[0] <== in[i];
+ eq[15][i].in[1] <== 109;
+ eq[16][i] = IsEqual();
+ eq[16][i].in[0] <== in[i];
+ eq[16][i].in[1] <== 110;
+ eq[17][i] = IsEqual();
+ eq[17][i].in[0] <== in[i];
+ eq[17][i].in[1] <== 111;
+ eq[18][i] = IsEqual();
+ eq[18][i].in[0] <== in[i];
+ eq[18][i].in[1] <== 112;
+ eq[19][i] = IsEqual();
+ eq[19][i].in[0] <== in[i];
+ eq[19][i].in[1] <== 113;
+ eq[20][i] = IsEqual();
+ eq[20][i].in[0] <== in[i];
+ eq[20][i].in[1] <== 114;
+ eq[21][i] = IsEqual();
+ eq[21][i].in[0] <== in[i];
+ eq[21][i].in[1] <== 115;
+ eq[22][i] = IsEqual();
+ eq[22][i].in[0] <== in[i];
+ eq[22][i].in[1] <== 116;
+ eq[23][i] = IsEqual();
+ eq[23][i].in[0] <== in[i];
+ eq[23][i].in[1] <== 117;
+ eq[24][i] = IsEqual();
+ eq[24][i].in[0] <== in[i];
+ eq[24][i].in[1] <== 119;
+ eq[25][i] = IsEqual();
+ eq[25][i].in[0] <== in[i];
+ eq[25][i].in[1] <== 120;
+ eq[26][i] = IsEqual();
+ eq[26][i].in[0] <== in[i];
+ eq[26][i].in[1] <== 121;
+ and[17][i] = AND();
+ and[17][i].a <== states[i][19];
+ multi_or[1][i] = MultiOR(21);
+ multi_or[1][i].in[0] <== and[11][i].out;
+ multi_or[1][i].in[1] <== and[16][i].out;
+ multi_or[1][i].in[2] <== eq[14][i].out;
+ multi_or[1][i].in[3] <== eq[15][i].out;
+ multi_or[1][i].in[4] <== eq[16][i].out;
+ multi_or[1][i].in[5] <== eq[17][i].out;
+ multi_or[1][i].in[6] <== eq[18][i].out;
+ multi_or[1][i].in[7] <== eq[19][i].out;
+ multi_or[1][i].in[8] <== eq[20][i].out;
+ multi_or[1][i].in[9] <== eq[21][i].out;
+ multi_or[1][i].in[10] <== eq[22][i].out;
+ multi_or[1][i].in[11] <== eq[23][i].out;
+ multi_or[1][i].in[12] <== eq[3][i].out;
+ multi_or[1][i].in[13] <== eq[24][i].out;
+ multi_or[1][i].in[14] <== eq[25][i].out;
+ multi_or[1][i].in[15] <== eq[26][i].out;
+ multi_or[1][i].in[16] <== eq[9][i].out;
+ multi_or[1][i].in[17] <== eq[10][i].out;
+ multi_or[1][i].in[18] <== eq[11][i].out;
+ multi_or[1][i].in[19] <== eq[12][i].out;
+ multi_or[1][i].in[20] <== eq[13][i].out;
+ and[17][i].b <== multi_or[1][i].out;
+ lt[8][i] = LessEqThan(8);
+ lt[8][i].in[0] <== 35;
+ lt[8][i].in[1] <== in[i];
+ lt[9][i] = LessEqThan(8);
+ lt[9][i].in[0] <== in[i];
+ lt[9][i].in[1] <== 100;
+ and[18][i] = AND();
+ and[18][i].a <== lt[8][i].out;
+ and[18][i].b <== lt[9][i].out;
+ lt[10][i] = LessEqThan(8);
+ lt[10][i].in[0] <== 102;
+ lt[10][i].in[1] <== in[i];
+ lt[11][i] = LessEqThan(8);
+ lt[11][i].in[0] <== in[i];
+ lt[11][i].in[1] <== 121;
+ and[19][i] = AND();
+ and[19][i].a <== lt[10][i].out;
+ and[19][i].b <== lt[11][i].out;
+ and[20][i] = AND();
+ and[20][i].a <== states[i][20];
+ multi_or[2][i] = MultiOR(8);
+ multi_or[2][i].in[0] <== and[11][i].out;
+ multi_or[2][i].in[1] <== and[18][i].out;
+ multi_or[2][i].in[2] <== and[19][i].out;
+ multi_or[2][i].in[3] <== eq[9][i].out;
+ multi_or[2][i].in[4] <== eq[10][i].out;
+ multi_or[2][i].in[5] <== eq[11][i].out;
+ multi_or[2][i].in[6] <== eq[12][i].out;
+ multi_or[2][i].in[7] <== eq[13][i].out;
+ and[20][i].b <== multi_or[2][i].out;
+ lt[12][i] = LessEqThan(8);
+ lt[12][i].in[0] <== 35;
+ lt[12][i].in[1] <== in[i];
+ lt[13][i] = LessEqThan(8);
+ lt[13][i].in[0] <== in[i];
+ lt[13][i].in[1] <== 108;
+ and[21][i] = AND();
+ and[21][i].a <== lt[12][i].out;
+ and[21][i].b <== lt[13][i].out;
+ and[22][i] = AND();
+ and[22][i].a <== states[i][21];
+ multi_or[3][i] = MultiOR(19);
+ multi_or[3][i].in[0] <== and[11][i].out;
+ multi_or[3][i].in[1] <== and[21][i].out;
+ multi_or[3][i].in[2] <== eq[16][i].out;
+ multi_or[3][i].in[3] <== eq[17][i].out;
+ multi_or[3][i].in[4] <== eq[18][i].out;
+ multi_or[3][i].in[5] <== eq[19][i].out;
+ multi_or[3][i].in[6] <== eq[20][i].out;
+ multi_or[3][i].in[7] <== eq[21][i].out;
+ multi_or[3][i].in[8] <== eq[22][i].out;
+ multi_or[3][i].in[9] <== eq[23][i].out;
+ multi_or[3][i].in[10] <== eq[3][i].out;
+ multi_or[3][i].in[11] <== eq[24][i].out;
+ multi_or[3][i].in[12] <== eq[25][i].out;
+ multi_or[3][i].in[13] <== eq[26][i].out;
+ multi_or[3][i].in[14] <== eq[9][i].out;
+ multi_or[3][i].in[15] <== eq[10][i].out;
+ multi_or[3][i].in[16] <== eq[11][i].out;
+ multi_or[3][i].in[17] <== eq[12][i].out;
+ multi_or[3][i].in[18] <== eq[13][i].out;
+ and[22][i].b <== multi_or[3][i].out;
+ lt[14][i] = LessEqThan(8);
+ lt[14][i].in[0] <== 35;
+ lt[14][i].in[1] <== in[i];
+ lt[15][i] = LessEqThan(8);
+ lt[15][i].in[0] <== in[i];
+ lt[15][i].in[1] <== 96;
+ and[23][i] = AND();
+ and[23][i].a <== lt[14][i].out;
+ and[23][i].b <== lt[15][i].out;
+ lt[16][i] = LessEqThan(8);
+ lt[16][i].in[0] <== 98;
+ lt[16][i].in[1] <== in[i];
+ lt[17][i] = LessEqThan(8);
+ lt[17][i].in[0] <== in[i];
+ lt[17][i].in[1] <== 121;
+ and[24][i] = AND();
+ and[24][i].a <== lt[16][i].out;
+ and[24][i].b <== lt[17][i].out;
+ and[25][i] = AND();
+ and[25][i].a <== states[i][22];
+ multi_or[4][i] = MultiOR(8);
+ multi_or[4][i].in[0] <== and[11][i].out;
+ multi_or[4][i].in[1] <== and[23][i].out;
+ multi_or[4][i].in[2] <== and[24][i].out;
+ multi_or[4][i].in[3] <== eq[9][i].out;
+ multi_or[4][i].in[4] <== eq[10][i].out;
+ multi_or[4][i].in[5] <== eq[11][i].out;
+ multi_or[4][i].in[6] <== eq[12][i].out;
+ multi_or[4][i].in[7] <== eq[13][i].out;
+ and[25][i].b <== multi_or[4][i].out;
+ lt[18][i] = LessEqThan(8);
+ lt[18][i].in[0] <== 35;
+ lt[18][i].in[1] <== in[i];
+ lt[19][i] = LessEqThan(8);
+ lt[19][i].in[0] <== in[i];
+ lt[19][i].in[1] <== 104;
+ and[26][i] = AND();
+ and[26][i].a <== lt[18][i].out;
+ and[26][i].b <== lt[19][i].out;
+ eq[27][i] = IsEqual();
+ eq[27][i].in[0] <== in[i];
+ eq[27][i].in[1] <== 106;
+ eq[28][i] = IsEqual();
+ eq[28][i].in[0] <== in[i];
+ eq[28][i].in[1] <== 107;
+ and[27][i] = AND();
+ and[27][i].a <== states[i][23];
+ multi_or[5][i] = MultiOR(23);
+ multi_or[5][i].in[0] <== and[11][i].out;
+ multi_or[5][i].in[1] <== and[26][i].out;
+ multi_or[5][i].in[2] <== eq[27][i].out;
+ multi_or[5][i].in[3] <== eq[28][i].out;
+ multi_or[5][i].in[4] <== eq[14][i].out;
+ multi_or[5][i].in[5] <== eq[15][i].out;
+ multi_or[5][i].in[6] <== eq[16][i].out;
+ multi_or[5][i].in[7] <== eq[17][i].out;
+ multi_or[5][i].in[8] <== eq[18][i].out;
+ multi_or[5][i].in[9] <== eq[19][i].out;
+ multi_or[5][i].in[10] <== eq[20][i].out;
+ multi_or[5][i].in[11] <== eq[21][i].out;
+ multi_or[5][i].in[12] <== eq[22][i].out;
+ multi_or[5][i].in[13] <== eq[23][i].out;
+ multi_or[5][i].in[14] <== eq[3][i].out;
+ multi_or[5][i].in[15] <== eq[24][i].out;
+ multi_or[5][i].in[16] <== eq[25][i].out;
+ multi_or[5][i].in[17] <== eq[26][i].out;
+ multi_or[5][i].in[18] <== eq[9][i].out;
+ multi_or[5][i].in[19] <== eq[10][i].out;
+ multi_or[5][i].in[20] <== eq[11][i].out;
+ multi_or[5][i].in[21] <== eq[12][i].out;
+ multi_or[5][i].in[22] <== eq[13][i].out;
+ and[27][i].b <== multi_or[5][i].out;
+ lt[20][i] = LessEqThan(8);
+ lt[20][i].in[0] <== 35;
+ lt[20][i].in[1] <== in[i];
+ lt[21][i] = LessEqThan(8);
+ lt[21][i].in[0] <== in[i];
+ lt[21][i].in[1] <== 107;
+ and[28][i] = AND();
+ and[28][i].a <== lt[20][i].out;
+ and[28][i].b <== lt[21][i].out;
+ and[29][i] = AND();
+ and[29][i].a <== states[i][24];
+ multi_or[6][i] = MultiOR(20);
+ multi_or[6][i].in[0] <== and[11][i].out;
+ multi_or[6][i].in[1] <== and[28][i].out;
+ multi_or[6][i].in[2] <== eq[15][i].out;
+ multi_or[6][i].in[3] <== eq[16][i].out;
+ multi_or[6][i].in[4] <== eq[17][i].out;
+ multi_or[6][i].in[5] <== eq[18][i].out;
+ multi_or[6][i].in[6] <== eq[19][i].out;
+ multi_or[6][i].in[7] <== eq[20][i].out;
+ multi_or[6][i].in[8] <== eq[21][i].out;
+ multi_or[6][i].in[9] <== eq[22][i].out;
+ multi_or[6][i].in[10] <== eq[23][i].out;
+ multi_or[6][i].in[11] <== eq[3][i].out;
+ multi_or[6][i].in[12] <== eq[24][i].out;
+ multi_or[6][i].in[13] <== eq[25][i].out;
+ multi_or[6][i].in[14] <== eq[26][i].out;
+ multi_or[6][i].in[15] <== eq[9][i].out;
+ multi_or[6][i].in[16] <== eq[10][i].out;
+ multi_or[6][i].in[17] <== eq[11][i].out;
+ multi_or[6][i].in[18] <== eq[12][i].out;
+ multi_or[6][i].in[19] <== eq[13][i].out;
+ and[29][i].b <== multi_or[6][i].out;
+ multi_or[7][i] = MultiOR(9);
+ multi_or[7][i].in[0] <== and[10][i].out;
+ multi_or[7][i].in[1] <== and[13][i].out;
+ multi_or[7][i].in[2] <== and[15][i].out;
+ multi_or[7][i].in[3] <== and[17][i].out;
+ multi_or[7][i].in[4] <== and[20][i].out;
+ multi_or[7][i].in[5] <== and[22][i].out;
+ multi_or[7][i].in[6] <== and[25][i].out;
+ multi_or[7][i].in[7] <== and[27][i].out;
+ multi_or[7][i].in[8] <== and[29][i].out;
+ states[i+1][11] <== multi_or[7][i].out;
+ lt[22][i] = LessEqThan(8);
+ lt[22][i].in[0] <== 194;
+ lt[22][i].in[1] <== in[i];
+ lt[23][i] = LessEqThan(8);
+ lt[23][i].in[0] <== in[i];
+ lt[23][i].in[1] <== 223;
+ and[30][i] = AND();
+ and[30][i].a <== lt[22][i].out;
+ and[30][i].b <== lt[23][i].out;
+ and[31][i] = AND();
+ and[31][i].a <== states[i][11];
+ and[31][i].b <== and[30][i].out;
+ lt[24][i] = LessEqThan(8);
+ lt[24][i].in[0] <== 160;
+ lt[24][i].in[1] <== in[i];
+ lt[25][i] = LessEqThan(8);
+ lt[25][i].in[0] <== in[i];
+ lt[25][i].in[1] <== 191;
+ and[32][i] = AND();
+ and[32][i].a <== lt[24][i].out;
+ and[32][i].b <== lt[25][i].out;
+ and[33][i] = AND();
+ and[33][i].a <== states[i][13];
+ and[33][i].b <== and[32][i].out;
+ and[34][i] = AND();
+ and[34][i].a <== states[i][14];
+ and[34][i].b <== and[14][i].out;
+ lt[26][i] = LessEqThan(8);
+ lt[26][i].in[0] <== 128;
+ lt[26][i].in[1] <== in[i];
+ lt[27][i] = LessEqThan(8);
+ lt[27][i].in[0] <== in[i];
+ lt[27][i].in[1] <== 159;
+ and[35][i] = AND();
+ and[35][i].a <== lt[26][i].out;
+ and[35][i].b <== lt[27][i].out;
+ and[36][i] = AND();
+ and[36][i].a <== states[i][15];
+ and[36][i].b <== and[35][i].out;
+ and[37][i] = AND();
+ and[37][i].a <== states[i][19];
+ and[37][i].b <== and[30][i].out;
+ and[38][i] = AND();
+ and[38][i].a <== states[i][20];
+ and[38][i].b <== and[30][i].out;
+ and[39][i] = AND();
+ and[39][i].a <== states[i][21];
+ and[39][i].b <== and[30][i].out;
+ and[40][i] = AND();
+ and[40][i].a <== states[i][22];
+ and[40][i].b <== and[30][i].out;
+ and[41][i] = AND();
+ and[41][i].a <== states[i][23];
+ and[41][i].b <== and[30][i].out;
+ and[42][i] = AND();
+ and[42][i].a <== states[i][24];
+ and[42][i].b <== and[30][i].out;
+ multi_or[8][i] = MultiOR(10);
+ multi_or[8][i].in[0] <== and[31][i].out;
+ multi_or[8][i].in[1] <== and[33][i].out;
+ multi_or[8][i].in[2] <== and[34][i].out;
+ multi_or[8][i].in[3] <== and[36][i].out;
+ multi_or[8][i].in[4] <== and[37][i].out;
+ multi_or[8][i].in[5] <== and[38][i].out;
+ multi_or[8][i].in[6] <== and[39][i].out;
+ multi_or[8][i].in[7] <== and[40][i].out;
+ multi_or[8][i].in[8] <== and[41][i].out;
+ multi_or[8][i].in[9] <== and[42][i].out;
+ states[i+1][12] <== multi_or[8][i].out;
+ eq[29][i] = IsEqual();
+ eq[29][i].in[0] <== in[i];
+ eq[29][i].in[1] <== 224;
+ and[43][i] = AND();
+ and[43][i].a <== states[i][11];
+ and[43][i].b <== eq[29][i].out;
+ and[44][i] = AND();
+ and[44][i].a <== states[i][19];
+ and[44][i].b <== eq[29][i].out;
+ and[45][i] = AND();
+ and[45][i].a <== states[i][20];
+ and[45][i].b <== eq[29][i].out;
+ and[46][i] = AND();
+ and[46][i].a <== states[i][21];
+ and[46][i].b <== eq[29][i].out;
+ and[47][i] = AND();
+ and[47][i].a <== states[i][22];
+ and[47][i].b <== eq[29][i].out;
+ and[48][i] = AND();
+ and[48][i].a <== states[i][23];
+ and[48][i].b <== eq[29][i].out;
+ and[49][i] = AND();
+ and[49][i].a <== states[i][24];
+ and[49][i].b <== eq[29][i].out;
+ multi_or[9][i] = MultiOR(7);
+ multi_or[9][i].in[0] <== and[43][i].out;
+ multi_or[9][i].in[1] <== and[44][i].out;
+ multi_or[9][i].in[2] <== and[45][i].out;
+ multi_or[9][i].in[3] <== and[46][i].out;
+ multi_or[9][i].in[4] <== and[47][i].out;
+ multi_or[9][i].in[5] <== and[48][i].out;
+ multi_or[9][i].in[6] <== and[49][i].out;
+ states[i+1][13] <== multi_or[9][i].out;
+ eq[30][i] = IsEqual();
+ eq[30][i].in[0] <== in[i];
+ eq[30][i].in[1] <== 225;
+ eq[31][i] = IsEqual();
+ eq[31][i].in[0] <== in[i];
+ eq[31][i].in[1] <== 226;
+ eq[32][i] = IsEqual();
+ eq[32][i].in[0] <== in[i];
+ eq[32][i].in[1] <== 227;
+ eq[33][i] = IsEqual();
+ eq[33][i].in[0] <== in[i];
+ eq[33][i].in[1] <== 228;
+ eq[34][i] = IsEqual();
+ eq[34][i].in[0] <== in[i];
+ eq[34][i].in[1] <== 229;
+ eq[35][i] = IsEqual();
+ eq[35][i].in[0] <== in[i];
+ eq[35][i].in[1] <== 230;
+ eq[36][i] = IsEqual();
+ eq[36][i].in[0] <== in[i];
+ eq[36][i].in[1] <== 231;
+ eq[37][i] = IsEqual();
+ eq[37][i].in[0] <== in[i];
+ eq[37][i].in[1] <== 232;
+ eq[38][i] = IsEqual();
+ eq[38][i].in[0] <== in[i];
+ eq[38][i].in[1] <== 233;
+ eq[39][i] = IsEqual();
+ eq[39][i].in[0] <== in[i];
+ eq[39][i].in[1] <== 234;
+ eq[40][i] = IsEqual();
+ eq[40][i].in[0] <== in[i];
+ eq[40][i].in[1] <== 235;
+ eq[41][i] = IsEqual();
+ eq[41][i].in[0] <== in[i];
+ eq[41][i].in[1] <== 236;
+ eq[42][i] = IsEqual();
+ eq[42][i].in[0] <== in[i];
+ eq[42][i].in[1] <== 238;
+ eq[43][i] = IsEqual();
+ eq[43][i].in[0] <== in[i];
+ eq[43][i].in[1] <== 239;
+ and[50][i] = AND();
+ and[50][i].a <== states[i][11];
+ multi_or[10][i] = MultiOR(14);
+ multi_or[10][i].in[0] <== eq[30][i].out;
+ multi_or[10][i].in[1] <== eq[31][i].out;
+ multi_or[10][i].in[2] <== eq[32][i].out;
+ multi_or[10][i].in[3] <== eq[33][i].out;
+ multi_or[10][i].in[4] <== eq[34][i].out;
+ multi_or[10][i].in[5] <== eq[35][i].out;
+ multi_or[10][i].in[6] <== eq[36][i].out;
+ multi_or[10][i].in[7] <== eq[37][i].out;
+ multi_or[10][i].in[8] <== eq[38][i].out;
+ multi_or[10][i].in[9] <== eq[39][i].out;
+ multi_or[10][i].in[10] <== eq[40][i].out;
+ multi_or[10][i].in[11] <== eq[41][i].out;
+ multi_or[10][i].in[12] <== eq[42][i].out;
+ multi_or[10][i].in[13] <== eq[43][i].out;
+ and[50][i].b <== multi_or[10][i].out;
+ lt[28][i] = LessEqThan(8);
+ lt[28][i].in[0] <== 144;
+ lt[28][i].in[1] <== in[i];
+ lt[29][i] = LessEqThan(8);
+ lt[29][i].in[0] <== in[i];
+ lt[29][i].in[1] <== 191;
+ and[51][i] = AND();
+ and[51][i].a <== lt[28][i].out;
+ and[51][i].b <== lt[29][i].out;
+ and[52][i] = AND();
+ and[52][i].a <== states[i][16];
+ and[52][i].b <== and[51][i].out;
+ and[53][i] = AND();
+ and[53][i].a <== states[i][17];
+ and[53][i].b <== and[14][i].out;
+ eq[44][i] = IsEqual();
+ eq[44][i].in[0] <== in[i];
+ eq[44][i].in[1] <== 128;
+ eq[45][i] = IsEqual();
+ eq[45][i].in[0] <== in[i];
+ eq[45][i].in[1] <== 129;
+ eq[46][i] = IsEqual();
+ eq[46][i].in[0] <== in[i];
+ eq[46][i].in[1] <== 130;
+ eq[47][i] = IsEqual();
+ eq[47][i].in[0] <== in[i];
+ eq[47][i].in[1] <== 131;
+ eq[48][i] = IsEqual();
+ eq[48][i].in[0] <== in[i];
+ eq[48][i].in[1] <== 132;
+ eq[49][i] = IsEqual();
+ eq[49][i].in[0] <== in[i];
+ eq[49][i].in[1] <== 133;
+ eq[50][i] = IsEqual();
+ eq[50][i].in[0] <== in[i];
+ eq[50][i].in[1] <== 134;
+ eq[51][i] = IsEqual();
+ eq[51][i].in[0] <== in[i];
+ eq[51][i].in[1] <== 135;
+ eq[52][i] = IsEqual();
+ eq[52][i].in[0] <== in[i];
+ eq[52][i].in[1] <== 136;
+ eq[53][i] = IsEqual();
+ eq[53][i].in[0] <== in[i];
+ eq[53][i].in[1] <== 137;
+ eq[54][i] = IsEqual();
+ eq[54][i].in[0] <== in[i];
+ eq[54][i].in[1] <== 138;
+ eq[55][i] = IsEqual();
+ eq[55][i].in[0] <== in[i];
+ eq[55][i].in[1] <== 139;
+ eq[56][i] = IsEqual();
+ eq[56][i].in[0] <== in[i];
+ eq[56][i].in[1] <== 140;
+ eq[57][i] = IsEqual();
+ eq[57][i].in[0] <== in[i];
+ eq[57][i].in[1] <== 141;
+ eq[58][i] = IsEqual();
+ eq[58][i].in[0] <== in[i];
+ eq[58][i].in[1] <== 142;
+ eq[59][i] = IsEqual();
+ eq[59][i].in[0] <== in[i];
+ eq[59][i].in[1] <== 143;
+ and[54][i] = AND();
+ and[54][i].a <== states[i][18];
+ multi_or[11][i] = MultiOR(16);
+ multi_or[11][i].in[0] <== eq[44][i].out;
+ multi_or[11][i].in[1] <== eq[45][i].out;
+ multi_or[11][i].in[2] <== eq[46][i].out;
+ multi_or[11][i].in[3] <== eq[47][i].out;
+ multi_or[11][i].in[4] <== eq[48][i].out;
+ multi_or[11][i].in[5] <== eq[49][i].out;
+ multi_or[11][i].in[6] <== eq[50][i].out;
+ multi_or[11][i].in[7] <== eq[51][i].out;
+ multi_or[11][i].in[8] <== eq[52][i].out;
+ multi_or[11][i].in[9] <== eq[53][i].out;
+ multi_or[11][i].in[10] <== eq[54][i].out;
+ multi_or[11][i].in[11] <== eq[55][i].out;
+ multi_or[11][i].in[12] <== eq[56][i].out;
+ multi_or[11][i].in[13] <== eq[57][i].out;
+ multi_or[11][i].in[14] <== eq[58][i].out;
+ multi_or[11][i].in[15] <== eq[59][i].out;
+ and[54][i].b <== multi_or[11][i].out;
+ and[55][i] = AND();
+ and[55][i].a <== states[i][19];
+ and[55][i].b <== multi_or[10][i].out;
+ and[56][i] = AND();
+ and[56][i].a <== states[i][20];
+ and[56][i].b <== multi_or[10][i].out;
+ and[57][i] = AND();
+ and[57][i].a <== states[i][21];
+ and[57][i].b <== multi_or[10][i].out;
+ and[58][i] = AND();
+ and[58][i].a <== states[i][22];
+ and[58][i].b <== multi_or[10][i].out;
+ and[59][i] = AND();
+ and[59][i].a <== states[i][23];
+ and[59][i].b <== multi_or[10][i].out;
+ and[60][i] = AND();
+ and[60][i].a <== states[i][24];
+ and[60][i].b <== multi_or[10][i].out;
+ multi_or[12][i] = MultiOR(10);
+ multi_or[12][i].in[0] <== and[50][i].out;
+ multi_or[12][i].in[1] <== and[52][i].out;
+ multi_or[12][i].in[2] <== and[53][i].out;
+ multi_or[12][i].in[3] <== and[54][i].out;
+ multi_or[12][i].in[4] <== and[55][i].out;
+ multi_or[12][i].in[5] <== and[56][i].out;
+ multi_or[12][i].in[6] <== and[57][i].out;
+ multi_or[12][i].in[7] <== and[58][i].out;
+ multi_or[12][i].in[8] <== and[59][i].out;
+ multi_or[12][i].in[9] <== and[60][i].out;
+ states[i+1][14] <== multi_or[12][i].out;
+ eq[60][i] = IsEqual();
+ eq[60][i].in[0] <== in[i];
+ eq[60][i].in[1] <== 237;
+ and[61][i] = AND();
+ and[61][i].a <== states[i][11];
+ and[61][i].b <== eq[60][i].out;
+ and[62][i] = AND();
+ and[62][i].a <== states[i][19];
+ and[62][i].b <== eq[60][i].out;
+ and[63][i] = AND();
+ and[63][i].a <== states[i][20];
+ and[63][i].b <== eq[60][i].out;
+ and[64][i] = AND();
+ and[64][i].a <== states[i][21];
+ and[64][i].b <== eq[60][i].out;
+ and[65][i] = AND();
+ and[65][i].a <== states[i][22];
+ and[65][i].b <== eq[60][i].out;
+ and[66][i] = AND();
+ and[66][i].a <== states[i][23];
+ and[66][i].b <== eq[60][i].out;
+ and[67][i] = AND();
+ and[67][i].a <== states[i][24];
+ and[67][i].b <== eq[60][i].out;
+ multi_or[13][i] = MultiOR(7);
+ multi_or[13][i].in[0] <== and[61][i].out;
+ multi_or[13][i].in[1] <== and[62][i].out;
+ multi_or[13][i].in[2] <== and[63][i].out;
+ multi_or[13][i].in[3] <== and[64][i].out;
+ multi_or[13][i].in[4] <== and[65][i].out;
+ multi_or[13][i].in[5] <== and[66][i].out;
+ multi_or[13][i].in[6] <== and[67][i].out;
+ states[i+1][15] <== multi_or[13][i].out;
+ eq[61][i] = IsEqual();
+ eq[61][i].in[0] <== in[i];
+ eq[61][i].in[1] <== 240;
+ and[68][i] = AND();
+ and[68][i].a <== states[i][11];
+ and[68][i].b <== eq[61][i].out;
+ and[69][i] = AND();
+ and[69][i].a <== states[i][19];
+ and[69][i].b <== eq[61][i].out;
+ and[70][i] = AND();
+ and[70][i].a <== states[i][20];
+ and[70][i].b <== eq[61][i].out;
+ and[71][i] = AND();
+ and[71][i].a <== states[i][21];
+ and[71][i].b <== eq[61][i].out;
+ and[72][i] = AND();
+ and[72][i].a <== states[i][22];
+ and[72][i].b <== eq[61][i].out;
+ and[73][i] = AND();
+ and[73][i].a <== states[i][23];
+ and[73][i].b <== eq[61][i].out;
+ and[74][i] = AND();
+ and[74][i].a <== states[i][24];
+ and[74][i].b <== eq[61][i].out;
+ multi_or[14][i] = MultiOR(7);
+ multi_or[14][i].in[0] <== and[68][i].out;
+ multi_or[14][i].in[1] <== and[69][i].out;
+ multi_or[14][i].in[2] <== and[70][i].out;
+ multi_or[14][i].in[3] <== and[71][i].out;
+ multi_or[14][i].in[4] <== and[72][i].out;
+ multi_or[14][i].in[5] <== and[73][i].out;
+ multi_or[14][i].in[6] <== and[74][i].out;
+ states[i+1][16] <== multi_or[14][i].out;
+ eq[62][i] = IsEqual();
+ eq[62][i].in[0] <== in[i];
+ eq[62][i].in[1] <== 241;
+ eq[63][i] = IsEqual();
+ eq[63][i].in[0] <== in[i];
+ eq[63][i].in[1] <== 242;
+ eq[64][i] = IsEqual();
+ eq[64][i].in[0] <== in[i];
+ eq[64][i].in[1] <== 243;
+ and[75][i] = AND();
+ and[75][i].a <== states[i][11];
+ multi_or[15][i] = MultiOR(3);
+ multi_or[15][i].in[0] <== eq[62][i].out;
+ multi_or[15][i].in[1] <== eq[63][i].out;
+ multi_or[15][i].in[2] <== eq[64][i].out;
+ and[75][i].b <== multi_or[15][i].out;
+ and[76][i] = AND();
+ and[76][i].a <== states[i][19];
+ and[76][i].b <== multi_or[15][i].out;
+ and[77][i] = AND();
+ and[77][i].a <== states[i][20];
+ and[77][i].b <== multi_or[15][i].out;
+ and[78][i] = AND();
+ and[78][i].a <== states[i][21];
+ and[78][i].b <== multi_or[15][i].out;
+ and[79][i] = AND();
+ and[79][i].a <== states[i][22];
+ and[79][i].b <== multi_or[15][i].out;
+ and[80][i] = AND();
+ and[80][i].a <== states[i][23];
+ and[80][i].b <== multi_or[15][i].out;
+ and[81][i] = AND();
+ and[81][i].a <== states[i][24];
+ and[81][i].b <== multi_or[15][i].out;
+ multi_or[16][i] = MultiOR(7);
+ multi_or[16][i].in[0] <== and[75][i].out;
+ multi_or[16][i].in[1] <== and[76][i].out;
+ multi_or[16][i].in[2] <== and[77][i].out;
+ multi_or[16][i].in[3] <== and[78][i].out;
+ multi_or[16][i].in[4] <== and[79][i].out;
+ multi_or[16][i].in[5] <== and[80][i].out;
+ multi_or[16][i].in[6] <== and[81][i].out;
+ states[i+1][17] <== multi_or[16][i].out;
+ eq[65][i] = IsEqual();
+ eq[65][i].in[0] <== in[i];
+ eq[65][i].in[1] <== 244;
+ and[82][i] = AND();
+ and[82][i].a <== states[i][11];
+ and[82][i].b <== eq[65][i].out;
+ and[83][i] = AND();
+ and[83][i].a <== states[i][19];
+ and[83][i].b <== eq[65][i].out;
+ and[84][i] = AND();
+ and[84][i].a <== states[i][20];
+ and[84][i].b <== eq[65][i].out;
+ and[85][i] = AND();
+ and[85][i].a <== states[i][21];
+ and[85][i].b <== eq[65][i].out;
+ and[86][i] = AND();
+ and[86][i].a <== states[i][22];
+ and[86][i].b <== eq[65][i].out;
+ and[87][i] = AND();
+ and[87][i].a <== states[i][23];
+ and[87][i].b <== eq[65][i].out;
+ and[88][i] = AND();
+ and[88][i].a <== states[i][24];
+ and[88][i].b <== eq[65][i].out;
+ multi_or[17][i] = MultiOR(7);
+ multi_or[17][i].in[0] <== and[82][i].out;
+ multi_or[17][i].in[1] <== and[83][i].out;
+ multi_or[17][i].in[2] <== and[84][i].out;
+ multi_or[17][i].in[3] <== and[85][i].out;
+ multi_or[17][i].in[4] <== and[86][i].out;
+ multi_or[17][i].in[5] <== and[87][i].out;
+ multi_or[17][i].in[6] <== and[88][i].out;
+ states[i+1][18] <== multi_or[17][i].out;
+ eq[66][i] = IsEqual();
+ eq[66][i].in[0] <== in[i];
+ eq[66][i].in[1] <== 122;
+ and[89][i] = AND();
+ and[89][i].a <== states[i][11];
+ and[89][i].b <== eq[66][i].out;
+ and[90][i] = AND();
+ and[90][i].a <== states[i][19];
+ and[90][i].b <== eq[66][i].out;
+ and[91][i] = AND();
+ and[91][i].a <== states[i][20];
+ and[91][i].b <== eq[66][i].out;
+ and[92][i] = AND();
+ and[92][i].a <== states[i][21];
+ and[92][i].b <== eq[66][i].out;
+ and[93][i] = AND();
+ and[93][i].a <== states[i][22];
+ and[93][i].b <== eq[66][i].out;
+ and[94][i] = AND();
+ and[94][i].a <== states[i][23];
+ and[94][i].b <== eq[66][i].out;
+ and[95][i] = AND();
+ and[95][i].a <== states[i][24];
+ and[95][i].b <== eq[66][i].out;
+ multi_or[18][i] = MultiOR(7);
+ multi_or[18][i].in[0] <== and[89][i].out;
+ multi_or[18][i].in[1] <== and[90][i].out;
+ multi_or[18][i].in[2] <== and[91][i].out;
+ multi_or[18][i].in[3] <== and[92][i].out;
+ multi_or[18][i].in[4] <== and[93][i].out;
+ multi_or[18][i].in[5] <== and[94][i].out;
+ multi_or[18][i].in[6] <== and[95][i].out;
+ states[i+1][19] <== multi_or[18][i].out;
+ and[96][i] = AND();
+ and[96][i].a <== states[i][19];
+ and[96][i].b <== eq[28][i].out;
+ states[i+1][20] <== and[96][i].out;
+ eq[67][i] = IsEqual();
+ eq[67][i].in[0] <== in[i];
+ eq[67][i].in[1] <== 101;
+ and[97][i] = AND();
+ and[97][i].a <== states[i][20];
+ and[97][i].b <== eq[67][i].out;
+ states[i+1][21] <== and[97][i].out;
+ and[98][i] = AND();
+ and[98][i].a <== states[i][21];
+ and[98][i].b <== eq[15][i].out;
+ states[i+1][22] <== and[98][i].out;
+ eq[68][i] = IsEqual();
+ eq[68][i].in[0] <== in[i];
+ eq[68][i].in[1] <== 97;
+ and[99][i] = AND();
+ and[99][i].a <== states[i][22];
+ and[99][i].b <== eq[68][i].out;
+ states[i+1][23] <== and[99][i].out;
+ and[100][i] = AND();
+ and[100][i].a <== states[i][23];
+ and[100][i].b <== eq[2][i].out;
+ states[i+1][24] <== and[100][i].out;
+ and[101][i] = AND();
+ and[101][i].a <== states[i][24];
+ and[101][i].b <== eq[14][i].out;
+ lt[30][i] = LessEqThan(8);
+ lt[30][i].in[0] <== 35;
+ lt[30][i].in[1] <== in[i];
+ lt[31][i] = LessEqThan(8);
+ lt[31][i].in[0] <== in[i];
+ lt[31][i].in[1] <== 127;
+ and[102][i] = AND();
+ and[102][i].a <== lt[30][i].out;
+ and[102][i].b <== lt[31][i].out;
+ and[103][i] = AND();
+ and[103][i].a <== states[i][25];
+ multi_or[19][i] = MultiOR(2);
+ multi_or[19][i].in[0] <== and[11][i].out;
+ multi_or[19][i].in[1] <== and[102][i].out;
+ and[103][i].b <== multi_or[19][i].out;
+ and[104][i] = AND();
+ and[104][i].a <== states[i][27];
+ and[104][i].b <== and[14][i].out;
+ multi_or[20][i] = MultiOR(3);
+ multi_or[20][i].in[0] <== and[101][i].out;
+ multi_or[20][i].in[1] <== and[103][i].out;
+ multi_or[20][i].in[2] <== and[104][i].out;
+ states[i+1][25] <== multi_or[20][i].out;
+ and[105][i] = AND();
+ and[105][i].a <== states[i][25];
+ and[105][i].b <== eq[8][i].out;
+ lt[32][i] = LessEqThan(8);
+ lt[32][i].in[0] <== 1;
+ lt[32][i].in[1] <== in[i];
+ lt[33][i] = LessEqThan(8);
+ lt[33][i].in[0] <== in[i];
+ lt[33][i].in[1] <== 61;
+ and[106][i] = AND();
+ and[106][i].a <== lt[32][i].out;
+ and[106][i].b <== lt[33][i].out;
+ lt[34][i] = LessEqThan(8);
+ lt[34][i].in[0] <== 63;
+ lt[34][i].in[1] <== in[i];
+ lt[35][i] = LessEqThan(8);
+ lt[35][i].in[0] <== in[i];
+ lt[35][i].in[1] <== 127;
+ and[107][i] = AND();
+ and[107][i].a <== lt[34][i].out;
+ and[107][i].b <== lt[35][i].out;
+ and[108][i] = AND();
+ and[108][i].a <== states[i][26];
+ multi_or[21][i] = MultiOR(2);
+ multi_or[21][i].in[0] <== and[106][i].out;
+ multi_or[21][i].in[1] <== and[107][i].out;
+ and[108][i].b <== multi_or[21][i].out;
+ and[109][i] = AND();
+ and[109][i].a <== states[i][35];
+ and[109][i].b <== and[14][i].out;
+ multi_or[22][i] = MultiOR(3);
+ multi_or[22][i].in[0] <== and[105][i].out;
+ multi_or[22][i].in[1] <== and[108][i].out;
+ multi_or[22][i].in[2] <== and[109][i].out;
+ states[i+1][26] <== multi_or[22][i].out;
+ and[110][i] = AND();
+ and[110][i].a <== states[i][25];
+ and[110][i].b <== and[30][i].out;
+ and[111][i] = AND();
+ and[111][i].a <== states[i][28];
+ and[111][i].b <== and[32][i].out;
+ and[112][i] = AND();
+ and[112][i].a <== states[i][29];
+ and[112][i].b <== and[14][i].out;
+ and[113][i] = AND();
+ and[113][i].a <== states[i][30];
+ and[113][i].b <== and[35][i].out;
+ multi_or[23][i] = MultiOR(4);
+ multi_or[23][i].in[0] <== and[110][i].out;
+ multi_or[23][i].in[1] <== and[111][i].out;
+ multi_or[23][i].in[2] <== and[112][i].out;
+ multi_or[23][i].in[3] <== and[113][i].out;
+ states[i+1][27] <== multi_or[23][i].out;
+ and[114][i] = AND();
+ and[114][i].a <== states[i][25];
+ and[114][i].b <== eq[29][i].out;
+ states[i+1][28] <== and[114][i].out;
+ and[115][i] = AND();
+ and[115][i].a <== states[i][25];
+ and[115][i].b <== multi_or[10][i].out;
+ and[116][i] = AND();
+ and[116][i].a <== states[i][31];
+ and[116][i].b <== and[51][i].out;
+ and[117][i] = AND();
+ and[117][i].a <== states[i][32];
+ and[117][i].b <== and[14][i].out;
+ and[118][i] = AND();
+ and[118][i].a <== states[i][33];
+ and[118][i].b <== multi_or[11][i].out;
+ multi_or[24][i] = MultiOR(4);
+ multi_or[24][i].in[0] <== and[115][i].out;
+ multi_or[24][i].in[1] <== and[116][i].out;
+ multi_or[24][i].in[2] <== and[117][i].out;
+ multi_or[24][i].in[3] <== and[118][i].out;
+ states[i+1][29] <== multi_or[24][i].out;
+ and[119][i] = AND();
+ and[119][i].a <== states[i][25];
+ and[119][i].b <== eq[60][i].out;
+ states[i+1][30] <== and[119][i].out;
+ and[120][i] = AND();
+ and[120][i].a <== states[i][25];
+ and[120][i].b <== eq[61][i].out;
+ states[i+1][31] <== and[120][i].out;
+ and[121][i] = AND();
+ and[121][i].a <== states[i][25];
+ and[121][i].b <== multi_or[15][i].out;
+ states[i+1][32] <== and[121][i].out;
+ and[122][i] = AND();
+ and[122][i].a <== states[i][25];
+ and[122][i].b <== eq[65][i].out;
+ states[i+1][33] <== and[122][i].out;
+ eq[69][i] = IsEqual();
+ eq[69][i].in[0] <== in[i];
+ eq[69][i].in[1] <== 62;
+ and[123][i] = AND();
+ and[123][i].a <== states[i][26];
+ and[123][i].b <== eq[69][i].out;
+ states[i+1][34] <== and[123][i].out;
+ and[124][i] = AND();
+ and[124][i].a <== states[i][26];
+ and[124][i].b <== and[30][i].out;
+ and[125][i] = AND();
+ and[125][i].a <== states[i][36];
+ and[125][i].b <== and[32][i].out;
+ and[126][i] = AND();
+ and[126][i].a <== states[i][37];
+ and[126][i].b <== and[14][i].out;
+ and[127][i] = AND();
+ and[127][i].a <== states[i][38];
+ and[127][i].b <== and[35][i].out;
+ multi_or[25][i] = MultiOR(4);
+ multi_or[25][i].in[0] <== and[124][i].out;
+ multi_or[25][i].in[1] <== and[125][i].out;
+ multi_or[25][i].in[2] <== and[126][i].out;
+ multi_or[25][i].in[3] <== and[127][i].out;
+ states[i+1][35] <== multi_or[25][i].out;
+ and[128][i] = AND();
+ and[128][i].a <== states[i][26];
+ and[128][i].b <== eq[29][i].out;
+ states[i+1][36] <== and[128][i].out;
+ and[129][i] = AND();
+ and[129][i].a <== states[i][26];
+ and[129][i].b <== multi_or[10][i].out;
+ and[130][i] = AND();
+ and[130][i].a <== states[i][39];
+ and[130][i].b <== and[51][i].out;
+ and[131][i] = AND();
+ and[131][i].a <== states[i][40];
+ and[131][i].b <== and[14][i].out;
+ and[132][i] = AND();
+ and[132][i].a <== states[i][41];
+ and[132][i].b <== multi_or[11][i].out;
+ multi_or[26][i] = MultiOR(4);
+ multi_or[26][i].in[0] <== and[129][i].out;
+ multi_or[26][i].in[1] <== and[130][i].out;
+ multi_or[26][i].in[2] <== and[131][i].out;
+ multi_or[26][i].in[3] <== and[132][i].out;
+ states[i+1][37] <== multi_or[26][i].out;
+ and[133][i] = AND();
+ and[133][i].a <== states[i][26];
+ and[133][i].b <== eq[60][i].out;
+ states[i+1][38] <== and[133][i].out;
+ and[134][i] = AND();
+ and[134][i].a <== states[i][26];
+ and[134][i].b <== eq[61][i].out;
+ states[i+1][39] <== and[134][i].out;
+ and[135][i] = AND();
+ and[135][i].a <== states[i][26];
+ and[135][i].b <== multi_or[15][i].out;
+ states[i+1][40] <== and[135][i].out;
+ and[136][i] = AND();
+ and[136][i].a <== states[i][26];
+ and[136][i].b <== eq[65][i].out;
+ states[i+1][41] <== and[136][i].out;
+ lt[36][i] = LessEqThan(8);
+ lt[36][i].in[0] <== 1;
+ lt[36][i].in[1] <== in[i];
+ lt[37][i] = LessEqThan(8);
+ lt[37][i].in[0] <== in[i];
+ lt[37][i].in[1] <== 46;
+ and[137][i] = AND();
+ and[137][i].a <== lt[36][i].out;
+ and[137][i].b <== lt[37][i].out;
+ eq[70][i] = IsEqual();
+ eq[70][i].in[0] <== in[i];
+ eq[70][i].in[1] <== 48;
+ eq[71][i] = IsEqual();
+ eq[71][i].in[0] <== in[i];
+ eq[71][i].in[1] <== 49;
+ eq[72][i] = IsEqual();
+ eq[72][i].in[0] <== in[i];
+ eq[72][i].in[1] <== 50;
+ eq[73][i] = IsEqual();
+ eq[73][i].in[0] <== in[i];
+ eq[73][i].in[1] <== 52;
+ eq[74][i] = IsEqual();
+ eq[74][i].in[0] <== in[i];
+ eq[74][i].in[1] <== 53;
+ eq[75][i] = IsEqual();
+ eq[75][i].in[0] <== in[i];
+ eq[75][i].in[1] <== 54;
+ eq[76][i] = IsEqual();
+ eq[76][i].in[0] <== in[i];
+ eq[76][i].in[1] <== 55;
+ eq[77][i] = IsEqual();
+ eq[77][i].in[0] <== in[i];
+ eq[77][i].in[1] <== 56;
+ eq[78][i] = IsEqual();
+ eq[78][i].in[0] <== in[i];
+ eq[78][i].in[1] <== 57;
+ eq[79][i] = IsEqual();
+ eq[79][i].in[0] <== in[i];
+ eq[79][i].in[1] <== 58;
+ eq[80][i] = IsEqual();
+ eq[80][i].in[0] <== in[i];
+ eq[80][i].in[1] <== 59;
+ and[138][i] = AND();
+ and[138][i].a <== states[i][34];
+ multi_or[27][i] = MultiOR(15);
+ multi_or[27][i].in[0] <== and[137][i].out;
+ multi_or[27][i].in[1] <== and[107][i].out;
+ multi_or[27][i].in[2] <== eq[70][i].out;
+ multi_or[27][i].in[3] <== eq[71][i].out;
+ multi_or[27][i].in[4] <== eq[72][i].out;
+ multi_or[27][i].in[5] <== eq[6][i].out;
+ multi_or[27][i].in[6] <== eq[73][i].out;
+ multi_or[27][i].in[7] <== eq[74][i].out;
+ multi_or[27][i].in[8] <== eq[75][i].out;
+ multi_or[27][i].in[9] <== eq[76][i].out;
+ multi_or[27][i].in[10] <== eq[77][i].out;
+ multi_or[27][i].in[11] <== eq[78][i].out;
+ multi_or[27][i].in[12] <== eq[79][i].out;
+ multi_or[27][i].in[13] <== eq[80][i].out;
+ multi_or[27][i].in[14] <== eq[5][i].out;
+ and[138][i].b <== multi_or[27][i].out;
+ and[139][i] = AND();
+ and[139][i].a <== states[i][42];
+ and[139][i].b <== multi_or[27][i].out;
+ and[140][i] = AND();
+ and[140][i].a <== states[i][43];
+ and[140][i].b <== and[14][i].out;
+ multi_or[28][i] = MultiOR(3);
+ multi_or[28][i].in[0] <== and[138][i].out;
+ multi_or[28][i].in[1] <== and[139][i].out;
+ multi_or[28][i].in[2] <== and[140][i].out;
+ states[i+1][42] <== multi_or[28][i].out;
+ and[141][i] = AND();
+ and[141][i].a <== states[i][34];
+ and[141][i].b <== and[30][i].out;
+ and[142][i] = AND();
+ and[142][i].a <== states[i][42];
+ and[142][i].b <== and[30][i].out;
+ and[143][i] = AND();
+ and[143][i].a <== states[i][44];
+ and[143][i].b <== and[32][i].out;
+ and[144][i] = AND();
+ and[144][i].a <== states[i][45];
+ and[144][i].b <== and[14][i].out;
+ and[145][i] = AND();
+ and[145][i].a <== states[i][46];
+ and[145][i].b <== and[35][i].out;
+ multi_or[29][i] = MultiOR(5);
+ multi_or[29][i].in[0] <== and[141][i].out;
+ multi_or[29][i].in[1] <== and[142][i].out;
+ multi_or[29][i].in[2] <== and[143][i].out;
+ multi_or[29][i].in[3] <== and[144][i].out;
+ multi_or[29][i].in[4] <== and[145][i].out;
+ states[i+1][43] <== multi_or[29][i].out;
+ and[146][i] = AND();
+ and[146][i].a <== states[i][34];
+ and[146][i].b <== eq[29][i].out;
+ and[147][i] = AND();
+ and[147][i].a <== states[i][42];
+ and[147][i].b <== eq[29][i].out;
+ multi_or[30][i] = MultiOR(2);
+ multi_or[30][i].in[0] <== and[146][i].out;
+ multi_or[30][i].in[1] <== and[147][i].out;
+ states[i+1][44] <== multi_or[30][i].out;
+ and[148][i] = AND();
+ and[148][i].a <== states[i][34];
+ and[148][i].b <== multi_or[10][i].out;
+ and[149][i] = AND();
+ and[149][i].a <== states[i][42];
+ and[149][i].b <== multi_or[10][i].out;
+ and[150][i] = AND();
+ and[150][i].a <== states[i][47];
+ and[150][i].b <== and[51][i].out;
+ and[151][i] = AND();
+ and[151][i].a <== states[i][48];
+ and[151][i].b <== and[14][i].out;
+ and[152][i] = AND();
+ and[152][i].a <== states[i][49];
+ and[152][i].b <== multi_or[11][i].out;
+ multi_or[31][i] = MultiOR(5);
+ multi_or[31][i].in[0] <== and[148][i].out;
+ multi_or[31][i].in[1] <== and[149][i].out;
+ multi_or[31][i].in[2] <== and[150][i].out;
+ multi_or[31][i].in[3] <== and[151][i].out;
+ multi_or[31][i].in[4] <== and[152][i].out;
+ states[i+1][45] <== multi_or[31][i].out;
+ and[153][i] = AND();
+ and[153][i].a <== states[i][34];
+ and[153][i].b <== eq[60][i].out;
+ and[154][i] = AND();
+ and[154][i].a <== states[i][42];
+ and[154][i].b <== eq[60][i].out;
+ multi_or[32][i] = MultiOR(2);
+ multi_or[32][i].in[0] <== and[153][i].out;
+ multi_or[32][i].in[1] <== and[154][i].out;
+ states[i+1][46] <== multi_or[32][i].out;
+ and[155][i] = AND();
+ and[155][i].a <== states[i][34];
+ and[155][i].b <== eq[61][i].out;
+ and[156][i] = AND();
+ and[156][i].a <== states[i][42];
+ and[156][i].b <== eq[61][i].out;
+ multi_or[33][i] = MultiOR(2);
+ multi_or[33][i].in[0] <== and[155][i].out;
+ multi_or[33][i].in[1] <== and[156][i].out;
+ states[i+1][47] <== multi_or[33][i].out;
+ and[157][i] = AND();
+ and[157][i].a <== states[i][34];
+ and[157][i].b <== multi_or[15][i].out;
+ and[158][i] = AND();
+ and[158][i].a <== states[i][42];
+ and[158][i].b <== multi_or[15][i].out;
+ multi_or[34][i] = MultiOR(2);
+ multi_or[34][i].in[0] <== and[157][i].out;
+ multi_or[34][i].in[1] <== and[158][i].out;
+ states[i+1][48] <== multi_or[34][i].out;
+ and[159][i] = AND();
+ and[159][i].a <== states[i][34];
+ and[159][i].b <== eq[65][i].out;
+ and[160][i] = AND();
+ and[160][i].a <== states[i][42];
+ and[160][i].b <== eq[65][i].out;
+ multi_or[35][i] = MultiOR(2);
+ multi_or[35][i].in[0] <== and[159][i].out;
+ multi_or[35][i].in[1] <== and[160][i].out;
+ states[i+1][49] <== multi_or[35][i].out;
+ and[161][i] = AND();
+ and[161][i].a <== states[i][42];
+ and[161][i].b <== eq[0][i].out;
+ states[i+1][50] <== and[161][i].out;
+ eq[81][i] = IsEqual();
+ eq[81][i].in[0] <== in[i];
+ eq[81][i].in[1] <== 47;
+ and[162][i] = AND();
+ and[162][i].a <== states[i][50];
+ and[162][i].b <== eq[81][i].out;
+ states[i+1][51] <== and[162][i].out;
+ and[163][i] = AND();
+ and[163][i].a <== states[i][51];
+ and[163][i].b <== eq[1][i].out;
+ states[i+1][52] <== and[163][i].out;
+ and[164][i] = AND();
+ and[164][i].a <== states[i][52];
+ and[164][i].b <== eq[2][i].out;
+ states[i+1][53] <== and[164][i].out;
+ and[165][i] = AND();
+ and[165][i].a <== states[i][53];
+ and[165][i].b <== eq[3][i].out;
+ states[i+1][54] <== and[165][i].out;
+ and[166][i] = AND();
+ and[166][i].a <== states[i][54];
+ and[166][i].b <== eq[69][i].out;
+ states[i+1][55] <== and[166][i].out;
+ from_zero_enabled[i] <== MultiNOR(55)([states_tmp[i+1][1], states[i+1][2], states[i+1][3], states[i+1][4], states[i+1][5], states[i+1][6], states[i+1][7], states[i+1][8], states[i+1][9], states[i+1][10], states[i+1][11], states[i+1][12], states[i+1][13], states[i+1][14], states[i+1][15], states[i+1][16], states[i+1][17], states[i+1][18], states[i+1][19], states[i+1][20], states[i+1][21], states[i+1][22], states[i+1][23], states[i+1][24], states[i+1][25], states[i+1][26], states[i+1][27], states[i+1][28], states[i+1][29], states[i+1][30], states[i+1][31], states[i+1][32], states[i+1][33], states[i+1][34], states[i+1][35], states[i+1][36], states[i+1][37], states[i+1][38], states[i+1][39], states[i+1][40], states[i+1][41], states[i+1][42], states[i+1][43], states[i+1][44], states[i+1][45], states[i+1][46], states[i+1][47], states[i+1][48], states[i+1][49], states[i+1][50], states[i+1][51], states[i+1][52], states[i+1][53], states[i+1][54], states[i+1][55]]);
+ states[i+1][1] <== MultiOR(2)([states_tmp[i+1][1], from_zero_enabled[i] * and[0][i].out]);
+ state_changed[i].in[0] <== states[i+1][1];
+ state_changed[i].in[1] <== states[i+1][2];
+ state_changed[i].in[2] <== states[i+1][3];
+ state_changed[i].in[3] <== states[i+1][4];
+ state_changed[i].in[4] <== states[i+1][5];
+ state_changed[i].in[5] <== states[i+1][6];
+ state_changed[i].in[6] <== states[i+1][7];
+ state_changed[i].in[7] <== states[i+1][8];
+ state_changed[i].in[8] <== states[i+1][9];
+ state_changed[i].in[9] <== states[i+1][10];
+ state_changed[i].in[10] <== states[i+1][11];
+ state_changed[i].in[11] <== states[i+1][12];
+ state_changed[i].in[12] <== states[i+1][13];
+ state_changed[i].in[13] <== states[i+1][14];
+ state_changed[i].in[14] <== states[i+1][15];
+ state_changed[i].in[15] <== states[i+1][16];
+ state_changed[i].in[16] <== states[i+1][17];
+ state_changed[i].in[17] <== states[i+1][18];
+ state_changed[i].in[18] <== states[i+1][19];
+ state_changed[i].in[19] <== states[i+1][20];
+ state_changed[i].in[20] <== states[i+1][21];
+ state_changed[i].in[21] <== states[i+1][22];
+ state_changed[i].in[22] <== states[i+1][23];
+ state_changed[i].in[23] <== states[i+1][24];
+ state_changed[i].in[24] <== states[i+1][25];
+ state_changed[i].in[25] <== states[i+1][26];
+ state_changed[i].in[26] <== states[i+1][27];
+ state_changed[i].in[27] <== states[i+1][28];
+ state_changed[i].in[28] <== states[i+1][29];
+ state_changed[i].in[29] <== states[i+1][30];
+ state_changed[i].in[30] <== states[i+1][31];
+ state_changed[i].in[31] <== states[i+1][32];
+ state_changed[i].in[32] <== states[i+1][33];
+ state_changed[i].in[33] <== states[i+1][34];
+ state_changed[i].in[34] <== states[i+1][35];
+ state_changed[i].in[35] <== states[i+1][36];
+ state_changed[i].in[36] <== states[i+1][37];
+ state_changed[i].in[37] <== states[i+1][38];
+ state_changed[i].in[38] <== states[i+1][39];
+ state_changed[i].in[39] <== states[i+1][40];
+ state_changed[i].in[40] <== states[i+1][41];
+ state_changed[i].in[41] <== states[i+1][42];
+ state_changed[i].in[42] <== states[i+1][43];
+ state_changed[i].in[43] <== states[i+1][44];
+ state_changed[i].in[44] <== states[i+1][45];
+ state_changed[i].in[45] <== states[i+1][46];
+ state_changed[i].in[46] <== states[i+1][47];
+ state_changed[i].in[47] <== states[i+1][48];
+ state_changed[i].in[48] <== states[i+1][49];
+ state_changed[i].in[49] <== states[i+1][50];
+ state_changed[i].in[50] <== states[i+1][51];
+ state_changed[i].in[51] <== states[i+1][52];
+ state_changed[i].in[52] <== states[i+1][53];
+ state_changed[i].in[53] <== states[i+1][54];
+ state_changed[i].in[54] <== states[i+1][55];
+ }
+
+ component is_accepted = MultiOR(num_bytes+1);
+ for (var i = 0; i <= num_bytes; i++) {
+ is_accepted.in[i] <== states[i][55];
+ }
+ out <== is_accepted.out;
+ signal is_consecutive[msg_bytes+1][3];
+ is_consecutive[msg_bytes][2] <== 0;
+ for (var i = 0; i < msg_bytes; i++) {
+ is_consecutive[msg_bytes-1-i][0] <== states[num_bytes-i][55] * (1 - is_consecutive[msg_bytes-i][2]) + is_consecutive[msg_bytes-i][2];
+ is_consecutive[msg_bytes-1-i][1] <== state_changed[msg_bytes-i].out * is_consecutive[msg_bytes-1-i][0];
+ is_consecutive[msg_bytes-1-i][2] <== ORAnd()([(1 - from_zero_enabled[msg_bytes-i+1]), states[num_bytes-i][55], is_consecutive[msg_bytes-1-i][1]]);
+ }
+ // substrings calculated: [{(34, 42), (34, 43), (34, 44), (34, 45), (34, 46), (34, 47), (34, 48), (34, 49), (42, 42), (42, 43), (42, 44), (42, 45), (42, 46), (42, 47), (42, 48), (42, 49), (43, 42), (44, 43), (45, 43), (46, 43), (47, 45), (48, 45), (49, 45)}]
+ signal prev_states0[23][msg_bytes];
+ signal is_substr0[msg_bytes];
+ signal is_reveal0[msg_bytes];
+ signal output reveal0[msg_bytes];
+ for (var i = 0; i < msg_bytes; i++) {
+ // the 0-th substring transitions: [(34, 42), (34, 43), (34, 44), (34, 45), (34, 46), (34, 47), (34, 48), (34, 49), (42, 42), (42, 43), (42, 44), (42, 45), (42, 46), (42, 47), (42, 48), (42, 49), (43, 42), (44, 43), (45, 43), (46, 43), (47, 45), (48, 45), (49, 45)]
+ prev_states0[0][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[1][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[2][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[3][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[4][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[5][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[6][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[7][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][34];
+ prev_states0[8][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[9][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[10][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[11][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[12][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[13][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[14][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[15][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][42];
+ prev_states0[16][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][43];
+ prev_states0[17][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][44];
+ prev_states0[18][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][45];
+ prev_states0[19][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][46];
+ prev_states0[20][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][47];
+ prev_states0[21][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][48];
+ prev_states0[22][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][49];
+ is_substr0[i] <== MultiOR(23)([prev_states0[0][i] * states[i+2][42], prev_states0[1][i] * states[i+2][43], prev_states0[2][i] * states[i+2][44], prev_states0[3][i] * states[i+2][45], prev_states0[4][i] * states[i+2][46], prev_states0[5][i] * states[i+2][47], prev_states0[6][i] * states[i+2][48], prev_states0[7][i] * states[i+2][49], prev_states0[8][i] * states[i+2][42], prev_states0[9][i] * states[i+2][43], prev_states0[10][i] * states[i+2][44], prev_states0[11][i] * states[i+2][45], prev_states0[12][i] * states[i+2][46], prev_states0[13][i] * states[i+2][47], prev_states0[14][i] * states[i+2][48], prev_states0[15][i] * states[i+2][49], prev_states0[16][i] * states[i+2][42], prev_states0[17][i] * states[i+2][43], prev_states0[18][i] * states[i+2][43], prev_states0[19][i] * states[i+2][43], prev_states0[20][i] * states[i+2][45], prev_states0[21][i] * states[i+2][45], prev_states0[22][i] * states[i+2][45]]);
+ is_reveal0[i] <== MultiAND(3)([out, is_substr0[i], is_consecutive[i][2]]);
+ reveal0[i] <== in[i+1] * is_reveal0[i];
+ }
+}
\ No newline at end of file
diff --git a/packages/circuits/tests/circuits/test_email_auth_with_body_parsing.circom b/packages/circuits/tests/circuits/test_email_auth_with_body_parsing.circom
new file mode 100644
index 00000000..9e38853d
--- /dev/null
+++ b/packages/circuits/tests/circuits/test_email_auth_with_body_parsing.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.6;
+
+include "../../src/email_auth_template.circom";
+
+component main = EmailAuthWithBodyParsing(121, 17, 640, 768, 605, 0, 1);
\ No newline at end of file
diff --git a/packages/circuits/tests/email_auth.test.ts b/packages/circuits/tests/email_auth.test.ts
index d8526337..693ba1a4 100644
--- a/packages/circuits/tests/email_auth.test.ts
+++ b/packages/circuits/tests/email_auth.test.ts
@@ -3,396 +3,520 @@ const wasm_tester = circom_tester.wasm;
import * as path from "path";
const relayerUtils = require("@zk-email/relayer-utils");
-import { genEmailAuthInput } from "../helpers/email_auth";
+import { genEmailCircuitInput } from "../helpers/email_auth";
import { readFileSync } from "fs";
jest.setTimeout(1440000);
describe("Email Auth", () => {
- let circuit;
- beforeAll(async () => {
- const option = {
- include: path.join(__dirname, "../../../node_modules"),
- };
- circuit = await wasm_tester(
- path.join(__dirname, "../src/email_auth.circom"),
- option
- );
- });
+ let circuit;
+ beforeAll(async () => {
+ const option = {
+ include: path.join(__dirname, "../../../node_modules"),
+ recompile: true,
+ };
+ circuit = await wasm_tester(
+ path.join(__dirname, "../src/email_auth.circom"),
+ option
+ );
+ });
- it("Verify a sent email whose subject has an email address", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const emailRaw = readFileSync(emailFilePath, "utf8");
- const parsedEmail = await relayerUtils.parseEmail(emailRaw);
- console.log(parsedEmail.canonicalizedHeader);
- const accountCode = await relayerUtils.genAccountCode();
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- console.log(circuitInputs);
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- const domainName = "gmail.com";
- const paddedDomain = relayerUtils.padString(domainName, 255);
- const domainFields = relayerUtils.bytes2Fields(paddedDomain);
- for (let idx = 0; idx < domainFields.length; ++idx) {
- expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
- }
- const expectedPubKeyHash = relayerUtils.publicKeyHash(
- parsedEmail.publicKey
- );
- expect(BigInt(expectedPubKeyHash)).toEqual(
- witness[1 + domainFields.length]
- );
- const expectedEmailNullifier = relayerUtils.emailNullifier(
- parsedEmail.signature
- );
- expect(BigInt(expectedEmailNullifier)).toEqual(
- witness[1 + domainFields.length + 1]
- );
- const timestamp = 1694989812n;
- expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
- const maskedSubject = "Send 0.1 ETH to ";
- const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
- const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject);
- for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
- expect(BigInt(maskedSubjectFields[idx])).toEqual(
- witness[1 + domainFields.length + 3 + idx]
- );
- }
- const fromAddr = "suegamisora@gmail.com";
- const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
- expect(BigInt(accountSalt)).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
- );
- expect(0n).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1]
- );
- });
+ it("Verify a sent email whose subject has an email address", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_test1.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ console.log(parsedEmail.canonicalizedHeader);
+ const accountCode = await relayerUtils.genAccountCode();
+ const {
+ body_hash_idx,
+ precomputed_sha,
+ padded_body,
+ padded_body_len,
+ command_idx,
+ padded_cleaned_body,
+ ...circuitInputsRelevant
+ } = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ console.log(circuitInputsRelevant);
+ const witness = await circuit.calculateWitness(circuitInputsRelevant);
+ await circuit.checkConstraints(witness);
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+ const timestamp = 1694989812n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ const maskedSubject = "Send 0.1 ETH to ";
+ const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ const maskedSubjectFields =
+ relayerUtils.bytes2Fields(paddedMaskedSubject);
+ for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "suegamisora@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ );
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ ]
+ );
+ });
- it("Verify a sent email whose subject does not have an email address", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test2.eml");
- const emailRaw = readFileSync(emailFilePath, "utf8");
- const parsedEmail = await relayerUtils.parseEmail(emailRaw);
- console.log(parsedEmail.canonicalizedHeader);
- const accountCode = await relayerUtils.genAccountCode();
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- const domainName = "gmail.com";
- const paddedDomain = relayerUtils.padString(domainName, 255);
- const domainFields = relayerUtils.bytes2Fields(paddedDomain);
- for (let idx = 0; idx < domainFields.length; ++idx) {
- expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
- }
- const expectedPubKeyHash = relayerUtils.publicKeyHash(
- parsedEmail.publicKey
- );
- expect(BigInt(expectedPubKeyHash)).toEqual(
- witness[1 + domainFields.length]
- );
- const expectedEmailNullifier = relayerUtils.emailNullifier(
- parsedEmail.signature
- );
- expect(BigInt(expectedEmailNullifier)).toEqual(
- witness[1 + domainFields.length + 1]
- );
- const timestamp = 1696964295n;
- expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
- const maskedSubject = "Swap 1 ETH to DAI";
- const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
- const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject);
- for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
- expect(BigInt(maskedSubjectFields[idx])).toEqual(
- witness[1 + domainFields.length + 3 + idx]
- );
- }
- const fromAddr = "suegamisora@gmail.com";
- const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
- expect(BigInt(accountSalt)).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
- );
- expect(0n).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1]
- );
- });
+ it("Verify a sent email whose subject does not have an email address", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_test2.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ console.log(parsedEmail.canonicalizedHeader);
+ const accountCode = await relayerUtils.genAccountCode();
+ const {
+ body_hash_idx,
+ precomputed_sha,
+ padded_body,
+ padded_body_len,
+ command_idx,
+ padded_cleaned_body,
+ ...circuitInputsRelevant
+ } = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ const witness = await circuit.calculateWitness(circuitInputsRelevant);
+ await circuit.checkConstraints(witness);
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+ const timestamp = 1696964295n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ const maskedSubject = "Swap 1 ETH to DAI";
+ const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ const maskedSubjectFields =
+ relayerUtils.bytes2Fields(paddedMaskedSubject);
+ for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "suegamisora@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ );
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ ]
+ );
+ });
- it("Verify a sent email whose from field has a dummy email address name", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test3.eml");
- const emailRaw = readFileSync(emailFilePath, "utf8");
- const parsedEmail = await relayerUtils.parseEmail(emailRaw);
- console.log(parsedEmail.canonicalizedHeader);
- const accountCode = await relayerUtils.genAccountCode();
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- const domainName = "gmail.com";
- const paddedDomain = relayerUtils.padString(domainName, 255);
- const domainFields = relayerUtils.bytes2Fields(paddedDomain);
- for (let idx = 0; idx < domainFields.length; ++idx) {
- expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
- }
- const expectedPubKeyHash = relayerUtils.publicKeyHash(
- parsedEmail.publicKey
- );
- expect(BigInt(expectedPubKeyHash)).toEqual(
- witness[1 + domainFields.length]
- );
- const expectedEmailNullifier = relayerUtils.emailNullifier(
- parsedEmail.signature
- );
- expect(BigInt(expectedEmailNullifier)).toEqual(
- witness[1 + domainFields.length + 1]
- );
- const timestamp = 1696965932n;
- expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
- const maskedSubject = "Send 1 ETH to ";
- const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
- const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject);
- for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
- expect(BigInt(maskedSubjectFields[idx])).toEqual(
- witness[1 + domainFields.length + 3 + idx]
- );
- }
- const fromAddr = "suegamisora@gmail.com";
- const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
- expect(BigInt(accountSalt)).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
- );
- expect(0n).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1]
- );
- });
+ it("Verify a sent email whose from field has a dummy email address name", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_test3.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ console.log(parsedEmail.canonicalizedHeader);
+ const accountCode = await relayerUtils.genAccountCode();
+ const {
+ body_hash_idx,
+ precomputed_sha,
+ padded_body,
+ padded_body_len,
+ command_idx,
+ padded_cleaned_body,
+ ...circuitInputsRelevant
+ } = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ const witness = await circuit.calculateWitness(circuitInputsRelevant);
+ await circuit.checkConstraints(witness);
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+ const timestamp = 1696965932n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ const maskedSubject = "Send 1 ETH to ";
+ const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ const maskedSubjectFields =
+ relayerUtils.bytes2Fields(paddedMaskedSubject);
+ for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "suegamisora@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ );
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ ]
+ );
+ });
- it("Verify a sent email whose from field has a non-English name", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test4.eml");
- const emailRaw = readFileSync(emailFilePath, "utf8");
- const parsedEmail = await relayerUtils.parseEmail(emailRaw);
- console.log(parsedEmail.canonicalizedHeader);
- const accountCode = await relayerUtils.genAccountCode();
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- const domainName = "gmail.com";
- const paddedDomain = relayerUtils.padString(domainName, 255);
- const domainFields = relayerUtils.bytes2Fields(paddedDomain);
- for (let idx = 0; idx < domainFields.length; ++idx) {
- expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
- }
- const expectedPubKeyHash = relayerUtils.publicKeyHash(
- parsedEmail.publicKey
- );
- expect(BigInt(expectedPubKeyHash)).toEqual(
- witness[1 + domainFields.length]
- );
- const expectedEmailNullifier = relayerUtils.emailNullifier(
- parsedEmail.signature
- );
- expect(BigInt(expectedEmailNullifier)).toEqual(
- witness[1 + domainFields.length + 1]
- );
- const timestamp = 1696967028n;
- expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
- const maskedSubject = "Send 1 ETH to ";
- const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
- const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject);
- for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
- expect(BigInt(maskedSubjectFields[idx])).toEqual(
- witness[1 + domainFields.length + 3 + idx]
- );
- }
- const fromAddr = "suegamisora@gmail.com";
- const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
- expect(BigInt(accountSalt)).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
- );
- expect(0n).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1]
- );
- });
+ it("Verify a sent email whose from field has a non-English name", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_test4.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ console.log(parsedEmail.canonicalizedHeader);
+ const accountCode = await relayerUtils.genAccountCode();
+ const {
+ body_hash_idx,
+ precomputed_sha,
+ padded_body,
+ padded_body_len,
+ command_idx,
+ padded_cleaned_body,
+ ...circuitInputsRelevant
+ } = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ const witness = await circuit.calculateWitness(circuitInputsRelevant);
+ await circuit.checkConstraints(witness);
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+ const timestamp = 1696967028n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ const maskedSubject = "Send 1 ETH to ";
+ const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ const maskedSubjectFields =
+ relayerUtils.bytes2Fields(paddedMaskedSubject);
+ for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "suegamisora@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ );
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ ]
+ );
+ });
- it("Verify a sent email whose subject has an email address and an invitation code", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test5.eml");
- const emailRaw = readFileSync(emailFilePath, "utf8");
- const parsedEmail = await relayerUtils.parseEmail(emailRaw);
- console.log(parsedEmail.canonicalizedHeader);
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- const domainName = "gmail.com";
- const paddedDomain = relayerUtils.padString(domainName, 255);
- const domainFields = relayerUtils.bytes2Fields(paddedDomain);
- for (let idx = 0; idx < domainFields.length; ++idx) {
- expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
- }
- const expectedPubKeyHash = relayerUtils.publicKeyHash(
- parsedEmail.publicKey
- );
- expect(BigInt(expectedPubKeyHash)).toEqual(
- witness[1 + domainFields.length]
- );
- const expectedEmailNullifier = relayerUtils.emailNullifier(
- parsedEmail.signature
- );
- expect(BigInt(expectedEmailNullifier)).toEqual(
- witness[1 + domainFields.length + 1]
- );
- const timestamp = 1707866192n;
- expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
- const maskedSubject = "Send 0.12 ETH to ";
- const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
- const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject);
- for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
- expect(BigInt(maskedSubjectFields[idx])).toEqual(
- witness[1 + domainFields.length + 3 + idx]
- );
- }
- const fromAddr = "suegamisora@gmail.com";
- const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
- expect(BigInt(accountSalt)).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
- );
- expect(1n).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1]
- );
- });
+ it("Verify a sent email whose subject has an email address and an invitation code", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_test5.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ console.log(parsedEmail.canonicalizedHeader);
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const {
+ body_hash_idx,
+ precomputed_sha,
+ padded_body,
+ padded_body_len,
+ command_idx,
+ padded_cleaned_body,
+ ...circuitInputsRelevant
+ } = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ const witness = await circuit.calculateWitness(circuitInputsRelevant);
+ await circuit.checkConstraints(witness);
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+ const timestamp = 1707866192n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ const maskedSubject = "Send 0.12 ETH to ";
+ const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ const maskedSubjectFields =
+ relayerUtils.bytes2Fields(paddedMaskedSubject);
+ for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "suegamisora@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ );
+ expect(1n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ ]
+ );
+ });
- it("Verify a sent email whose subject has an invitation code", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test6.eml");
- const emailRaw = readFileSync(emailFilePath, "utf8");
- const parsedEmail = await relayerUtils.parseEmail(emailRaw);
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- const domainName = "gmail.com";
- const paddedDomain = relayerUtils.padString(domainName, 255);
- const domainFields = relayerUtils.bytes2Fields(paddedDomain);
- for (let idx = 0; idx < domainFields.length; ++idx) {
- expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
- }
- const expectedPubKeyHash = relayerUtils.publicKeyHash(
- parsedEmail.publicKey
- );
- expect(BigInt(expectedPubKeyHash)).toEqual(
- witness[1 + domainFields.length]
- );
- const expectedEmailNullifier = relayerUtils.emailNullifier(
- parsedEmail.signature
- );
- expect(BigInt(expectedEmailNullifier)).toEqual(
- witness[1 + domainFields.length + 1]
- );
- const timestamp = 1711992080n;
- expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
- const maskedSubject =
- "Re: Accept guardian request for 0x04884491560f38342C56E26BDD0fEAbb68E2d2FC";
- const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
- const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject);
- for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
- expect(BigInt(maskedSubjectFields[idx])).toEqual(
- witness[1 + domainFields.length + 3 + idx]
- );
- }
- const fromAddr = "suegamisora@gmail.com";
- const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
- expect(BigInt(accountSalt)).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
- );
- expect(1n).toEqual(
- witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1]
- );
- });
+ it("Verify a sent email whose subject has an invitation code", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_test6.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const {
+ body_hash_idx,
+ precomputed_sha,
+ padded_body,
+ padded_body_len,
+ command_idx,
+ padded_cleaned_body,
+ ...circuitInputsRelevant
+ } = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ const witness = await circuit.calculateWitness(circuitInputsRelevant);
+ await circuit.checkConstraints(witness);
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+ const timestamp = 1711992080n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ const maskedSubject =
+ "Re: Accept guardian request for 0x04884491560f38342C56E26BDD0fEAbb68E2d2FC";
+ const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ const maskedSubjectFields =
+ relayerUtils.bytes2Fields(paddedMaskedSubject);
+ for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "suegamisora@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ );
+ expect(1n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ ]
+ );
+ });
- it("Verify a sent email whose subject tries to forge the From field", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test7.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.from_addr_idx = circuitInputs.subject_idx;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email whose subject tries to forge the From field", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test7.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.from_addr_idx = circuitInputs.subject_idx;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
- it("Verify a sent email with a too large from_addr_idx", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.from_addr_idx = 1024;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email with a too large from_addr_idx", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.from_addr_idx = 1024;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
- it("Verify a sent email with a too large domain_idx", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.domain_idx = 256;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email with a too large domain_idx", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.domain_idx = 256;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
- it("Verify a sent email with a too large subject_idx", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.subject_idx = 1024;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email with a too large subject_idx", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.subject_idx = 1024;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
- it("Verify a sent email with a too large timestamp_idx", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.timestamp_idx = 1024;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email with a too large timestamp_idx", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.timestamp_idx = 1024;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
- it("Verify a sent email with a too large code_idx", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.code_idx = 1024;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email with a too large code_idx", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.code_idx = 1024;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
- it("Verify a sent email with a too large code_idx 2", async () => {
- const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
- const accountCode =
- "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
- const circuitInputs = await genEmailAuthInput(emailFilePath, accountCode);
- circuitInputs.code_idx = 1024 * 4;
- async function failFn() {
- const witness = await circuit.calculateWitness(circuitInputs);
- await circuit.checkConstraints(witness);
- }
- await expect(failFn).rejects.toThrow();
- });
+ it("Verify a sent email with a too large code_idx 2", async () => {
+ const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml");
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+ const circuitInputs = await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 1024,
+ ignoreBodyHashCheck: true,
+ });
+ circuitInputs.code_idx = 1024 * 4;
+ async function failFn() {
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+ }
+ await expect(failFn).rejects.toThrow();
+ });
});
diff --git a/packages/circuits/tests/email_auth_with_body_parsing.test.ts b/packages/circuits/tests/email_auth_with_body_parsing.test.ts
new file mode 100644
index 00000000..df9a8239
--- /dev/null
+++ b/packages/circuits/tests/email_auth_with_body_parsing.test.ts
@@ -0,0 +1,481 @@
+const circom_tester = require("circom_tester");
+const wasm_tester = circom_tester.wasm;
+import * as path from "path";
+const relayerUtils = require("@zk-email/relayer-utils");
+
+import { genEmailCircuitInput } from "../helpers/email_auth";
+import { readFileSync } from "fs";
+
+jest.setTimeout(1440000);
+describe("Email Auth With Body Parsing", () => {
+ let circuit;
+ beforeAll(async () => {
+ const option = {
+ include: path.join(__dirname, "../../../node_modules"),
+ output: path.join(__dirname, "../build"),
+ recompile: true,
+ };
+ circuit = await wasm_tester(
+ path.join(
+ __dirname,
+ "./circuits/test_email_auth_with_body_parsing.circom"
+ ),
+ option
+ );
+ });
+
+ // it("Verify a sent email whose from field has a non-English name", async () => {
+ // const emailFilePath = path.join(
+ // __dirname,
+ // "./emails/email_auth_with_body_parsing_test4.eml"
+ // );
+ // const emailRaw = readFileSync(emailFilePath, "utf8");
+ // const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+ // console.log(parsedEmail.canonicalizedHeader);
+ // const accountCode = await relayerUtils.genAccountCode();
+ // const circuitInputs = await genEmailAuthInput(
+ // emailFilePath,
+ // accountCode
+ // );
+ // const witness = await circuit.calculateWitness(circuitInputs);
+ // await circuit.checkConstraints(witness);
+ // const domainName = "gmail.com";
+ // const paddedDomain = relayerUtils.padString(domainName, 255);
+ // const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ // for (let idx = 0; idx < domainFields.length; ++idx) {
+ // expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ // }
+ // const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ // parsedEmail.publicKey
+ // );
+ // expect(BigInt(expectedPubKeyHash)).toEqual(
+ // witness[1 + domainFields.length]
+ // );
+ // const expectedEmailNullifier = relayerUtils.emailNullifier(
+ // parsedEmail.signature
+ // );
+ // expect(BigInt(expectedEmailNullifier)).toEqual(
+ // witness[1 + domainFields.length + 1]
+ // );
+ // const timestamp = 1725334030n;
+ // expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+ // const maskedSubject = "Send 1 ETH to ";
+ // const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605);
+ // const maskedSubjectFields =
+ // relayerUtils.bytes2Fields(paddedMaskedSubject);
+ // for (let idx = 0; idx < maskedSubjectFields.length; ++idx) {
+ // expect(BigInt(maskedSubjectFields[idx])).toEqual(
+ // witness[1 + domainFields.length + 3 + idx]
+ // );
+ // }
+ // const fromAddr = "suegamisora@gmail.com";
+ // const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ // expect(BigInt(accountSalt)).toEqual(
+ // witness[1 + domainFields.length + 3 + maskedSubjectFields.length]
+ // );
+ // expect(0n).toEqual(
+ // witness[
+ // 1 + domainFields.length + 3 + maskedSubjectFields.length + 1
+ // ]
+ // );
+ // });
+
+ it("Verify a sent email whose body has an email address and an invitation code", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_with_body_parsing_test4.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+
+ const circuitInputs =
+ await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 640,
+ maxBodyLength: 768,
+ ignoreBodyHashCheck: false,
+ });
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+
+ const timestamp = 1725334030n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+
+ const maskedCommand = "Send 0.12 ETH to ";
+ const paddedMaskedCommand = relayerUtils.padString(maskedCommand, 605);
+ const maskedCommandFields =
+ relayerUtils.bytes2Fields(paddedMaskedCommand);
+ for (let idx = 0; idx < maskedCommandFields.length; ++idx) {
+ expect(BigInt(maskedCommandFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+
+ const fromAddr = "zkemail.relayer.test@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedCommandFields.length]
+ );
+
+ expect(1n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedCommandFields.length + 1
+ ]
+ );
+ });
+
+ it("Verify a sent email whose body has an invitation code", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_with_body_parsing_test5.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+
+ const circuitInputs =
+ await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 640,
+ maxBodyLength: 768,
+ ignoreBodyHashCheck: false,
+ });
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+
+ const timestamp = 1725334056n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+
+ const maskedCommand =
+ "Accept guardian request for 0x04884491560f38342C56E26BDD0fEAbb68E2d2FC";
+ const paddedMaskedCommand = relayerUtils.padString(maskedCommand, 605);
+ const maskedCommandFields =
+ relayerUtils.bytes2Fields(paddedMaskedCommand);
+ for (let idx = 0; idx < maskedCommandFields.length; ++idx) {
+ expect(BigInt(maskedCommandFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "zkemail.relayer.test@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedCommandFields.length]
+ );
+
+ expect(1n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedCommandFields.length + 1
+ ]
+ );
+ });
+
+ it("Verify a sent email whose body has an invitation code with sha precompute string", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_with_body_parsing_test5.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+
+ const accountCode =
+ "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76";
+
+ const circuitInputs =
+ await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 640,
+ maxBodyLength: 768,
+ ignoreBodyHashCheck: false,
+ shaPrecomputeSelector: '(<(=\r\n)?d(=\r\n)?i(=\r\n)?v(=\r\n)? (=\r\n)?i(=\r\n)?d(=\r\n)?=3D(=\r\n)?"(=\r\n)?[^"]*(=\r\n)?z(=\r\n)?k(=\r\n)?e(=\r\n)?m(=\r\n)?a(=\r\n)?i(=\r\n)?l(=\r\n)?[^"]*(=\r\n)?"(=\r\n)?[^>]*(=\r\n)?>(=\r\n)?)(=\r\n)?([^<>/]+)(<(=\r\n)?/(=\r\n)?d(=\r\n)?i(=\r\n)?v(=\r\n)?>(=\r\n)?)',
+ });
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+
+ const timestamp = 1725334056n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+
+ const maskedCommand =
+ "Accept guardian request for 0x04884491560f38342C56E26BDD0fEAbb68E2d2FC";
+ const paddedMaskedCommand = relayerUtils.padString(maskedCommand, 605);
+ const maskedCommandFields =
+ relayerUtils.bytes2Fields(paddedMaskedCommand);
+ for (let idx = 0; idx < maskedCommandFields.length; ++idx) {
+ expect(BigInt(maskedCommandFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+ const fromAddr = "zkemail.relayer.test@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedCommandFields.length]
+ );
+
+ expect(1n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedCommandFields.length + 1
+ ]
+ );
+ });
+
+ it("Verify a sent email whose body has an email address", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_with_body_parsing_test1.eml"
+ );
+
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+
+ const accountCode = await relayerUtils.genAccountCode();
+
+ const circuitInputs =
+ await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 640,
+ maxBodyLength: 768,
+ ignoreBodyHashCheck: false,
+ });
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+
+ const timestamp = 1725333972n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+
+ const maskedCommand = "Send 0.1 ETH to ";
+ const paddedMaskedCommand = relayerUtils.padString(maskedCommand, 605);
+ const maskedCommandFields =
+ relayerUtils.bytes2Fields(paddedMaskedCommand);
+ for (let idx = 0; idx < maskedCommandFields.length; ++idx) {
+ expect(BigInt(maskedCommandFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+
+ const fromAddr = "zkemail.relayer.test@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedCommandFields.length]
+ );
+
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedCommandFields.length + 1
+ ]
+ );
+ });
+
+ it("Verify a sent email whose body does not have an email address", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_with_body_parsing_test2.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+
+ const accountCode = await relayerUtils.genAccountCode();
+ const circuitInputs =
+ await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 640,
+ maxBodyLength: 768,
+ ignoreBodyHashCheck: false,
+ });
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+
+ const timestamp = 1725333989n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+
+ const maskedCommand = "Swap 1 ETH to DAI";
+ const paddedMaskedCommand = relayerUtils.padString(maskedCommand, 605);
+ const maskedCommandFields =
+ relayerUtils.bytes2Fields(paddedMaskedCommand);
+ for (let idx = 0; idx < maskedCommandFields.length; ++idx) {
+ expect(BigInt(maskedCommandFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+
+ const fromAddr = "zkemail.relayer.test@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedCommandFields.length]
+ );
+
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedCommandFields.length + 1
+ ]
+ );
+ });
+
+ it("Verify a sent email whose from field has a dummy email address name", async () => {
+ const emailFilePath = path.join(
+ __dirname,
+ "./emails/email_auth_with_body_parsing_test3.eml"
+ );
+ const emailRaw = readFileSync(emailFilePath, "utf8");
+ const parsedEmail = await relayerUtils.parseEmail(emailRaw);
+
+ const accountCode = await relayerUtils.genAccountCode();
+
+ const circuitInputs =
+ await genEmailCircuitInput(emailFilePath, accountCode, {
+ maxHeaderLength: 640,
+ maxBodyLength: 768,
+ ignoreBodyHashCheck: false,
+ });
+ const witness = await circuit.calculateWitness(circuitInputs);
+ await circuit.checkConstraints(witness);
+
+ const domainName = "gmail.com";
+ const paddedDomain = relayerUtils.padString(domainName, 255);
+ const domainFields = relayerUtils.bytes2Fields(paddedDomain);
+ for (let idx = 0; idx < domainFields.length; ++idx) {
+ expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]);
+ }
+
+ const expectedPubKeyHash = relayerUtils.publicKeyHash(
+ parsedEmail.publicKey
+ );
+ expect(BigInt(expectedPubKeyHash)).toEqual(
+ witness[1 + domainFields.length]
+ );
+
+ const expectedEmailNullifier = relayerUtils.emailNullifier(
+ parsedEmail.signature
+ );
+ expect(BigInt(expectedEmailNullifier)).toEqual(
+ witness[1 + domainFields.length + 1]
+ );
+
+ const timestamp = 1725334002n;
+ expect(timestamp).toEqual(witness[1 + domainFields.length + 2]);
+
+ const maskedCommand = "Send 1 ETH to ";
+ const paddedMaskedCommand = relayerUtils.padString(maskedCommand, 605);
+ const maskedCommandFields =
+ relayerUtils.bytes2Fields(paddedMaskedCommand);
+ for (let idx = 0; idx < maskedCommandFields.length; ++idx) {
+ expect(BigInt(maskedCommandFields[idx])).toEqual(
+ witness[1 + domainFields.length + 3 + idx]
+ );
+ }
+
+ const fromAddr = "zkemail.relayer.test@gmail.com";
+ const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode);
+ expect(BigInt(accountSalt)).toEqual(
+ witness[1 + domainFields.length + 3 + maskedCommandFields.length]
+ );
+ expect(0n).toEqual(
+ witness[
+ 1 + domainFields.length + 3 + maskedCommandFields.length + 1
+ ]
+ );
+ });
+});
diff --git a/packages/circuits/tests/emails/email_auth_with_body_parsing_test1.eml b/packages/circuits/tests/emails/email_auth_with_body_parsing_test1.eml
new file mode 100644
index 00000000..acc2a526
--- /dev/null
+++ b/packages/circuits/tests/emails/email_auth_with_body_parsing_test1.eml
@@ -0,0 +1,99 @@
+Delivered-To: shryas.londhe@gmail.com
+Received: by 2002:a05:6a20:de1b:b0:1c3:edfb:6113 with SMTP id kz27csp2292880pzb;
+ Mon, 2 Sep 2024 20:26:13 -0700 (PDT)
+X-Received: by 2002:a05:6808:150b:b0:3d9:dcf8:3450 with SMTP id 5614622812f47-3df1d6c9fd0mr10834263b6e.33.1725333973230;
+ Mon, 02 Sep 2024 20:26:13 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1725333973; cv=none;
+ d=google.com; s=arc-20160816;
+ b=Or2c81F0BxQPujZAycIXjnI4Da1ttYJssstQ8U0SoqyoScfAebQ9Y/bsryIAjabd4G
+ L3aorv/kCT8M1g7iHiw/NpN5ZHsi8QsLOvFEpHwPcP7OSsw+jqk2Wc3xNPxp7HuQ144Y
+ BNexXMUdyy/a8HqxQEO1VRiFgmioumOmqq36ZLYEE2ca2737uWPK5xeeh7USLcCCBGNN
+ Lrs6iXTdorWf23DA5fc5CaGGHSRLNU7uWdc9dl3pOJmOKe2Px7e/YjL76swK7bcugUOh
+ M45oY5IpQTH+ffl3bGPj7ZAl6mRgmxR0IfqcHMs9T1hh+/PCLYlx2NT2L+XBnnvZrkeV
+ smHw==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+ h=subject:to:from:mime-version:date:message-id:dkim-signature;
+ bh=f9Hc/nL83NGWPdJxrViC0AIkkQ4clr94hybomVgejcc=;
+ fh=QOoFRDdHXpnQH3LJHwmsRKR4EZHwtZQ4a9eIuVllZDs=;
+ b=M+pAcWxMY0vGS6StP3u3EAIrXI1s5kJLsnVlg04cneoduJJbKJhzmqn54eTBFPAz3P
+ p+8JPc5oqEIIJNo9z7XXcUJgPN4JxjL1PRJK3HC9/RJiJzxConHmk2pgQR8yPjCBP4vO
+ 7aYChPCqFp4sg8Igu2944AXu+HrKZ0fjX7jLjKadZP0oDxEuYa9V6xGCksrlv3SEhjBq
+ 8qlvUBs8dmE6tbn0d++xLtMi9Nf0EguWrpSMlM6jeQypQqP5d3cCAWytkneXGYMVFnuw
+ 4wdzLx6ES9kGcMmPocPBxMvTSLleVrtfqc4/htq0hvrL3RTJH+/6t8KJa5Q/TyNv/Wfw
+ vHJQ==;
+ dara=google.com
+ARC-Authentication-Results: i=1; mx.google.com;
+ dkim=pass header.i=@gmail.com header.s=20230601 header.b=O6zda08N;
+ spf=pass (google.com: domain of zkemail.relayer.test@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=zkemail.relayer.test@gmail.com;
+ dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
+ dara=pass header.i=@gmail.com
+Return-Path: Hello!
+This is a test email with a basic HTML body.
+Send 0.1 ETH to alice@gmail.com
=20
+ Thank you!
+ + + =20 +--===============2959808677043960680==-- diff --git a/packages/circuits/tests/emails/email_auth_with_body_parsing_test2.eml b/packages/circuits/tests/emails/email_auth_with_body_parsing_test2.eml new file mode 100644 index 00000000..acbdc814 --- /dev/null +++ b/packages/circuits/tests/emails/email_auth_with_body_parsing_test2.eml @@ -0,0 +1,99 @@ +Delivered-To: shryas.londhe@gmail.com +Received: by 2002:a05:6a20:de1b:b0:1c3:edfb:6113 with SMTP id kz27csp2292972pzb; + Mon, 2 Sep 2024 20:26:30 -0700 (PDT) +X-Received: by 2002:a05:6a21:33aa:b0:1ce:d418:8ee6 with SMTP id adf61e73a8af0-1ced4188f03mr11873583637.41.1725333989839; + Mon, 02 Sep 2024 20:26:29 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725333989; cv=none; + d=google.com; s=arc-20160816; + b=VkgqqX17BqArmHM9zE1Sv38Sy/WhZlJqc8+fTIlevFZmhTSupOGBBP/PJlU7e7GrKD + ANVk+jaZ8iSrDXRrKz9kl7b8PzwgBjLx6zZS7ukjQCFHhjRLgfHx85S9IpbHWmV3s85A + +fAf8mjJSGIQTfcvAr/CsD7C01/s62Z5cB6Ws42ahzrs3a+jG6g//LVEpt4OxI8MlpD3 + NpLh4JISg/+Qj3WtDc+vGH8geo+K3l84sncA+3ssSbl7obf+paM11oRmQ0HZ6Kxjgl42 + DoatwZc92XdNwyLYRrj1GBP5Wjj4B0Nsl2+gPaZfNeJRjSV5vIcrNQFWQAUVPpABJNOs + MvJA== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=kMJCDTrnZkOSpmyPJBDtHkISRN8g4Yz0r8180BggkYs=; + fh=QOoFRDdHXpnQH3LJHwmsRKR4EZHwtZQ4a9eIuVllZDs=; + b=Pe1HohCMTk6Sk+AP6eKP9xNdL1jC7oOuSYn75vUkF4y7U1/aWCFn2qmQnqJGLH3Re3 + vffLCSoyC53egaN3PKUppB/OKplKet5va8JpWpTVktwxn+aWJJi2QZJlruM7pnLQuRNq + iLw9TgrCYsfKE4d9Z4MRH15AfJXgXk2iqjUFDsBlNTQ4GBJ3bP3BG78lGCe44Gg1Zu/c + yBTNFr4sxa/UmcaPxK3jPIdYcWQkNvvellzySbLYZO1jBqKBoLlsSHSSoAoHSJL9jEVu + MLCCZgi4FIq7WYk6kQGCUJOSrbhhrRNNxlUcxp3IjLaVJfBOmC4wePFf+SVPcyiC8xes + R+vw==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=MVtCnZAi; + spf=pass (google.com: domain of zkemail.relayer.test@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=zkemail.relayer.test@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +Return-Path:Hello!
+This is a test email with a basic HTML body.
+Swap 1 ETH to DAI
=20
+ Thank you!
+ + + =20 +--===============0042709324325514954==-- diff --git a/packages/circuits/tests/emails/email_auth_with_body_parsing_test3.eml b/packages/circuits/tests/emails/email_auth_with_body_parsing_test3.eml new file mode 100644 index 00000000..73597d3e --- /dev/null +++ b/packages/circuits/tests/emails/email_auth_with_body_parsing_test3.eml @@ -0,0 +1,99 @@ +Delivered-To: shryas.londhe@gmail.com +Received: by 2002:a05:6a20:de1b:b0:1c3:edfb:6113 with SMTP id kz27csp2293050pzb; + Mon, 2 Sep 2024 20:26:43 -0700 (PDT) +X-Received: by 2002:a17:902:d2c2:b0:202:435b:211a with SMTP id d9443c01a7336-20545e4436bmr97493665ad.12.1725334002979; + Mon, 02 Sep 2024 20:26:42 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725334002; cv=none; + d=google.com; s=arc-20160816; + b=uEiGeXd1Z2Ju6FYVT8BfHRNXS/toJyw+XUs77ZJ8X+mxFccncK8/nGpZz+CPQ700vH + wjzVe1RiTP80fdf2PlxUkklZaqiJijFcTh3AVQRWHqil83JZXwm48YURmmghJuRPxnw9 + jE3Quc8c3NeqmVvkKkSvQs0oU0Esbk5mIzvVwenXuNIEkzrbf7d2pgi/ApR1p4D9kVZM + mf5mnKFUTvehd2sCESq5k+FjpOkhAk1oHD0IFWHqEjy2xc/3ZBdV0lrhrN20OHrXOrRW + HgxXrwa8Uj7Xtah9u5QEqgNju6mgtyK4CIZX0qUoONXzfwBeYKlN3C8Pq5cRYohyyOr8 + wV7g== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=f8710STYOn4HlDHwwdcTMiys25mwsCzNla6ZCLV3yMg=; + fh=QOoFRDdHXpnQH3LJHwmsRKR4EZHwtZQ4a9eIuVllZDs=; + b=Yy9NLuG9CzblzXaTHPu2iZ4TJCgKRcm11vdgSTlSn/yzA5CJEoM8WlCrcGCNIO7vkz + OUkz+FE0vqymKmljTvcMJvMVyjGPPKZqvuiZJshsyGI1y/lFGnl/fbc3jwX+T+Y7MTTO + F6C2ljMd5T6JlANdNZihzy9jPr5otzVj1GJpHNr5m/eoY6PGBtWGlIil8NssHtG3fBUH + zdkVPhjoAiXlxBpZGaoqCSPgE+uEe6atcanA+35qhZuMcEkLpJBtTwVdko38JZKDOMpL + RJF1MW18BIhT+d1D99f6dwzwgGtMDeh4S2f6T0NPoLmuhRvfAHkTjOVP4sQdxeIbI1Zo + ys8w==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=lMQLdMSV; + spf=pass (google.com: domain of zkemail.relayer.test@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=zkemail.relayer.test@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +Return-Path:Hello!
+This is a test email with a basic HTML body.
+Send 1 ETH to bob@example.com
=20
+ Thank you!
+ + + =20 +--===============0987519910738789604==-- diff --git a/packages/circuits/tests/emails/email_auth_with_body_parsing_test4.eml b/packages/circuits/tests/emails/email_auth_with_body_parsing_test4.eml new file mode 100644 index 00000000..a8ce5724 --- /dev/null +++ b/packages/circuits/tests/emails/email_auth_with_body_parsing_test4.eml @@ -0,0 +1,100 @@ +Delivered-To: shryas.londhe@gmail.com +Received: by 2002:a05:6a20:de1b:b0:1c3:edfb:6113 with SMTP id kz27csp2293211pzb; + Mon, 2 Sep 2024 20:27:11 -0700 (PDT) +X-Received: by 2002:a17:903:18f:b0:206:8915:1c74 with SMTP id d9443c01a7336-20689151e9bmr33323015ad.21.1725334030783; + Mon, 02 Sep 2024 20:27:10 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725334030; cv=none; + d=google.com; s=arc-20160816; + b=wdNsVOozRFI1hgKVloWZxS53oU61K7xFzzRplY66LZ913+rNgyp5hm7xagL01q7G3f + c5eQzmZJY27rz+/GIcOzCrREyMZ4i3mZO12Na/rDUO0ZOSPvengwE0LUq74Kf8BPHTD8 + W8kYIpcAs2Kj0mVjjOkpNYLTf6CQXVuVXfkO9lbI0tiHChRaMe0HcBDiukLuw1QnSPyw + JHKGL+oraOajrKgQn+9v2Gq1qRgTwtiWPguzzVH8vFiKdnN2EUtsEkYG28ltJ//+tZQZ + zWp8w1QCVgpkgo2oDIRQwSR+vDD/HcLeI6yYggbJFzxH0WfraueH6RKtMo/pJP/2wEWz + eAkw== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=LfVYp25jYyoop0tyJg90MQNaEpNP30xYSQbkPrcxeys=; + fh=QOoFRDdHXpnQH3LJHwmsRKR4EZHwtZQ4a9eIuVllZDs=; + b=jR9YEYcEtB26BsWiy3lo8pWH+cJxY2Th0NhrtW45C/8kTjGM8MnVBH8sx/11pBVynv + Y1VTa6g1uh9Iw0ffRX5mq85uJLr/5YP4KJz50pj3KA00852NQbgQWlOK+fWdGfDmnjXx + b5bFrqrz5K5MGi4aWLvblNx3guKgmxCoTX2gVyZusdVqWKmSkS/iZFOwED8hmhiyAuU+ + 6IbtTS1T0YZfhJf8DSr7Ek+KPUn+obM6o8iFIXfEZ1DmflJ34SLqeEmIP82h2Fp7Fev7 + u28/a7n89aV0LBvxmuFaz6JB24P6anu1bH9yVtUHUTmJPFUMZ5veDSEd+Ujd5AolTJRL + a6zw==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=mXlcPFDH; + spf=pass (google.com: domain of zkemail.relayer.test@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=zkemail.relayer.test@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +Return-Path:Hello!
+This is a test email with a basic HTML body.
+Send 0.12 ETH to alice@gmail.com code 01eb9b204=
+cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76
=20
+ Thank you!
+ + + =20 +--===============8219893973391566718==-- diff --git a/packages/circuits/tests/emails/email_auth_with_body_parsing_test5.eml b/packages/circuits/tests/emails/email_auth_with_body_parsing_test5.eml new file mode 100644 index 00000000..6c690e76 --- /dev/null +++ b/packages/circuits/tests/emails/email_auth_with_body_parsing_test5.eml @@ -0,0 +1,101 @@ +Delivered-To: shryas.londhe@gmail.com +Received: by 2002:a05:6a20:de1b:b0:1c3:edfb:6113 with SMTP id kz27csp2293347pzb; + Mon, 2 Sep 2024 20:27:37 -0700 (PDT) +X-Received: by 2002:a05:6a00:cd3:b0:70d:34aa:6d51 with SMTP id d2e1a72fcca58-717457407c2mr7170342b3a.6.1725334056856; + Mon, 02 Sep 2024 20:27:36 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725334056; cv=none; + d=google.com; s=arc-20160816; + b=FF4IN2z9s+3xgu/A4NYxIwC8MEnOyT3+2fcyPO96NqZf5WNUje4/5SGy6+ihT0Iy0m + 9sn/WLazma2OV3egdpx0Wm07Mq3oEY9zYF9gTVGhee65YXsDOhc3jMX19Ff4NUuq8euI + x9rSU8CI3sKUjgg9OcnGTsuTwz1dwUn9EDxIFpFp2sk0vrCKU9ACfU4GOLkQPkCpEHOO + fr5fKNWH6gY72yqOiElwE2wzKo5ewWvO5OBLZw+ba295IFhJ9rBIbejvdXiuXdj8NIqa + qJjr/lWfcEnl3eSyhlIUaUuM0OmALKFjU/V+XkMfRm8EMfBqXwuS2QjDKCyZqQRnuK86 + IsIQ== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=WgHRFiGakPoqy0EgpGEskuPH5Lowb5jxC1QjM/mOplQ=; + fh=QOoFRDdHXpnQH3LJHwmsRKR4EZHwtZQ4a9eIuVllZDs=; + b=MkLaavfotmEo4N1+appKWr23gEdy8YLU6q7Dtm6wNzr6faMtkqdk32/1jnzZWdZ1/N + 0dTqvSu1XrG8BC02MUDRgIMiiJAWxIsg81m3ep0/+/61lz4eQcqTo5Jus6V1aV3N7Laa + pGbHq3OESQQtU9n9OBD53V2uaa8+sP1rMyp/TEvd3xZK5aXHVqvntyShhTu9BRS0COYr + 2FsBf2PkVAeAp/l/J+VtLk7+wIi18sx7UMFM6TyiF1Z8Vr0DUwrUm8Q8pi4a+0R7kKht + IK7fUJ7sNVp99XeP79DVHKJAFXcD5hwrouoZyGBzLLPegoCPECHrE43rWwMUdRuvGcfG + 0aug==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=UxRTsGzj; + spf=pass (google.com: domain of zkemail.relayer.test@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=zkemail.relayer.test@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +Return-Path:Hello!
+This is a test email with a basic HTML body.
+Accept guardian request for 0x04884491560f38342=
+C56E26BDD0fEAbb68E2d2FC code 01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc0=
+7763475c135d575b76
=20
+ Thank you!
+ + + =20 +--===============2480312449962561214==-- diff --git a/packages/circuits/tests/emails/email_auth_with_body_parsing_test6.eml b/packages/circuits/tests/emails/email_auth_with_body_parsing_test6.eml new file mode 100644 index 00000000..739cea3b --- /dev/null +++ b/packages/circuits/tests/emails/email_auth_with_body_parsing_test6.eml @@ -0,0 +1,99 @@ +Delivered-To: shryas.londhe@gmail.com +Received: by 2002:a05:6a20:de1b:b0:1c3:edfb:6113 with SMTP id kz27csp2293443pzb; + Mon, 2 Sep 2024 20:27:54 -0700 (PDT) +X-Received: by 2002:a05:6a00:13a6:b0:70b:5394:8cae with SMTP id d2e1a72fcca58-715dfc76152mr18975970b3a.28.1725334074235; + Mon, 02 Sep 2024 20:27:54 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725334074; cv=none; + d=google.com; s=arc-20160816; + b=un5D2W+ZqEo7Jtp7IWmKsUjcrtaX6AduEjry1n1w1X0fEAa8GhlMid0yDTtijYSet9 + 5CFIhMmNDbo4qgL1nhkUdMYb9hUXIDfucyGGcV5uGXRVgH4zKf4BQsJCX5yejGrUJtyL + kShNK4PNlxg9bwlzFzmFxghdEq6hh4XC5CKMqq7PjhpupTwlNd58m+p9DW9De8agKUul + XXqaPLi944hidp8j4pmilewmO9wvMsPsb4nFJ6Y/kkY89oylCkxCF7PLlJPfPpkrr0E/ + 8JIFzzOCGMi8EzJ1XBt05DhDmYCqemD4u/evzNkHvVV4c1uwKcZ0A6Pr1WNNSYy0EbIr + iAmQ== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=pgWkiyvv1a5DWOqSsp+0OWFkqbooRoO1bv8OEpIkz1c=; + fh=QOoFRDdHXpnQH3LJHwmsRKR4EZHwtZQ4a9eIuVllZDs=; + b=DrjGCyEXF+d99x62EfQqgRYgMocvBuyKI619jIwi41axy/jPVfTVdZVLQ4HY91j6hZ + z/pxIsjf24nHbmXSA9LkZYaSHBLpvWdXNXApH23u8s3Z6hbRnvia3Iz+q2KtwGyfxErK + gBQb2ziysfe7ZrJ5FGnrc9Uak3prq9EfRe0s1Qo5xAJgRRUDhKaptJdxNtWQ6Gsy9xtN + X8R6SgvGygR8W5BM6fYMO0ty3qPm55MNbPEdgrJz6pqgDLbgzUeuCKEwcTrQ4EhE6A6O + aYAt8BcNMtLfeHpe/EHswDs9S2rbjMmS1WpUO9UnQKAekn5xfMM3oLhtMCSmP1sDQE8L + wlxw==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=XRK4dsJz; + spf=pass (google.com: domain of zkemail.relayer.test@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=zkemail.relayer.test@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +Return-Path:Hello!
+This is a test email with a basic HTML body.
+from:adversary@test.com
=20
+ Thank you!
+ + + =20 +--===============3823408927414188670==-- diff --git a/packages/circuits/tests/invitation_code_regex.test.ts b/packages/circuits/tests/invitation_code_regex.test.ts index 9621c444..7cfbc089 100644 --- a/packages/circuits/tests/invitation_code_regex.test.ts +++ b/packages/circuits/tests/invitation_code_regex.test.ts @@ -3,172 +3,184 @@ const wasm_tester = circom_tester.wasm; import * as path from "path"; const relayerUtils = require("@zk-email/relayer-utils"); const option = { - include: path.join(__dirname, "../../../node_modules"), + include: path.join(__dirname, "../../../node_modules"), }; // const grumpkin = require("circom-grumpkin"); jest.setTimeout(120000); describe("Invitation Code Regex", () => { - it("invitation code", async () => { - const codeStr = "Code 123abc"; - const paddedStr = relayerUtils.padString(codeStr, 256); - const circuitInputs = { - msg: paddedStr, - }; - const circuit = await wasm_tester( - path.join(__dirname, "./circuits/test_invitation_code_regex.circom"), - option - ); - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - // console.log(witness); - expect(1n).toEqual(witness[1]); - const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; - for (let idx = 0; idx < 256; ++idx) { - if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { - expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); - } else { - expect(0n).toEqual(witness[2 + idx]); - } - } - }); + it("invitation code", async () => { + const codeStr = "Code 123abc"; + const paddedStr = relayerUtils.padString(codeStr, 256); + const circuitInputs = { + msg: paddedStr, + }; + const circuit = await wasm_tester( + path.join( + __dirname, + "./circuits/test_invitation_code_regex.circom" + ), + option + ); + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + // console.log(witness); + expect(1n).toEqual(witness[1]); + const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; + for (let idx = 0; idx < 256; ++idx) { + if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { + expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); + } else { + expect(0n).toEqual(witness[2 + idx]); + } + } + }); - it("invitation code in the subject", async () => { - const codeStr = "Swap 0.1 ETH to DAI code 123abc"; - const paddedStr = relayerUtils.padString(codeStr, 256); - const circuitInputs = { - msg: paddedStr, - }; - const circuit = await wasm_tester( - path.join(__dirname, "./circuits/test_invitation_code_regex.circom"), - option - ); - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - // console.log(witness); - expect(1n).toEqual(witness[1]); - const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; - // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; - // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); - for (let idx = 0; idx < 256; ++idx) { - if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { - expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); - } else { - expect(0n).toEqual(witness[2 + idx]); - } - } - }); + it("invitation code in the subject", async () => { + const codeStr = "Swap 0.1 ETH to DAI code 123abc"; + const paddedStr = relayerUtils.padString(codeStr, 256); + const circuitInputs = { + msg: paddedStr, + }; + const circuit = await wasm_tester( + path.join( + __dirname, + "./circuits/test_invitation_code_regex.circom" + ), + option + ); + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + // console.log(witness); + expect(1n).toEqual(witness[1]); + const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; + // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; + // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); + for (let idx = 0; idx < 256; ++idx) { + if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { + expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); + } else { + expect(0n).toEqual(witness[2 + idx]); + } + } + }); - it("email address and invitation code in the subject", async () => { - const codeStr = "Send 0.1 ETH to alice@gmail.com code 123abc"; - const paddedStr = relayerUtils.padString(codeStr, 256); - const circuitInputs = { - msg: paddedStr, - }; - const circuit = await wasm_tester( - path.join(__dirname, "./circuits/test_invitation_code_regex.circom"), - option - ); - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - // console.log(witness); - expect(1n).toEqual(witness[1]); - const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; - // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; - // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); - for (let idx = 0; idx < 256; ++idx) { - if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { - expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); - } else { - expect(0n).toEqual(witness[2 + idx]); - } - } - }); + it("email address and invitation code in the subject", async () => { + const codeStr = "Send 0.1 ETH to alice@gmail.com code 123abc"; + const paddedStr = relayerUtils.padString(codeStr, 256); + const circuitInputs = { + msg: paddedStr, + }; + const circuit = await wasm_tester( + path.join( + __dirname, + "./circuits/test_invitation_code_regex.circom" + ), + option + ); + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + // console.log(witness); + expect(1n).toEqual(witness[1]); + const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; + // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; + // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); + for (let idx = 0; idx < 256; ++idx) { + if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { + expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); + } else { + expect(0n).toEqual(witness[2 + idx]); + } + } + }); - it("invitation code in the email address", async () => { - const codeStr = "sepolia+code123456@sendeth.org"; - const paddedStr = relayerUtils.padString(codeStr, 256); - const circuitInputs = { - msg: paddedStr, - }; - const circuit = await wasm_tester( - path.join(__dirname, "./circuits/test_invitation_code_regex.circom"), - option - ); - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - // console.log(witness); - expect(1n).toEqual(witness[1]); - const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; - // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; - // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); - for (let idx = 0; idx < 256; ++idx) { - if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { - expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); - } else { - expect(0n).toEqual(witness[2 + idx]); - } - } - }); + it("invitation code in the email address", async () => { + const codeStr = "sepolia+code123456@sendeth.org"; + const paddedStr = relayerUtils.padString(codeStr, 256); + const circuitInputs = { + msg: paddedStr, + }; + const circuit = await wasm_tester( + path.join( + __dirname, + "./circuits/test_invitation_code_regex.circom" + ), + option + ); + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + // console.log(witness); + expect(1n).toEqual(witness[1]); + const prefixIdxes = relayerUtils.extractInvitationCodeIdxes(codeStr)[0]; + // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; + // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); + for (let idx = 0; idx < 256; ++idx) { + if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { + expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); + } else { + expect(0n).toEqual(witness[2 + idx]); + } + } + }); - it("prefix + invitation code in the subject", async () => { - const codeStr = "Swap 0.1 ETH to DAI code 123abc"; - const paddedStr = relayerUtils.padString(codeStr, 256); - const circuitInputs = { - msg: paddedStr, - }; - const circuit = await wasm_tester( - path.join( - __dirname, - "./circuits/test_invitation_code_with_prefix_regex.circom" - ), - option - ); - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - // console.log(witness); - expect(1n).toEqual(witness[1]); - const prefixIdxes = - relayerUtils.extractInvitationCodeWithPrefixIdxes(codeStr)[0]; - // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; - // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); - for (let idx = 0; idx < 256; ++idx) { - if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { - expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); - } else { - expect(0n).toEqual(witness[2 + idx]); - } - } - }); + it("prefix + invitation code in the subject", async () => { + const codeStr = "Swap 0.1 ETH to DAI code 123abc"; + const paddedStr = relayerUtils.padString(codeStr, 256); + const circuitInputs = { + msg: paddedStr, + }; + const circuit = await wasm_tester( + path.join( + __dirname, + "./circuits/test_invitation_code_with_prefix_regex.circom" + ), + option + ); + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + // console.log(witness); + expect(1n).toEqual(witness[1]); + const prefixIdxes = + relayerUtils.extractInvitationCodeWithPrefixIdxes(codeStr)[0]; + // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; + // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); + for (let idx = 0; idx < 256; ++idx) { + if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { + expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); + } else { + expect(0n).toEqual(witness[2 + idx]); + } + } + }); - it("prefix + invitation code in the subject 2", async () => { - const codeStr = - "Re: Accept guardian request for 0x04884491560f38342C56E26BDD0fEAbb68E2d2FC Code 01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76"; - const paddedStr = relayerUtils.padString(codeStr, 256); - const circuitInputs = { - msg: paddedStr, - }; - const circuit = await wasm_tester( - path.join( - __dirname, - "./circuits/test_invitation_code_with_prefix_regex.circom" - ), - option - ); - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - // console.log(witness); - expect(1n).toEqual(witness[1]); - const prefixIdxes = - relayerUtils.extractInvitationCodeWithPrefixIdxes(codeStr)[0]; - // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; - // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); - for (let idx = 0; idx < 256; ++idx) { - if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { - expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); - } else { - expect(0n).toEqual(witness[2 + idx]); - } - } - }); + it("prefix + invitation code in the subject 2", async () => { + const codeStr = + "Re: Accept guardian request for 0x04884491560f38342C56E26BDD0fEAbb68E2d2FC Code 01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76"; + const paddedStr = relayerUtils.padString(codeStr, 256); + const circuitInputs = { + msg: paddedStr, + }; + const circuit = await wasm_tester( + path.join( + __dirname, + "./circuits/test_invitation_code_with_prefix_regex.circom" + ), + option + ); + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + // console.log(witness); + expect(1n).toEqual(witness[1]); + const prefixIdxes = + relayerUtils.extractInvitationCodeWithPrefixIdxes(codeStr)[0]; + // const revealedStartIdx = emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))[0][0]; + // console.log(emailWalletUtils.extractSubstrIdxes(codeStr, readFileSync(path.join(__dirname, "../src/regexes/invitation_code.json"), "utf8"))); + for (let idx = 0; idx < 256; ++idx) { + if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) { + expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]); + } else { + expect(0n).toEqual(witness[2 + idx]); + } + } + }); }); diff --git a/packages/circuits/tests/recipient_enabled.test.ts b/packages/circuits/tests/recipient_enabled.test.ts index d38fe35a..bfefeb27 100644 --- a/packages/circuits/tests/recipient_enabled.test.ts +++ b/packages/circuits/tests/recipient_enabled.test.ts @@ -2,291 +2,376 @@ const circom_tester = require("circom_tester"); const wasm_tester = circom_tester.wasm; import * as path from "path"; const relayerUtils = require("@zk-email/relayer-utils"); -import { genEmailAuthInput } from "../helpers/email_auth"; +import { genEmailCircuitInput } from "../helpers/email_auth"; import { genRecipientInput } from "../helpers/recipient"; import { readFileSync } from "fs"; jest.setTimeout(1440000); describe("Email Auth", () => { - let circuit; - beforeAll(async () => { - const option = { - include: path.join(__dirname, "../../../node_modules"), - }; - circuit = await wasm_tester( - path.join(__dirname, "./circuits/email_auth_with_recipient.circom"), - option - ); - }); + let circuit; + beforeAll(async () => { + const option = { + include: path.join(__dirname, "../../../node_modules"), + }; + circuit = await wasm_tester( + path.join(__dirname, "./circuits/email_auth_with_recipient.circom"), + option + ); + }); - it("Verify a sent email whose subject has an email address", async () => { - const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml"); - const emailRaw = readFileSync(emailFilePath, "utf8"); - const parsedEmail = await relayerUtils.parseEmail(emailRaw); - console.log(parsedEmail.canonicalizedHeader); - const accountCode = await relayerUtils.genAccountCode(); - const emailAuthInput = await genEmailAuthInput(emailFilePath, accountCode); - const recipientInput = await genRecipientInput(emailFilePath); - const circuitInputs = { - ...emailAuthInput, - subject_email_addr_idx: recipientInput.subject_email_addr_idx, - }; - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - const domainName = "gmail.com"; - const paddedDomain = relayerUtils.padString(domainName, 255); - const domainFields = relayerUtils.bytes2Fields(paddedDomain); - for (let idx = 0; idx < domainFields.length; ++idx) { - expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); - } - const expectedPubKeyHash = relayerUtils.publicKeyHash( - parsedEmail.publicKey - ); - expect(BigInt(expectedPubKeyHash)).toEqual( - witness[1 + domainFields.length] - ); - const expectedEmailNullifier = relayerUtils.emailNullifier( - parsedEmail.signature - ); - expect(BigInt(expectedEmailNullifier)).toEqual( - witness[1 + domainFields.length + 1] - ); - const timestamp = 1694989812n; - expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); - const maskedSubject = "Send 0.1 ETH to "; - const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); - const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject); - for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { - expect(BigInt(maskedSubjectFields[idx])).toEqual( - witness[1 + domainFields.length + 3 + idx] - ); - } - const fromAddr = "suegamisora@gmail.com"; - const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); - expect(BigInt(accountSalt)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length] - ); - expect(0n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1] - ); - expect(1n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 2] - ); - const recipientEmailAddr = "alice@gmail.com"; - const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( - recipientEmailAddr, - parsedEmail.signature - ); - expect(BigInt(emailAddrCommit)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 3] - ); - }); + it("Verify a sent email whose subject has an email address", async () => { + const emailFilePath = path.join( + __dirname, + "./emails/email_auth_test1.eml" + ); + const emailRaw = readFileSync(emailFilePath, "utf8"); + const parsedEmail = await relayerUtils.parseEmail(emailRaw); + console.log(parsedEmail.canonicalizedHeader); + const accountCode = await relayerUtils.genAccountCode(); + const { + body_hash_idx, + precomputed_sha, + padded_body, + padded_body_len, + command_idx, + padded_cleaned_body, + ...emailAuthInput + } = await genEmailCircuitInput(emailFilePath, accountCode, { + maxHeaderLength: 1024, + ignoreBodyHashCheck: true, + }); + const recipientInput = await genRecipientInput(emailFilePath); + const circuitInputs = { + ...emailAuthInput, + subject_email_addr_idx: recipientInput.subject_email_addr_idx, + }; + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + const domainName = "gmail.com"; + const paddedDomain = relayerUtils.padString(domainName, 255); + const domainFields = relayerUtils.bytes2Fields(paddedDomain); + for (let idx = 0; idx < domainFields.length; ++idx) { + expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); + } + const expectedPubKeyHash = relayerUtils.publicKeyHash( + parsedEmail.publicKey + ); + expect(BigInt(expectedPubKeyHash)).toEqual( + witness[1 + domainFields.length] + ); + const expectedEmailNullifier = relayerUtils.emailNullifier( + parsedEmail.signature + ); + expect(BigInt(expectedEmailNullifier)).toEqual( + witness[1 + domainFields.length + 1] + ); + const timestamp = 1694989812n; + expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); + const maskedSubject = "Send 0.1 ETH to "; + const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); + const maskedSubjectFields = + relayerUtils.bytes2Fields(paddedMaskedSubject); + for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { + expect(BigInt(maskedSubjectFields[idx])).toEqual( + witness[1 + domainFields.length + 3 + idx] + ); + } + const fromAddr = "suegamisora@gmail.com"; + const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); + expect(BigInt(accountSalt)).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length] + ); + expect(0n).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 1 + ] + ); + expect(1n).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 2 + ] + ); + const recipientEmailAddr = "alice@gmail.com"; + const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( + recipientEmailAddr, + parsedEmail.signature + ); + expect(BigInt(emailAddrCommit)).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 3 + ] + ); + }); - it("Verify a sent email whose from field has a dummy email address name", async () => { - const emailFilePath = path.join(__dirname, "./emails/email_auth_test3.eml"); - const emailRaw = readFileSync(emailFilePath, "utf8"); - const parsedEmail = await relayerUtils.parseEmail(emailRaw); - console.log(parsedEmail.canonicalizedHeader); - const accountCode = await relayerUtils.genAccountCode(); - const emailAuthInput = await genEmailAuthInput(emailFilePath, accountCode); - const recipientInput = await genRecipientInput(emailFilePath); - const circuitInputs = { - ...emailAuthInput, - subject_email_addr_idx: recipientInput.subject_email_addr_idx, - }; - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - const domainName = "gmail.com"; - const paddedDomain = relayerUtils.padString(domainName, 255); - const domainFields = relayerUtils.bytes2Fields(paddedDomain); - for (let idx = 0; idx < domainFields.length; ++idx) { - expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); - } - const expectedPubKeyHash = relayerUtils.publicKeyHash( - parsedEmail.publicKey - ); - expect(BigInt(expectedPubKeyHash)).toEqual( - witness[1 + domainFields.length] - ); - const expectedEmailNullifier = relayerUtils.emailNullifier( - parsedEmail.signature - ); - expect(BigInt(expectedEmailNullifier)).toEqual( - witness[1 + domainFields.length + 1] - ); - const timestamp = 1696965932n; - expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); - const maskedSubject = "Send 1 ETH to "; - const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); - const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject); - for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { - expect(BigInt(maskedSubjectFields[idx])).toEqual( - witness[1 + domainFields.length + 3 + idx] - ); - } - const fromAddr = "suegamisora@gmail.com"; - const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); - expect(BigInt(accountSalt)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length] - ); - expect(0n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1] - ); - expect(1n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 2] - ); - const recipientEmailAddr = "bob@example.com"; - const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( - recipientEmailAddr, - parsedEmail.signature - ); - expect(BigInt(emailAddrCommit)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 3] - ); - }); + it("Verify a sent email whose from field has a dummy email address name", async () => { + const emailFilePath = path.join( + __dirname, + "./emails/email_auth_test3.eml" + ); + const emailRaw = readFileSync(emailFilePath, "utf8"); + const parsedEmail = await relayerUtils.parseEmail(emailRaw); + console.log(parsedEmail.canonicalizedHeader); + const accountCode = await relayerUtils.genAccountCode(); + const { + body_hash_idx, + precomputed_sha, + padded_body, + padded_body_len, + command_idx, + padded_cleaned_body, + ...emailAuthInput + } = await genEmailCircuitInput(emailFilePath, accountCode, { + maxHeaderLength: 1024, + ignoreBodyHashCheck: true, + }); + const recipientInput = await genRecipientInput(emailFilePath); + const circuitInputs = { + ...emailAuthInput, + subject_email_addr_idx: recipientInput.subject_email_addr_idx, + }; + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + const domainName = "gmail.com"; + const paddedDomain = relayerUtils.padString(domainName, 255); + const domainFields = relayerUtils.bytes2Fields(paddedDomain); + for (let idx = 0; idx < domainFields.length; ++idx) { + expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); + } + const expectedPubKeyHash = relayerUtils.publicKeyHash( + parsedEmail.publicKey + ); + expect(BigInt(expectedPubKeyHash)).toEqual( + witness[1 + domainFields.length] + ); + const expectedEmailNullifier = relayerUtils.emailNullifier( + parsedEmail.signature + ); + expect(BigInt(expectedEmailNullifier)).toEqual( + witness[1 + domainFields.length + 1] + ); + const timestamp = 1696965932n; + expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); + const maskedSubject = "Send 1 ETH to "; + const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); + const maskedSubjectFields = + relayerUtils.bytes2Fields(paddedMaskedSubject); + for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { + expect(BigInt(maskedSubjectFields[idx])).toEqual( + witness[1 + domainFields.length + 3 + idx] + ); + } + const fromAddr = "suegamisora@gmail.com"; + const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); + expect(BigInt(accountSalt)).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length] + ); + expect(0n).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 1 + ] + ); + expect(1n).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 2 + ] + ); + const recipientEmailAddr = "bob@example.com"; + const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( + recipientEmailAddr, + parsedEmail.signature + ); + expect(BigInt(emailAddrCommit)).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 3 + ] + ); + }); - it("Verify a sent email whose from field has a non-English name", async () => { - const emailFilePath = path.join(__dirname, "./emails/email_auth_test4.eml"); - const emailRaw = readFileSync(emailFilePath, "utf8"); - const parsedEmail = await relayerUtils.parseEmail(emailRaw); - console.log(parsedEmail.canonicalizedHeader); - const accountCode = await relayerUtils.genAccountCode(); - const emailAuthInput = await genEmailAuthInput(emailFilePath, accountCode); - const recipientInput = await genRecipientInput(emailFilePath); - const circuitInputs = { - ...emailAuthInput, - subject_email_addr_idx: recipientInput.subject_email_addr_idx, - }; - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - const domainName = "gmail.com"; - const paddedDomain = relayerUtils.padString(domainName, 255); - const domainFields = relayerUtils.bytes2Fields(paddedDomain); - for (let idx = 0; idx < domainFields.length; ++idx) { - expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); - } - const expectedPubKeyHash = relayerUtils.publicKeyHash( - parsedEmail.publicKey - ); - expect(BigInt(expectedPubKeyHash)).toEqual( - witness[1 + domainFields.length] - ); - const expectedEmailNullifier = relayerUtils.emailNullifier( - parsedEmail.signature - ); - expect(BigInt(expectedEmailNullifier)).toEqual( - witness[1 + domainFields.length + 1] - ); - const timestamp = 1696967028n; - expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); - const maskedSubject = "Send 1 ETH to "; - const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); - const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject); - for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { - expect(BigInt(maskedSubjectFields[idx])).toEqual( - witness[1 + domainFields.length + 3 + idx] - ); - } - const fromAddr = "suegamisora@gmail.com"; - const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); - expect(BigInt(accountSalt)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length] - ); - expect(0n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1] - ); - expect(1n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 2] - ); - const recipientEmailAddr = "bob@example.com"; - const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( - recipientEmailAddr, - parsedEmail.signature - ); - expect(BigInt(emailAddrCommit)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 3] - ); - }); + it("Verify a sent email whose from field has a non-English name", async () => { + const emailFilePath = path.join( + __dirname, + "./emails/email_auth_test4.eml" + ); + const emailRaw = readFileSync(emailFilePath, "utf8"); + const parsedEmail = await relayerUtils.parseEmail(emailRaw); + console.log(parsedEmail.canonicalizedHeader); + const accountCode = await relayerUtils.genAccountCode(); + const { + body_hash_idx, + precomputed_sha, + padded_body, + padded_body_len, + command_idx, + padded_cleaned_body, + ...emailAuthInput + } = await genEmailCircuitInput(emailFilePath, accountCode, { + maxHeaderLength: 1024, + ignoreBodyHashCheck: true, + }); + const recipientInput = await genRecipientInput(emailFilePath); + const circuitInputs = { + ...emailAuthInput, + subject_email_addr_idx: recipientInput.subject_email_addr_idx, + }; + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + const domainName = "gmail.com"; + const paddedDomain = relayerUtils.padString(domainName, 255); + const domainFields = relayerUtils.bytes2Fields(paddedDomain); + for (let idx = 0; idx < domainFields.length; ++idx) { + expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); + } + const expectedPubKeyHash = relayerUtils.publicKeyHash( + parsedEmail.publicKey + ); + expect(BigInt(expectedPubKeyHash)).toEqual( + witness[1 + domainFields.length] + ); + const expectedEmailNullifier = relayerUtils.emailNullifier( + parsedEmail.signature + ); + expect(BigInt(expectedEmailNullifier)).toEqual( + witness[1 + domainFields.length + 1] + ); + const timestamp = 1696967028n; + expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); + const maskedSubject = "Send 1 ETH to "; + const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); + const maskedSubjectFields = + relayerUtils.bytes2Fields(paddedMaskedSubject); + for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { + expect(BigInt(maskedSubjectFields[idx])).toEqual( + witness[1 + domainFields.length + 3 + idx] + ); + } + const fromAddr = "suegamisora@gmail.com"; + const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); + expect(BigInt(accountSalt)).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length] + ); + expect(0n).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 1 + ] + ); + expect(1n).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 2 + ] + ); + const recipientEmailAddr = "bob@example.com"; + const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( + recipientEmailAddr, + parsedEmail.signature + ); + expect(BigInt(emailAddrCommit)).toEqual( + witness[ + 1 + domainFields.length + 3 + maskedSubjectFields.length + 3 + ] + ); + }); - it("Verify a sent email whose subject has an invitation code", async () => { - const emailFilePath = path.join(__dirname, "./emails/email_auth_test5.eml"); - const emailRaw = readFileSync(emailFilePath, "utf8"); - const parsedEmail = await relayerUtils.parseEmail(emailRaw); - console.log(parsedEmail.canonicalizedHeader); - const accountCode = - "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76"; - const emailAuthInput = await genEmailAuthInput(emailFilePath, accountCode); - const recipientInput = await genRecipientInput(emailFilePath); - const circuitInputs = { - ...emailAuthInput, - subject_email_addr_idx: recipientInput.subject_email_addr_idx, - }; - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - const domainName = "gmail.com"; - const paddedDomain = relayerUtils.padString(domainName, 255); - const domainFields = relayerUtils.bytes2Fields(paddedDomain); - for (let idx = 0; idx < domainFields.length; ++idx) { - expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); - } - const expectedPubKeyHash = relayerUtils.publicKeyHash( - parsedEmail.publicKey - ); - expect(BigInt(expectedPubKeyHash)).toEqual( - witness[1 + domainFields.length] - ); - const expectedEmailNullifier = relayerUtils.emailNullifier( - parsedEmail.signature - ); - expect(BigInt(expectedEmailNullifier)).toEqual( - witness[1 + domainFields.length + 1] - ); - const timestamp = 1707866192n; - expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); - const maskedSubject = "Send 0.12 ETH to "; - const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); - const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject); - for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { - expect(BigInt(maskedSubjectFields[idx])).toEqual( - witness[1 + domainFields.length + 3 + idx] - ); - } - const fromAddr = "suegamisora@gmail.com"; - const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); - expect(BigInt(accountSalt)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length] - ); - expect(1n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1] - ); - expect(1n).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 2] - ); - const recipientEmailAddr = "alice@gmail.com"; - const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( - recipientEmailAddr, - parsedEmail.signature - ); - expect(BigInt(emailAddrCommit)).toEqual( - witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 3] - ); - }); + it("Verify a sent email whose subject has an invitation code", async () => { + const emailFilePath = path.join(__dirname, "./emails/email_auth_test5.eml"); + const emailRaw = readFileSync(emailFilePath, "utf8"); + const parsedEmail = await relayerUtils.parseEmail(emailRaw); + console.log(parsedEmail.canonicalizedHeader); + const accountCode = + "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76"; + const { + body_hash_idx, + precomputed_sha, + padded_body, + padded_body_len, + command_idx, + padded_cleaned_body, + ...emailAuthInput + } = await genEmailCircuitInput(emailFilePath, accountCode, { + maxHeaderLength: 1024, + ignoreBodyHashCheck: true, + }); + const recipientInput = await genRecipientInput(emailFilePath); + const circuitInputs = { + ...emailAuthInput, + subject_email_addr_idx: recipientInput.subject_email_addr_idx, + }; + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + const domainName = "gmail.com"; + const paddedDomain = relayerUtils.padString(domainName, 255); + const domainFields = relayerUtils.bytes2Fields(paddedDomain); + for (let idx = 0; idx < domainFields.length; ++idx) { + expect(BigInt(domainFields[idx])).toEqual(witness[1 + idx]); + } + const expectedPubKeyHash = relayerUtils.publicKeyHash( + parsedEmail.publicKey + ); + expect(BigInt(expectedPubKeyHash)).toEqual( + witness[1 + domainFields.length] + ); + const expectedEmailNullifier = relayerUtils.emailNullifier( + parsedEmail.signature + ); + expect(BigInt(expectedEmailNullifier)).toEqual( + witness[1 + domainFields.length + 1] + ); + const timestamp = 1707866192n; + expect(timestamp).toEqual(witness[1 + domainFields.length + 2]); + const maskedSubject = "Send 0.12 ETH to "; + const paddedMaskedSubject = relayerUtils.padString(maskedSubject, 605); + const maskedSubjectFields = relayerUtils.bytes2Fields(paddedMaskedSubject); + for (let idx = 0; idx < maskedSubjectFields.length; ++idx) { + expect(BigInt(maskedSubjectFields[idx])).toEqual( + witness[1 + domainFields.length + 3 + idx] + ); + } + const fromAddr = "suegamisora@gmail.com"; + const accountSalt = relayerUtils.accountSalt(fromAddr, accountCode); + expect(BigInt(accountSalt)).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length] + ); + expect(1n).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 1] + ); + expect(1n).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 2] + ); + const recipientEmailAddr = "alice@gmail.com"; + const emailAddrCommit = relayerUtils.emailAddrCommitWithSignature( + recipientEmailAddr, + parsedEmail.signature + ); + expect(BigInt(emailAddrCommit)).toEqual( + witness[1 + domainFields.length + 3 + maskedSubjectFields.length + 3] + ); + }); - it("Verify a sent email with a too large subject_email_addr_idx", async () => { - const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml"); - const accountCode = - "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76"; - const emailAuthInput = await genEmailAuthInput(emailFilePath, accountCode); - const recipientInput = await genRecipientInput(emailFilePath); - const circuitInputs = { - ...emailAuthInput, - subject_email_addr_idx: recipientInput.subject_email_addr_idx, - }; - circuitInputs.subject_email_addr_idx = 605; - async function failFn() { - const witness = await circuit.calculateWitness(circuitInputs); - await circuit.checkConstraints(witness); - } - await expect(failFn).rejects.toThrow(); - }); + it("Verify a sent email with a too large subject_email_addr_idx", async () => { + const emailFilePath = path.join(__dirname, "./emails/email_auth_test1.eml"); + const accountCode = + "0x01eb9b204cc24c3baee11accc37d253a9c53e92b1a2cc07763475c135d575b76"; + const { + body_hash_idx, + precomputed_sha, + padded_body, + padded_body_len, + command_idx, + padded_cleaned_body, + ...emailAuthInput + } = await genEmailCircuitInput(emailFilePath, accountCode, { + maxHeaderLength: 1024, + ignoreBodyHashCheck: true, + }); + const recipientInput = await genRecipientInput(emailFilePath); + const circuitInputs = { + ...emailAuthInput, + subject_email_addr_idx: recipientInput.subject_email_addr_idx, + }; + circuitInputs.subject_email_addr_idx = 605; + async function failFn() { + const witness = await circuit.calculateWitness(circuitInputs); + await circuit.checkConstraints(witness); + } + await expect(failFn).rejects.toThrow(); + }); }); diff --git a/packages/contracts/.env.sample b/packages/contracts/.env.example similarity index 100% rename from packages/contracts/.env.sample rename to packages/contracts/.env.example diff --git a/packages/contracts/.zksolc-libraries-cache/missing_library_dependencies.json b/packages/contracts/.zksolc-libraries-cache/missing_library_dependencies.json new file mode 100644 index 00000000..0e7f1f1b --- /dev/null +++ b/packages/contracts/.zksolc-libraries-cache/missing_library_dependencies.json @@ -0,0 +1,14 @@ +[ + { + "contract_name": "CommandUtils", + "contract_path": "src/libraries/CommandUtils.sol", + "missing_libraries": [ + "src/libraries/DecimalUtils.sol:DecimalUtils" + ] + }, + { + "contract_name": "DecimalUtils", + "contract_path": "src/libraries/DecimalUtils.sol", + "missing_libraries": [] + } +] \ No newline at end of file diff --git a/packages/contracts/README.md b/packages/contracts/README.md index 406c6006..0df21735 100644 --- a/packages/contracts/README.md +++ b/packages/contracts/README.md @@ -25,12 +25,12 @@ $ yarn test Run integration tests Before running integration tests, you need to make a `packages/contracts/test/build_integration` directory, download the zip file from the following link, and place its unzipped directory under that directory. -https://drive.google.com/file/d/1Ybtxe1TCVUtHzCPUs9cuZAGbM-MVwigE/view?usp=drive_link +https://drive.google.com/file/d/1XDPFIL5YK8JzLGoTjmHLXO9zMDjSQcJH/view?usp=sharing -Then, move `email_auth.zkey` and `email_auth.wasm` in the unzipped directory `params` to `build_integration`. +Then, move `email_auth_with_body_parsing_with_qp_encoding.zkey` and `email_auth_with_body_parsing_with_qp_encoding.wasm` in the unzipped directory `params` to `build_integration`. -Run each integration tests **one by one** as each test will consume lot of memory. +Run each integration tests **one by one** as each test will consume a lot of memory. ```bash Eg: contracts % forge test --skip '*ZKSync*' --match-contract "IntegrationTest" -vvv --chain 8453 --ffi ``` @@ -48,20 +48,20 @@ After deploying common contracts, you can deploy a proxy contract of `SimpleWall ## Specification There are four main contracts that developers should understand: `IDKIMRegistry`, `Verifier`, `EmailAuth` and `EmailAccountRecovery`. -While the first three contracts are agnostic to usecases of our SDK, the last one is an abstract contract only for our email-based account recovery. +While the first three contracts are agnostic to use cases of our SDK, the last one is an abstract contract only for our email-based account recovery. ### `IDKIMRegistry` Contract It is an interface of the DKIM registry contract that traces public keys registered for each email domain in DNS. It is defined in [the zk-email library](https://github.com/zkemail/zk-email-verify/blob/main/packages/contracts/interfaces/IDKIMRegistry.sol). -It requires a function `isDKIMPublicKeyHashValid(string domainName, bytes32 publicKeyHash) view returns (bool)`: it returns true iff the given hash of the public key `publicKeyHash` is registered for the given email-domain name `domainName`. +It requires a function `isDKIMPublicKeyHashValid(string domainName, bytes32 publicKeyHash) view returns (bool)`: it returns true if the given hash of the public key `publicKeyHash` is registered for the given email-domain name `domainName`. One of its implementations is [`ECDSAOwnedDKIMRegistry`](https://github.com/zkemail/ether-email-auth/blob/main/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol). It stores the Ethereum address `signer` who can update the registry. -We also provide another implementation called [`ForwardDKIMRegistry`](https://github.com/zkemail/ether-email-auth/blob/main/packages/contracts/src/utils/ForwardDKIMRegistry.sol). It stores an address of any internal DKIM registry and forwards its outputs. We can use it to upgrade a proxy of the ECDSAOwnedDKIMRegistry registry to a new DKIM registry with a different storage slots design by 1) upgrading its implementation into ForwardDKIMRegistry and 2) calling resetStorageForUpgradeFromECDSAOwnedDKIMRegistry function with an address of the internal DKIM registry. +We also provide another implementation called [`ForwardDKIMRegistry`](https://github.com/zkemail/ether-email-auth/blob/main/packages/contracts/src/utils/ForwardDKIMRegistry.sol). It stores an address of any internal DKIM registry and forwards its outputs. We can use it to upgrade a proxy of the ECDSAOwnedDKIMRegistry registry to a new DKIM registry with a different storage slots design by 1) upgrading its implementation into ForwardDKIMRegistry and 2) calling `resetStorageForUpgradeFromECDSAOwnedDKIMRegistry` function with an address of the internal DKIM registry. ### `Verifier` Contract -It has a responsibility to verify a ZK proof for the [`email_auth.circom` circuit](https://github.com/zkemail/ether-email-auth/blob/main/packages/circuits/src/email_auth.circom). +It has the responsibility to verify a ZK proof for the [`email_auth_with_body_parsing_with_qp_encoding.circom` circuit](https://github.com/zkemail/ether-email-auth/blob/main/packages/circuits/src/email_auth_with_body_parsing_with_qp_encoding.circom). It is implemented in [`utils/Verifier.sol`](https://github.com/zkemail/ether-email-auth/blob/main/packages/contracts/src/utils/Verifier.sol). It defines a structure `EmailProof` consisting of the ZK proof and data of the instances necessary for proof verification as follows: @@ -70,34 +70,34 @@ struct EmailProof { string domainName; // Domain name of the sender's email bytes32 publicKeyHash; // Hash of the DKIM public key used in email/proof uint timestamp; // Timestamp of the email - string maskedSubject; // Masked subject of the email + string maskedCommand; // Masked command of the email bytes32 emailNullifier; // Nullifier of the email to prevent its reuse. bytes32 accountSalt; // Create2 salt of the account - bool isCodeExist; // Check if the account code is exist + bool isCodeExist; // Check if the account code exists bytes proof; // ZK Proof of Email } ``` -Using that, it provides a function `function verifyEmailProof(EmailProof memory proof) public view returns (bool)`: it takes as input the `EmailProof proof` and returns true iff the proof is valid. Notably, it internally calls [`Groth16Verifier.sol`](https://github.com/zkemail/ether-email-auth/blob/main/packages/contracts/src/utils/Groth16Verifier.sol) generated by snarkjs from the verifying key of the [`email_auth.circom` circuit](https://github.com/zkemail/ether-email-auth/blob/main/packages/circuits/src/email_auth.circom). +Using that, it provides a function `function verifyEmailProof(EmailProof memory proof) public view returns (bool)`: it takes as input the `EmailProof proof` and returns true if the proof is valid. Notably, it internally calls [`Groth16Verifier.sol`](https://github.com/zkemail/ether-email-auth/blob/main/packages/contracts/src/utils/Groth16Verifier.sol) generated by snarkjs from the verifying key of the [`email_auth_with_body_parsing_with_qp_encoding.circom` circuit](https://github.com/zkemail/ether-email-auth/blob/main/packages/circuits/src/email_auth_with_body_parsing_with_qp_encoding.circom). ### `EmailAuth` Contract It is a contract deployed for each email user to verify an email-auth message from that user. The structure of the email-auth message is defined as follows: ``` struct EmailAuthMsg { - uint templateId; // The ID of the subject template that the email subject should satisfy. - bytes[] subjectParams; // The parameters in the email subject, which should be taken according to the specified subject template. - uint skipedSubjectPrefix; // The number of skiiped bytes in the email subject. + uint templateId; // The ID of the command template that the email command should satisfy. + bytes[] commandParams; // The parameters in the email command, which should be taken according to the specified command template. + uint skippedCommandPrefix; // The number of skipped bytes in the email command. EmailProof proof; // The email proof containing the zk proof and other necessary information for the email verification by the verifier contract. -} -``` +} +``` It has the following storage variables. - `address owner`: an address of the contract owner. - `bytes32 accountSalt`: an `accountSalt` used for the CREATE2 salt of this contract. - `DKIMRegistry dkim`: an instance of the DKIM registry contract. - `Verifier verifier`: an instance of the Verifier contract. -- `address controller`: an address of a controller contract, defining the subject templates supported by this contract. -- `mapping(uint=>string[]) subjectTemplates`: a mapping of the supported subject templates associated with its ID. +- `address controller`: an address of a controller contract, defining the command templates supported by this contract. +- `mapping(uint=>string[]) commandTemplates`: a mapping of the supported command templates associated with its ID. - `mapping(bytes32⇒bytes32) authedHash`: a mapping of the hash of the authorized message associated with its `emailNullifier`. - `uint lastTimestamp`: the latest `timestamp` in the verified `EmailAuthMsg`. - `mapping(bytes32=>bool) usedNullifiers`: a mapping storing the used `emailNullifier` bytes. @@ -137,33 +137,33 @@ It provides the following functions. 1. Assert `msg.sender==owner` . 2. Assert `_dkimRegistryAddr!=0`. 3. Update `dkim` to `DKIMRegistry(_dkimRegistryAddr)`. -- `getSubjectTemplate(uint _templateId) public view returns (string[] memory)` - 1. Assert that the template for `_templateId` exists, i.e., `subjectTemplates[_templateId].length >0` holds. - 2. Return `subjectTemplates[_templateId]`. -- `insertSubjectTemplate(uint _templateId, string[] _subjectTemplate)` - 1. Assert `_subjectTemplate.length>0` . +- `getCommandTemplate(uint _templateId) public view returns (string[] memory)` + 1. Assert that the template for `_templateId` exists, i.e., `commandTemplates[_templateId].length >0` holds. + 2. Return `commandTemplates[_templateId]`. +- `insertCommandTemplate(uint _templateId, string[] _commandTemplate)` + 1. Assert `_commandTemplate.length>0` . 2. Assert `msg.sender==controller`. - 3. Assert `subjectTemplates[_templateId].length == 0`, i.e., no template has not been registered with `_templateId`. - 4. Set `subjectTemplates[_templateId]=_subjectTemplate`. -- `updateSubjectTemplate(uint _templateId, string[] _subjectTemplate)` - 1. Assert `_subjectTemplate.length>0` . + 3. Assert `commandTemplates[_templateId].length == 0`, i.e., no template has not been registered with `_templateId`. + 4. Set `commandTemplates[_templateId]=_commandTemplate`. +- `updateCommandTemplate(uint _templateId, string[] _commandTemplate)` + 1. Assert `_commandTemplate.length>0` . 2. Assert `msg.sender==controller`. - 3. Assert `subjectTemplates[_templateId].length != 0` , i.e., any template has been already registered with `_templateId`. - 4. Set `subjectTemplates[_templateId]=_subjectTemplate`. -- `deleteSubjectTemplate(uint _templateId)` + 3. Assert `commandTemplates[_templateId].length != 0` , i.e., any template has been already registered with `_templateId`. + 4. Set `commandTemplates[_templateId]=_commandTemplate`. +- `deleteCommandTemplate(uint _templateId)` 1. Assert `msg.sender==controller`. - 2. Assert `subjectTemplates[_templateId].length > 0`, i.e., any template has been already registered with `_templateId`. - 3. `delete subjectTemplates[_templateId]`. + 2. Assert `commandTemplates[_templateId].length > 0`, i.e., any template has been already registered with `_templateId`. + 3. `delete commandTemplates[_templateId]`. - `authEmail(EmailAuthMsg emailAuthMsg) returns (bytes32)` 1. Assert `msg.sender==controller`. - 2. Let `string[] memory template = subjectTemplates[emailAuthMsg.templateId]`. + 2. Let `string[] memory template = commandTemplates[emailAuthMsg.templateId]`. 3. Assert `template.length > 0`. 4. Assert `dkim.isDKIMPublicKeyHashValid(emailAuthMsg.proof.domain, emailAuthMsg.proof.publicKeyHash)==true`. 5. Assert `usedNullifiers[emailAuthMsg.proof.emailNullifier]==false` and set `usedNullifiers[emailAuthMsg.proof.emailNullifier]` to `true`. 6. Assert `accountSalt==emailAuthMsg.proof.accountSalt`. 7. If `timestampCheckEnabled` is true, assert that `emailAuthMsg.proof.timestamp` is zero OR `lastTimestamp < emailAuthMsg.proof.timestamp`, and update `lastTimestamp` to `emailAuthMsg.proof.timestamp`. - 8. Construct an expected subject `expectedSubject` from `template` and the values of `emailAuthMsg.subjectParams`. - 9. Assert that `expectedSubject` is equal to `emailAuthMsg.proof.maskedSubject[skipedSubjectPrefix:]` , i.e., the string of `emailAuthMsg.proof.maskedSubject` from the `skipedSubjectPrefix`-th byte. + 8. Construct an expected command `expectedCommand` from `template` and the values of `emailAuthMsg.commandParams`. + 9. Assert that `expectedCommand` is equal to `emailAuthMsg.proof.maskedCommand[skippedCommandPrefix:]` , i.e., the string of `emailAuthMsg.proof.maskedCommand` from the `skippedCommandPrefix`-th byte. 10. Assert `verifier.verifyEmailProof(emailAuthMsg.proof)==true`. - `isValidSignature(bytes32 _hash, bytes memory _signature) public view returns (bytes4 magicValue)` 1. Parse `_signature` as `(bytes32 emailNullifier)`. @@ -173,20 +173,20 @@ It provides the following functions. 2. Set `timestampCheckEnabled` to `enabled`. ### `EmailAccountRecovery` Contract -It is an abstract contract for each smart account brand to implement the email-based account recovery. **Each smart account provider only needs to implement the following functions in a new contract called controller.** In the following, the `templateIdx` is different from `templateId` in the email-auth contract in the sense that the `templateIdx` is an incremental index defined for each of the subject templates in `acceptanceSubjectTemplates()` and `recoverySubjectTemplates()`. +It is an abstract contract for each smart account brand to implement the email-based account recovery. **Each smart account provider only needs to implement the following functions in a new contract called controller.** In the following, the `templateIdx` is different from `templateId` in the email-auth contract in the sense that the `templateIdx` is an incremental index defined for each of the command templates in `acceptanceCommandTemplates()` and `recoveryCommandTemplates()`. - `isActivated(address recoveredAccount) public view virtual returns (bool)`: it returns if the account to be recovered has already activated the controller (the contract implementing `EmailAccountRecovery`). -- `acceptanceSubjectTemplates() public view virtual returns (string[][])`: it returns multiple subject templates for an email to accept becoming a guardian (acceptance email). -- `recoverySubjectTemplates() public view virtual returns (string[][])`: it returns multiple subject templates for an email to confirm the account recovery (recovery email). -- `extractRecoveredAccountFromAcceptanceSubject(bytes[] memory subjectParams, uint templateIdx) public view virtual returns (address)`: it takes as input the parameters `subjectParams` and the index of the chosen subject template `templateIdx` in those for acceptance emails. -- `extractRecoveredAccountFromRecoverySubject(bytes[] memory subjectParams, uint templateIdx) public view virtual returns (address)`: it takes as input the parameters `subjectParams` and the index of the chosen subject template `templateIdx` in those for recovery emails. -- `acceptGuardian(address guardian, uint templateIdx, bytes[] subjectParams, bytes32 emailNullifier) internal virtual`: it takes as input the Ethereum address `guardian` corresponding to the guardian's email address, the index `templateIdx` of the subject template in the output of `acceptanceSubjectTemplates()`, the parameter values of the variable parts `subjectParams` in the template `acceptanceSubjectTemplates()[templateIdx]`, and an email nullifier `emailNullifier`. It is called after verifying the email-auth message to accept the role of the guardian; thus you can assume the arguments are already verified. -- `processRecovery(address guardian, uint templateIdx, bytes[] subjectParams, bytes32 emailNullifier) internal virtual`: it takes as input the Ethereum address `guardian` corresponding to the guardian's email address, the index `templateIdx` of the subject template in the output of `recoverySubjectTemplates()`, the parameter values of the variable parts `subjectParams` in the template `recoverySubjectTemplates()[templateIdx]`, and an email nullifier `emailNullifier`. It is called after verifying the email-auth message to confirm the recovery; thus you can assume the arguments are already verified. +- `acceptanceCommandTemplates() public view virtual returns (string[][])`: it returns multiple command templates for an email to accept becoming a guardian (acceptance email). +- `recoveryCommandTemplates() public view virtual returns (string[][])`: it returns multiple command templates for an email to confirm the account recovery (recovery email). +- `extractRecoveredAccountFromAcceptanceCommand(bytes[] memory commandParams, uint templateIdx) public view virtual returns (address)`: it takes as input the parameters `commandParams` and the index of the chosen command template `templateIdx` in those for acceptance emails. +- `extractRecoveredAccountFromRecoveryCommand(bytes[] memory commandParams, uint templateIdx) public view virtual returns (address)`: it takes as input the parameters `commandParams` and the index of the chosen command template `templateIdx` in those for recovery emails. +- `acceptGuardian(address guardian, uint templateIdx, bytes[] commandParams, bytes32 emailNullifier) internal virtual`: it takes as input the Ethereum address `guardian` corresponding to the guardian's email address, the index `templateIdx` of the command template in the output of `acceptanceCommandTemplates()`, the parameter values of the variable parts `commandParams` in the template `acceptanceCommandTemplates()[templateIdx]`, and an email nullifier `emailNullifier`. It is called after verifying the email-auth message to accept the role of the guardian; thus you can assume the arguments are already verified. +- `processRecovery(address guardian, uint templateIdx, bytes[] commandParams, bytes32 emailNullifier) internal virtual`: it takes as input the Ethereum address `guardian` corresponding to the guardian's email address, the index `templateIdx` of the command template in the output of `recoveryCommandTemplates()`, the parameter values of the variable parts `commandParams` in the template `recoveryCommandTemplates()[templateIdx]`, and an email nullifier `emailNullifier`. It is called after verifying the email-auth message to confirm the recovery; thus you can assume the arguments are already verified. - `completeRecovery(address account, bytes memory completeCalldata) external virtual`: it can be called by anyone, in particular a Relayer, when completing the account recovery. It should first check if the condition for the recovery of `account` holds and then update its owner's address in the wallet contract. It also provides the following entry functions with their default implementations, called by the Relayer. - `handleAcceptance(EmailAuthMsg emailAuthMsg, uint templateIdx) external` - 1. Extract an account address to be recovered `recoveredAccount` by calling `extractRecoveredAccountFromAcceptanceSubject`. + 1. Extract an account address to be recovered `recoveredAccount` by calling `extractRecoveredAccountFromAcceptanceCommand`. 2. Let `address guardian = CREATE2(emailAuthMsg.proof.accountSalt, ERC1967Proxy.creationCode, emailAuthImplementation(), (emailAuthMsg.proof.accountSalt))`. 3. Let `uint templateId = keccak256(EMAIL_ACCOUNT_RECOVERY_VERSION_ID, "ACCEPTANCE", templateIdx)`. 4. Assert that `templateId` is equal to `emailAuthMsg.templateId`. @@ -194,19 +194,19 @@ It also provides the following entry functions with their default implementation 6. If the `EmailAuth` contract of `guardian` has not been deployed, deploy the proxy contract of `emailAuthImplementation()`. Its salt is `emailAuthMsg.proof.accountSalt` and its initialization parameter is `recoveredAccount`, `emailAuthMsg.proof.accountSalt`, and `address(this)`, which is a controller of the deployed contract. 7. If the `EmailAuth` contract of `guardian` has not been deployed, call `EmailAuth(guardian).initDKIMRegistry(dkim())`. 8. If the `EmailAuth` contract of `guardian` has not been deployed, call `EmailAuth(guardian).initVerifier(verifier())`. - 9. If the `EmailAuth` contract of `guardian` has not been deployed, for each `template` in `acceptanceSubjectTemplates()` along with its index `idx`, call `EmailAuth(guardian).insertSubjectTemplate(keccak256(EMAIL_ACCOUNT_RECOVERY_VERSION_ID, "ACCEPTANCE", idx), template)`. - 10. If the `EmailAuth` contract of `guardian` has not been deployed, for each `template` in `recoverySubjectTemplates()` along with its index `idx`, call `EmailAuth(guardian).insertSubjectTemplate(keccak256(EMAIL_ACCOUNT_RECOVERY_VERSION_ID, "RECOVERY", idx), template)`. + 9. If the `EmailAuth` contract of `guardian` has not been deployed, for each `template` in `acceptanceCommandTemplates()` along with its index `idx`, call `EmailAuth(guardian).insertCommandTemplate(keccak256(EMAIL_ACCOUNT_RECOVERY_VERSION_ID, "ACCEPTANCE", idx), template)`. + 10. If the `EmailAuth` contract of `guardian` has not been deployed, for each `template` in `recoveryCommandTemplates()` along with its index `idx`, call `EmailAuth(guardian).insertCommandTemplate(keccak256(EMAIL_ACCOUNT_RECOVERY_VERSION_ID, "RECOVERY", idx), template)`. 11. If the `EmailAuth` contract of `guardian` has been already deployed, assert that its `controller` is equal to `address(this)`. - 11. Assert that `EmailAuth(guardian).authEmail(1emailAuthMsg)` returns no error. - 12. Call `acceptGuardian(guardian, templateIdx, emailAuthMsg.subjectParams, emailAuthMsg.proof.emailNullifier)`. + 11. Assert that `EmailAuth(guardian).authEmail(emailAuthMsg)` returns no error. + 12. Call `acceptGuardian(guardian, templateIdx, emailAuthMsg.commandParams, emailAuthMsg.proof.emailNullifier)`. - `handleRecovery(EmailAuthMsg emailAuthMsg, uint templateIdx) external` - 1. Extract an account address to be recovered `recoveredAccount` by calling `extractRecoveredAccountFromRecoverySubject`. + 1. Extract an account address to be recovered `recoveredAccount` by calling `extractRecoveredAccountFromRecoveryCommand`. 1. Let `address guardian = CREATE2(emailAuthMsg.proof.accountSalt, ERC1967Proxy.creationCode, emailAuthImplementation(), (emailAuthMsg.proof.accountSalt))`. 2. Assert that the contract of `guardian` has been already deployed. 3. Let `uint templateId=keccak256(EMAIL_ACCOUNT_RECOVERY_VERSION_ID, "RECOVERY", templateIdx)`. 4. Assert that `templateId` is equal to `emailAuthMsg.templateId`. 5. Assert that `EmailAuth(guardian).authEmail(emailAuthMsg)` returns no error. - 6. Call `processRecovery(guardian, templateIdx, emailAuthMsg.subjectParams, emailAuthMsg.proof.emailNullifier)`. + 6. Call `processRecovery(guardian, templateIdx, emailAuthMsg.commandParams, emailAuthMsg.proof.emailNullifier)`. # For zkSync @@ -239,11 +239,11 @@ chmod a+x {BINARY_NAME} mv {BINARY_NAME} ~/.zksync/. ``` -In addition, there are the problem with foundy-zksync. Currently they can't resolve contracts in monorepo's node_modules. +In addition, there are problems with foundry-zksync. Currently, they can't resolve contracts in monorepo's node_modules. https://github.com/matter-labs/foundry-zksync/issues/411 -To fix this, you should copy `node_modules` in the project root dir to `packages/contracts/node_modules`. And then you should replace `libs = ["../../node_modules", "lib"]` to `libs = ["node_modules", "lib"]` in `foundry.toml`. At the end, you should replace `../../node_modules` to `node_modules` in `remappings.txt`. +To fix this, you should copy `node_modules` in the project root dir to `packages/contracts/node_modules`. And then you should replace `libs = ["../../node_modules", "lib"]` with `libs = ["node_modules", "lib"]` in `foundry.toml`. At the end, you should replace `../../node_modules` with `node_modules` in `remappings.txt`. Next, you should uncomment the following lines in `foundry.toml`. @@ -268,14 +268,14 @@ You can deploy them by the following command for example. ``` $ forge build --zksync --zk-detect-missing-libraries -Missing libraries detected: src/libraries/SubjectUtils.sol:SubjectUtils, src/libraries/DecimalUtils.sol:DecimalUtils +Missing libraries detected: src/libraries/CommandUtils.sol:CommandUtils, src/libraries/DecimalUtils.sol:DecimalUtils ``` Run the following command in order to deploy each missing library: ``` forge create src/libraries/DecimalUtils.sol:DecimalUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url https://sepolia.era.zksync.dev --chain 300 --zksync -forge create src/libraries/SubjectUtils.sol:SubjectUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url https://sepolia.era.zksync.dev --chain 300 --zksync --libraries src/libraries/DecimalUtils.sol:DecimalUtils:{DECIMAL_UTILS_DEPLOYED_ADDRESS} +forge create src/libraries/CommandUtils.sol:CommandUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url https://sepolia.era.zksync.dev --chain 300 --zksync --libraries src/libraries/DecimalUtils.sol:DecimalUtils:{DECIMAL_UTILS_DEPLOYED_ADDRESS} ``` After that, you can see the following line in foundry.toml. @@ -284,7 +284,7 @@ Also, this line is needed only for foundry-zksync, if you use foundry, please re ``` libraries = [ "{PROJECT_DIR}/packages/contracts/src/libraries/DecimalUtils.sol:DecimalUtils:{DEPLOYED_ADDRESS}", - "{PROJECT_DIR}/packages/contracts/src/libraries/SubjectUtils.sol:SubjectUtils:{DEPLOYED_ADDRESS}"] + "{PROJECT_DIR}/packages/contracts/src/libraries/CommandUtils.sol:CommandUtils:{DEPLOYED_ADDRESS}"] ``` Incidentally, the above line already exists in `foundy.toml` with it commented out, if you uncomment it by replacing `{PROJECT_DIR}` with the appropriate path, it will also work. @@ -292,7 +292,7 @@ Incidentally, the above line already exists in `foundy.toml` with it commented o About Create2, `L2ContractHelper.computeCreate2Address` should be used. And `type(ERC1967Proxy).creationCode` doesn't work correctly in zkSync. We need to hardcode the `type(ERC1967Proxy).creationCode` to bytecodeHash. -Perhaps that is different value in each compiler version. +Perhaps that is a different value in each compiler version. You should replace the following line to the correct hash. packages/contracts/src/EmailAccountRecovery.sol:L111 @@ -303,12 +303,12 @@ See, test/ComputeCreate2Address.t.sol Run `yarn zktest`. -Current foundry-zksync overrides the foundry behavior. If you installed foundry-zksync, some EVM code will be different and some test cases will be failed. If you want to test on other EVM, please install foundry. +Current foundry-zksync overrides the foundry behavior. If you installed foundry-zksync, some EVM code will be different and some test cases will fail. If you want to test on other EVM, please install foundry. Even if the contract size is fine for EVM, it may exceed the bytecode size limit for zksync, and the test may not be executed. -Therefore, EmailAccountRecovery.t.sol has been splited. +Therefore, EmailAccountRecovery.t.sol has been split. -Currently some test cases are not work correctly because there is a issue about missing libraries. +Currently, some test cases are not working correctly because there is an issue about missing libraries. https://github.com/matter-labs/foundry-zksync/issues/382 @@ -323,7 +323,7 @@ EmailAuth.t.sol - testAuthEmail() - testExpectRevertAuthEmailEmailNullifierAlreadyUsed() - testExpectRevertAuthEmailInvalidEmailProof() -- testExpectRevertAuthEmailInvalidSubject() +- testExpectRevertAuthEmailInvalidCommand() - testExpectRevertAuthEmailInvalidTimestamp() EmailAuthWithUserOverrideableDkim.t.sol @@ -332,7 +332,7 @@ EmailAuthWithUserOverrideableDkim.t.sol # For integration testing -To pass the instegration testing, you should use era-test-node. +To pass the integration testing, you should use era-test-node. See the following URL and install it. https://github.com/matter-labs/era-test-node @@ -352,20 +352,136 @@ As you saw before, you need to deploy missing libraries. You can deploy them by the following command for example. ``` -Missing libraries detected: src/libraries/SubjectUtils.sol:SubjectUtils, src/libraries/DecimalUtils.sol:DecimalUtils +Missing libraries detected: src/libraries/CommandUtils.sol:CommandUtils, src/libraries/DecimalUtils.sol:DecimalUtils Run the following command in order to deploy each missing library: forge create src/libraries/DecimalUtils.sol:DecimalUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url http://127.0.0.1:8011 --chain 260 --zksync -forge create src/libraries/SubjectUtils.sol:SubjectUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url http://127.0.0.1:8011 --chain 260 --zksync --libraries src/libraries/DecimalUtils.sol:DecimalUtils:{DECIMAL_UTILS_DEPLOYED_ADDRESS} +forge create src/libraries/CommandUtils.sol:CommandUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url http://127.0.0.1:8011 --chain 260 --zksync --libraries src/libraries/DecimalUtils.sol:DecimalUtils:{DECIMAL_UTILS_DEPLOYED_ADDRESS} ``` Set the libraries in foundry.toml using the above deployed address. +Due to this change in the address of the missing libraries, the value of the proxyBytecodeHash must also be changed: change the value of the proxyBytecodeHash in E-mailAccountRecoveryZKSync.sol. + +And then, run the integration testing. + +``` +forge test --match-contract "IntegrationZKSyncTest" --system-mode=true --zksync --gas-limit 1000000000 --chain 300 -vvv --ffi +``` + +# For zkSync deployment (For test net) + +You need to edit .env at first. +Second, just run the following commands with `--zksync` + +``` +source .env +forge script script/DeployRecoveryControllerZKSync.s.sol:Deploy --zksync --rpc-url $RPC_URL --broadcast --slow --via-ir --system-mode true -vvvv +``` + +As you saw before, you need to deploy missing libraries. +You can deploy them by the following command for example. + +``` +Missing libraries detected: src/libraries/CommandUtils.sol:CommandUtils, src/libraries/DecimalUtils.sol:DecimalUtils + +Run the following command in order to deploy each missing library: + +forge create src/libraries/DecimalUtils.sol:DecimalUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url https://sepolia.era.zksync.dev --chain 300 --zksync +forge create src/libraries/CommandUtils.sol:CommandUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url https://sepolia.era.zksync.dev --chain 300 --zksync --libraries src/libraries/DecimalUtils.sol:DecimalUtils:{DECIMAL_UTILS_DEPLOYED_ADDRESS} +``` + +After that, you can see the following line in foundry.toml. +Also, this line is needed only for foundry-zksync, if you use foundry, please remove this line. Otherwise, the test will fail. + +``` +libraries = [ + "{PROJECT_DIR}/packages/contracts/src/libraries/DecimalUtils.sol:DecimalUtils:{DEPLOYED_ADDRESS}", + "{PROJECT_DIR}/packages/contracts/src/libraries/CommandUtils.sol:CommandUtils:{DEPLOYED_ADDRESS}"] +``` + +Incidentally, the above line already exists in `foundy.toml` with it commented out, if you uncomment it by replacing `{PROJECT_DIR}` with the appropriate path, it will also work. + +About Create2, `L2ContractHelper.computeCreate2Address` should be used. +And `type(ERC1967Proxy).creationCode` doesn't work correctly in zkSync. +We need to hardcode the `type(ERC1967Proxy).creationCode` to bytecodeHash. +Perhaps that is a different value in each compiler version. + +You should replace the following line to the correct hash. +packages/contracts/src/EmailAccountRecovery.sol:L111 + +See, test/ComputeCreate2Address.t.sol + +# For zkSync testing + +Run `yarn zktest`. + +Current foundry-zksync overrides the foundry behavior. If you installed foundry-zksync, some EVM code will be different and some test cases will fail. If you want to test on other EVM, please install foundry. + +Even if the contract size is fine for EVM, it may exceed the bytecode size limit for zksync, and the test may not be executed. +Therefore, EmailAccountRecovery.t.sol has been split. + +Currently, some test cases are not working correctly because there is an issue about missing libraries. + +https://github.com/matter-labs/foundry-zksync/issues/382 + +Failing test cases are here. + +DKIMRegistryUpgrade.t.sol + +- testAuthEmail() + +EmailAuth.t.sol + +- testAuthEmail() +- testExpectRevertAuthEmailEmailNullifierAlreadyUsed() +- testExpectRevertAuthEmailInvalidEmailProof() +- testExpectRevertAuthEmailInvalidCommand() +- testExpectRevertAuthEmailInvalidTimestamp() + +EmailAuthWithUserOverrideableDkim.t.sol + +- testAuthEmail() + +# For integration testing + +To pass the integration testing, you should use era-test-node. +See the following URL and install it. +https://github.com/matter-labs/era-test-node + +Run the era-test-node + +``` +era_test_node fork https://sepolia.era.zksync.dev +``` + +You remove .zksolc-libraries-cache directory, and run the following command. + +``` +forge build --zksync --zk-detect-missing-libraries +``` + +As you saw before, you need to deploy missing libraries. +You can deploy them by the following command for example. + +``` +Missing libraries detected: src/libraries/CommandUtils.sol:CommandUtils, src/libraries/DecimalUtils.sol:DecimalUtils + +Run the following command in order to deploy each missing library: + +forge create src/libraries/DecimalUtils.sol:DecimalUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url http://127.0.0.1:8011 --chain 260 --zksync +forge create src/libraries/CommandUtils.sol:CommandUtils --private-key {YOUR_PRIVATE_KEY} --rpc-url http://127.0.0.1:8011 --chain 260 --zksync --libraries src/libraries/DecimalUtils.sol:DecimalUtils:{DECIMAL_UTILS_DEPLOYED_ADDRESS} +``` + +Set the libraries in foundry.toml using the above deployed address. + +Due to this change in the address of the missing libraries, the value of the proxyBytecodeHash must also be changed: change the value of the proxyBytecodeHash in E-mailAccountRecoveryZKSync.sol. + And then, run the integration testing. ``` -forge test --match-contract "IntegrationZkSyncTest" --system-mode=true --zksync --gas-limit 1000000000 --chain 300 -vvv --ffi +forge test --match-contract "IntegrationZKSyncTest" --system-mode=true --zksync --gas-limit 1000000000 --chain 300 -vvv --ffi ``` # For zkSync deployment (For test net) diff --git a/packages/contracts/foundry.toml b/packages/contracts/foundry.toml index 7ff2e1a0..4edb0e0e 100644 --- a/packages/contracts/foundry.toml +++ b/packages/contracts/foundry.toml @@ -21,12 +21,19 @@ solc = "0.8.26" build_info = true extra_output = ["storageLayout"] -# For missing libraries, please comment out this if you use foundry-zksync +# For missing libraries, please comment out this if you use foundry-zksync for unit test #libraries = [ # "{PROJECT_DIR}/packages/contracts/src/libraries/DecimalUtils.sol:DecimalUtils:0x91cc0f0a227b8dd56794f9391e8af48b40420a0b", -# "{PROJECT_DIR}/packages/contracts/src/libraries/SubjectUtils.sol:SubjectUtils:0x981e3df952358a57753c7b85de7949da4abcf54a" +# "{PROJECT_DIR}/packages/contracts/src/libraries/CommandUtils.sol:CommandUtils:0x981e3df952358a57753c7b85de7949da4abcf54a" #] +# For missing libraries, please comment out this if you use foundry-zksync for integration test +#libraries = [ +# "{PROJECT_DIR}/packages/contracts/src/libraries/DecimalUtils.sol:DecimalUtils:0x34eb91D6a0c6Cea4B3b2e4eE8176d6Fc120CB133", +# "{PROJECT_DIR}/packages/contracts/src/libraries/CommandUtils.sol:CommandUtils:0x3CE48a2c96889FeB67f2e3fb0285AEc9e3FCb68b" +#] + + [rpc_endpoints] localhost = "${LOCALHOST_RPC_URL}" sepolia = "${SEPOLIA_RPC_URL}" @@ -36,11 +43,11 @@ mainnet = "${MAINNET_RPC_URL}" sepolia = { key = "${ETHERSCAN_API_KEY}" } mainnet = { key = "${ETHERSCAN_API_KEY}" } -[profile.default.zksync] +[profile.default.zksync] src = 'src' libs = ["node_modules", "lib"] fallback_oz = true is_system = true mode = "3" -zksolc = "1.5.0" \ No newline at end of file +zksolc = "1.5.0" diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 44bae057..3fc1d004 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,16 +1,12 @@ { "name": "@zk-email/ether-email-auth-contracts", - "version": "1.0.0", + "version": "0.0.2-preview", "license": "MIT", "scripts": { "build": "forge build --skip '*ZKSync*'", "zkbuild": "forge build --zksync", - "test": "forge test --no-match-test \"testIntegration\" --skip '*ZKSync*'", - "zktest": "forge test --no-match-test \"testIntegration\" --system-mode=true --zksync --gas-limit 1000000000 --chain 300", - "build": "forge build --skip '*ZKSync*'", - "zkbuild": "forge build --zksync", - "test": "forge test --no-match-test \"testIntegration\" --skip '*ZKSync*'", - "zktest": "forge test --no-match-test \"testIntegration\" --system-mode=true --zksync --gas-limit 1000000000 --chain 300", + "test": "forge test --no-match-test \"testIntegration\" --no-match-contract \".*Script.*\" --skip '*ZKSync*'", + "zktest": "forge test --no-match-test \"testIntegration\" --no-match-contract \".*Script.*\" --system-mode=true --zksync --gas-limit 1000000000 --chain 300", "lint": "solhint 'src/**/*.sol'" }, "dependencies": { @@ -24,5 +20,12 @@ "ds-test": "https://github.com/dapphub/ds-test", "forge-std": "https://github.com/foundry-rs/forge-std", "solhint": "^3.6.1" - } -} + }, + "files": [ + "/src", + "foundry.toml", + "package.json", + "README.md", + "remappings.txt" + ] +} \ No newline at end of file diff --git a/packages/contracts/script/DeployCommons.s.sol b/packages/contracts/script/DeployCommons.s.sol index 9a392170..f547e03d 100644 --- a/packages/contracts/script/DeployCommons.s.sol +++ b/packages/contracts/script/DeployCommons.s.sol @@ -6,6 +6,7 @@ import "forge-std/Script.sol"; import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import "../test/helpers/SimpleWallet.sol"; import "../src/utils/Verifier.sol"; +import "../src/utils/Groth16Verifier.sol"; import "../src/utils/ECDSAOwnedDKIMRegistry.sol"; // import "../src/utils/ForwardDKIMRegistry.sol"; import "../src/EmailAuth.sol"; @@ -80,9 +81,13 @@ contract Deploy is Script { "Verifier implementation deployed at: %s", address(verifierImpl) ); + Groth16Verifier groth16Verifier = new Groth16Verifier(); ERC1967Proxy verifierProxy = new ERC1967Proxy( address(verifierImpl), - abi.encodeCall(verifierImpl.initialize, (initialOwner)) + abi.encodeCall( + verifierImpl.initialize, + (initialOwner, address(groth16Verifier)) + ) ); verifier = Verifier(address(verifierProxy)); console.log("Verifier deployed at: %s", address(verifier)); diff --git a/packages/contracts/script/DeployRecoveryController.s.sol b/packages/contracts/script/DeployRecoveryController.s.sol index 5df2c89a..c69db0f2 100644 --- a/packages/contracts/script/DeployRecoveryController.s.sol +++ b/packages/contracts/script/DeployRecoveryController.s.sol @@ -7,6 +7,7 @@ import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import "../test/helpers/SimpleWallet.sol"; import "../test/helpers/RecoveryController.sol"; import "../src/utils/Verifier.sol"; +import "../src/utils/Groth16Verifier.sol"; import "../src/utils/ECDSAOwnedDKIMRegistry.sol"; // import "../src/utils/ForwardDKIMRegistry.sol"; import "../src/EmailAuth.sol"; @@ -34,7 +35,7 @@ contract Deploy is Script { } vm.startBroadcast(deployerPrivateKey); - address initialOwner = msg.sender; + address initialOwner = vm.addr(deployerPrivateKey); // Deploy ECDSAOwned DKIM registry dkim = ECDSAOwnedDKIMRegistry(vm.envOr("ECDSA_DKIM", address(0))); @@ -75,9 +76,13 @@ contract Deploy is Script { "Verifier implementation deployed at: %s", address(verifierImpl) ); + Groth16Verifier groth16Verifier = new Groth16Verifier(); ERC1967Proxy verifierProxy = new ERC1967Proxy( address(verifierImpl), - abi.encodeCall(verifierImpl.initialize, (initialOwner)) + abi.encodeCall( + verifierImpl.initialize, + (initialOwner, address(groth16Verifier)) + ) ); verifier = Verifier(address(verifierProxy)); console.log("Verifier deployed at: %s", address(verifier)); @@ -103,7 +108,7 @@ contract Deploy is Script { abi.encodeCall( recoveryControllerImpl.initialize, ( - signer, + initialOwner, address(verifier), address(dkim), address(emailAuthImpl) @@ -138,7 +143,7 @@ contract Deploy is Script { address(simpleWalletImpl), abi.encodeCall( simpleWalletImpl.initialize, - (signer, address(recoveryController)) + (initialOwner, address(recoveryController)) ) ); simpleWallet = SimpleWallet(payable(address(simpleWalletProxy))); diff --git a/packages/contracts/script/DeployRecoveryControllerZKSync.s.sol b/packages/contracts/script/DeployRecoveryControllerZKSync.s.sol index 6767cc5f..60b5484b 100644 --- a/packages/contracts/script/DeployRecoveryControllerZKSync.s.sol +++ b/packages/contracts/script/DeployRecoveryControllerZKSync.s.sol @@ -7,6 +7,7 @@ import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import "../test/helpers/SimpleWallet.sol"; import "../test/helpers/RecoveryControllerZKSync.sol"; import "../src/utils/Verifier.sol"; +import "../src/utils/Groth16Verifier.sol"; import "../src/utils/ECDSAOwnedDKIMRegistry.sol"; // import "../src/utils/ForwardDKIMRegistry.sol"; import "../src/EmailAuth.sol"; @@ -36,7 +37,7 @@ contract Deploy is Script { } vm.startBroadcast(deployerPrivateKey); - address initialOwner = msg.sender; + address initialOwner = vm.addr(deployerPrivateKey); // Deploy ECDSAOwned DKIM registry dkim = ECDSAOwnedDKIMRegistry(vm.envOr("ECDSA_DKIM", address(0))); @@ -77,9 +78,13 @@ contract Deploy is Script { "Verifier implementation deployed at: %s", address(verifierImpl) ); + Groth16Verifier groth16Verifier = new Groth16Verifier(); ERC1967Proxy verifierProxy = new ERC1967Proxy( address(verifierImpl), - abi.encodeCall(verifierImpl.initialize, (initialOwner)) + abi.encodeCall( + verifierImpl.initialize, + (initialOwner, address(groth16Verifier)) + ) ); verifier = Verifier(address(verifierProxy)); console.log("Verifier deployed at: %s", address(verifier)); @@ -116,7 +121,7 @@ contract Deploy is Script { abi.encodeCall( recoveryControllerZKSyncImpl.initialize, ( - signer, + initialOwner, address(verifier), address(dkim), address(emailAuthImpl), @@ -152,7 +157,7 @@ contract Deploy is Script { address(simpleWalletImpl), abi.encodeCall( simpleWalletImpl.initialize, - (signer, address(recoveryControllerZKSync)) + (initialOwner, address(recoveryControllerZKSync)) ) ); simpleWallet = SimpleWallet(payable(address(simpleWalletProxy))); diff --git a/packages/contracts/script/DeploySimpleWallet.s.sol b/packages/contracts/script/DeploySimpleWallet.s.sol index e2f4321e..3c22adcb 100644 --- a/packages/contracts/script/DeploySimpleWallet.s.sol +++ b/packages/contracts/script/DeploySimpleWallet.s.sol @@ -3,37 +3,18 @@ pragma solidity ^0.8.13; import "forge-std/Script.sol"; -import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol"; import "../test/helpers/SimpleWallet.sol"; -import "../src/utils/Verifier.sol"; -import "../src/utils/ECDSAOwnedDKIMRegistry.sol"; -import "../src/EmailAuth.sol"; contract Deploy is Script { - using ECDSA for *; - function run() external { uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY"); if (deployerPrivateKey == 0) { console.log("PRIVATE_KEY env var not set"); return; } - address dkim = vm.envAddress("DKIM"); - if (dkim == address(0)) { - console.log("DKIM env var not set"); - return; - } - address verifier = vm.envAddress("VERIFIER"); - if (verifier == address(0)) { - console.log("VERIFIER env var not set"); - return; - } - address emailAuthImpl = vm.envAddress("EMAIL_AUTH_IMPL"); - if (emailAuthImpl == address(0)) { - console.log("EMAIL_AUTH_IMPL env var not set"); - return; - } + address initOwner = vm.addr(deployerPrivateKey); + address controller = vm.envAddress("CONTROLLER"); address simpleWalletImpl = vm.envAddress("SIMPLE_WALLET_IMPL"); if (simpleWalletImpl == address(0)) { console.log("SIMPLE_WALLET_IMPL env var not set"); @@ -43,10 +24,8 @@ contract Deploy is Script { vm.startBroadcast(deployerPrivateKey); bytes memory data = abi.encodeWithSelector( SimpleWallet(payable(simpleWalletImpl)).initialize.selector, - vm.addr(deployerPrivateKey), - verifier, - dkim, - emailAuthImpl + initOwner, + controller ); ERC1967Proxy proxy = new ERC1967Proxy(address(simpleWalletImpl), data); console.log("SimpleWallet deployed at: %s", address(proxy)); diff --git a/packages/contracts/src/EmailAccountRecovery.sol b/packages/contracts/src/EmailAccountRecovery.sol index c1a87acd..d1754387 100644 --- a/packages/contracts/src/EmailAccountRecovery.sol +++ b/packages/contracts/src/EmailAccountRecovery.sol @@ -44,53 +44,53 @@ abstract contract EmailAccountRecovery { address recoveredAccount ) public view virtual returns (bool); - /// @notice Returns a two-dimensional array of strings representing the subject templates for an acceptance by a new guardian's. - /// @dev This function is virtual and should be implemented by inheriting contracts to define specific acceptance subject templates. - /// @return string[][] A two-dimensional array of strings, where each inner array represents a set of fixed strings and matchers for a subject template. - function acceptanceSubjectTemplates() + /// @notice Returns a two-dimensional array of strings representing the command templates for an acceptance by a new guardian's. + /// @dev This function is virtual and should be implemented by inheriting contracts to define specific acceptance command templates. + /// @return string[][] A two-dimensional array of strings, where each inner array represents a set of fixed strings and matchers for a command template. + function acceptanceCommandTemplates() public view virtual returns (string[][] memory); - /// @notice Returns a two-dimensional array of strings representing the subject templates for email recovery. - /// @dev This function is virtual and should be implemented by inheriting contracts to define specific recovery subject templates. - /// @return string[][] A two-dimensional array of strings, where each inner array represents a set of fixed strings and matchers for a subject template. - function recoverySubjectTemplates() + /// @notice Returns a two-dimensional array of strings representing the command templates for email recovery. + /// @dev This function is virtual and should be implemented by inheriting contracts to define specific recovery command templates. + /// @return string[][] A two-dimensional array of strings, where each inner array represents a set of fixed strings and matchers for a command template. + function recoveryCommandTemplates() public view virtual returns (string[][] memory); - /// @notice Extracts the account address to be recovered from the subject parameters of an acceptance email. - /// @dev This function is virtual and should be implemented by inheriting contracts to extract the account address from the subject parameters. - /// @param subjectParams The subject parameters of the acceptance email. - /// @param templateIdx The index of the acceptance subject template. - function extractRecoveredAccountFromAcceptanceSubject( - bytes[] memory subjectParams, + /// @notice Extracts the account address to be recovered from the command parameters of an acceptance email. + /// @dev This function is virtual and should be implemented by inheriting contracts to extract the account address from the command parameters. + /// @param commandParams The command parameters of the acceptance email. + /// @param templateIdx The index of the acceptance command template. + function extractRecoveredAccountFromAcceptanceCommand( + bytes[] memory commandParams, uint templateIdx ) public view virtual returns (address); - /// @notice Extracts the account address to be recovered from the subject parameters of a recovery email. - /// @dev This function is virtual and should be implemented by inheriting contracts to extract the account address from the subject parameters. - /// @param subjectParams The subject parameters of the recovery email. - /// @param templateIdx The index of the recovery subject template. - function extractRecoveredAccountFromRecoverySubject( - bytes[] memory subjectParams, + /// @notice Extracts the account address to be recovered from the command parameters of a recovery email. + /// @dev This function is virtual and should be implemented by inheriting contracts to extract the account address from the command parameters. + /// @param commandParams The command parameters of the recovery email. + /// @param templateIdx The index of the recovery command template. + function extractRecoveredAccountFromRecoveryCommand( + bytes[] memory commandParams, uint templateIdx ) public view virtual returns (address); function acceptGuardian( address guardian, uint templateIdx, - bytes[] memory subjectParams, + bytes[] memory commandParams, bytes32 emailNullifier ) internal virtual; function processRecovery( address guardian, uint templateIdx, - bytes[] memory subjectParams, + bytes[] memory commandParams, bytes32 emailNullifier ) internal virtual; @@ -124,11 +124,7 @@ abstract contract EmailAccountRecovery { emailAuthImplementation(), abi.encodeCall( EmailAuth.initialize, - ( - recoveredAccount, - accountSalt, - address(this) - ) + (recoveredAccount, accountSalt, address(this)) ) ) ) @@ -142,7 +138,7 @@ abstract contract EmailAccountRecovery { /// @param accountSalt A bytes32 salt value used to ensure the uniqueness of the deployed proxy address. /// @return address The address of the newly deployed proxy contract. function deployEmailAuthProxy( - address recoveredAccount, + address recoveredAccount, bytes32 accountSalt ) internal virtual returns (address) { ERC1967Proxy proxy = new ERC1967Proxy{salt: accountSalt}( @@ -155,10 +151,10 @@ abstract contract EmailAccountRecovery { return address(proxy); } - /// @notice Calculates a unique subject template ID for an acceptance subject template using its index. + /// @notice Calculates a unique command template ID for an acceptance command template using its index. /// @dev Encodes the email account recovery version ID, "ACCEPTANCE", and the template index, /// then uses keccak256 to hash these values into a uint ID. - /// @param templateIdx The index of the acceptance subject template. + /// @param templateIdx The index of the acceptance command template. /// @return uint The computed uint ID. function computeAcceptanceTemplateId( uint templateIdx @@ -175,10 +171,10 @@ abstract contract EmailAccountRecovery { ); } - /// @notice Calculates a unique ID for a recovery subject template using its index. + /// @notice Calculates a unique ID for a recovery command template using its index. /// @dev Encodes the email account recovery version ID, "RECOVERY", and the template index, /// then uses keccak256 to hash these values into a uint256 ID. - /// @param templateIdx The index of the recovery subject template. + /// @param templateIdx The index of the recovery command template. /// @return uint The computed uint ID. function computeRecoveryTemplateId( uint templateIdx @@ -197,13 +193,13 @@ abstract contract EmailAccountRecovery { /// @notice Handles an acceptance by a new guardian. /// @dev This function validates the email auth message, deploys a new EmailAuth contract as a proxy if validations pass and initializes the contract. /// @param emailAuthMsg The email auth message for the email send from the guardian. - /// @param templateIdx The index of the subject template for acceptance, which should match with the subject in the given email auth message. + /// @param templateIdx The index of the command template for acceptance, which should match with the command in the given email auth message. function handleAcceptance( EmailAuthMsg memory emailAuthMsg, uint templateIdx ) external { - address recoveredAccount = extractRecoveredAccountFromAcceptanceSubject( - emailAuthMsg.subjectParams, + address recoveredAccount = extractRecoveredAccountFromAcceptanceCommand( + emailAuthMsg.commandParams, templateIdx ); require(recoveredAccount != address(0), "invalid account in email"); @@ -217,24 +213,27 @@ abstract contract EmailAccountRecovery { EmailAuth guardianEmailAuth; if (guardian.code.length == 0) { - address proxyAddress = deployEmailAuthProxy(recoveredAccount, emailAuthMsg.proof.accountSalt); + address proxyAddress = deployEmailAuthProxy( + recoveredAccount, + emailAuthMsg.proof.accountSalt + ); guardianEmailAuth = EmailAuth(proxyAddress); guardianEmailAuth.initDKIMRegistry(dkim()); guardianEmailAuth.initVerifier(verifier()); for ( uint idx = 0; - idx < acceptanceSubjectTemplates().length; + idx < acceptanceCommandTemplates().length; idx++ ) { - guardianEmailAuth.insertSubjectTemplate( + guardianEmailAuth.insertCommandTemplate( computeAcceptanceTemplateId(idx), - acceptanceSubjectTemplates()[idx] + acceptanceCommandTemplates()[idx] ); } - for (uint idx = 0; idx < recoverySubjectTemplates().length; idx++) { - guardianEmailAuth.insertSubjectTemplate( + for (uint idx = 0; idx < recoveryCommandTemplates().length; idx++) { + guardianEmailAuth.insertCommandTemplate( computeRecoveryTemplateId(idx), - recoverySubjectTemplates()[idx] + recoveryCommandTemplates()[idx] ); } } else { @@ -251,22 +250,22 @@ abstract contract EmailAccountRecovery { acceptGuardian( guardian, templateIdx, - emailAuthMsg.subjectParams, + emailAuthMsg.commandParams, emailAuthMsg.proof.emailNullifier ); } /// @notice Processes the recovery based on an email from the guardian. - /// @dev Verify the provided email auth message for a deployed guardian's EmailAuth contract and a specific subject template for recovery. + /// @dev Verify the provided email auth message for a deployed guardian's EmailAuth contract and a specific command template for recovery. /// Requires that the guardian is already deployed, and the template ID corresponds to the `templateId` in the given email auth message. Once validated. /// @param emailAuthMsg The email auth message for recovery. - /// @param templateIdx The index of the subject template for recovery, which should match with the subject in the given email auth message. + /// @param templateIdx The index of the command template for recovery, which should match with the command in the given email auth message. function handleRecovery( EmailAuthMsg memory emailAuthMsg, uint templateIdx ) external { - address recoveredAccount = extractRecoveredAccountFromRecoverySubject( - emailAuthMsg.subjectParams, + address recoveredAccount = extractRecoveredAccountFromRecoveryCommand( + emailAuthMsg.commandParams, templateIdx ); require(recoveredAccount != address(0), "invalid account in email"); @@ -296,7 +295,7 @@ abstract contract EmailAccountRecovery { processRecovery( guardian, templateIdx, - emailAuthMsg.subjectParams, + emailAuthMsg.commandParams, emailAuthMsg.proof.emailNullifier ); } diff --git a/packages/contracts/src/EmailAccountRecoveryZKSync.sol b/packages/contracts/src/EmailAccountRecoveryZKSync.sol index fbd14a68..95ec720b 100644 --- a/packages/contracts/src/EmailAccountRecoveryZKSync.sol +++ b/packages/contracts/src/EmailAccountRecoveryZKSync.sol @@ -9,13 +9,13 @@ import {ZKSyncCreate2Factory} from "./utils/ZKSyncCreate2Factory.sol"; /// @notice Provides mechanisms for email-based account recovery, leveraging guardians and template-based email verification. /// @dev This contract is abstract and requires implementation of several methods for configuring a new guardian and recovering an account contract. abstract contract EmailAccountRecoveryZKSync is EmailAccountRecovery { - // This is the address of the zkSync factory contract address public factoryAddr; // The bytecodeHash is hardcoded here because type(ERC1967Proxy).creationCode doesn't work on eraVM currently // If you failed some test cases, check the bytecodeHash by yourself // see, test/ComputeCreate2Address.t.sol - bytes32 public constant proxyBytecodeHash = 0x0100008338d33e12c716a5b695c6f7f4e526cf162a9378c0713eea5386c09951; + bytes32 public constant proxyBytecodeHash = + 0x010000835b32e9a15f4b6353ad649fa33f4fbe4f5139126c07205e738b9f758e; /// @notice Returns the address of the zkSyncfactory contract. /// @dev This function is virtual and can be overridden by inheriting contracts. @@ -34,19 +34,20 @@ abstract contract EmailAccountRecoveryZKSync is EmailAccountRecovery { function computeEmailAuthAddress( address recoveredAccount, bytes32 accountSalt - ) public view override returns (address) { + ) public view virtual override returns (address) { // If on zksync, we use another logic to calculate create2 address. - return ZKSyncCreate2Factory(factory()).computeAddress( - accountSalt, - proxyBytecodeHash, - abi.encode( - emailAuthImplementation(), - abi.encodeCall( - EmailAuth.initialize, - (recoveredAccount, accountSalt, address(this)) + return + ZKSyncCreate2Factory(factory()).computeAddress( + accountSalt, + proxyBytecodeHash, + abi.encode( + emailAuthImplementation(), + abi.encodeCall( + EmailAuth.initialize, + (recoveredAccount, accountSalt, address(this)) + ) ) - ) - ); + ); } /// @notice Deploys a proxy contract for email authentication using the CREATE2 opcode. @@ -57,25 +58,23 @@ abstract contract EmailAccountRecoveryZKSync is EmailAccountRecovery { /// @param accountSalt A bytes32 salt value defined as a hash of the guardian's email address and an account code. This is assumed to be unique to a pair of the guardian's email address and the wallet address to be recovered. /// @return address The address of the deployed proxy contract. function deployEmailAuthProxy( - address recoveredAccount, + address recoveredAccount, bytes32 accountSalt - ) internal override returns (address) { - (bool success, bytes memory returnData) = ZKSyncCreate2Factory(factory()).deploy( - accountSalt, - proxyBytecodeHash, - abi.encode( - emailAuthImplementation(), - abi.encodeCall( - EmailAuth.initialize, - ( - recoveredAccount, - accountSalt, - address(this) + ) internal virtual override returns (address) { + (bool success, bytes memory returnData) = ZKSyncCreate2Factory( + factory() + ).deploy( + accountSalt, + proxyBytecodeHash, + abi.encode( + emailAuthImplementation(), + abi.encodeCall( + EmailAuth.initialize, + (recoveredAccount, accountSalt, address(this)) ) ) - ) - ); + ); address payable proxyAddress = abi.decode(returnData, (address)); return proxyAddress; } -} \ No newline at end of file +} diff --git a/packages/contracts/src/EmailAuth.sol b/packages/contracts/src/EmailAuth.sol index 19297fd7..07b883b6 100644 --- a/packages/contracts/src/EmailAuth.sol +++ b/packages/contracts/src/EmailAuth.sol @@ -4,25 +4,25 @@ pragma solidity ^0.8.12; import {EmailProof} from "./utils/Verifier.sol"; import {IDKIMRegistry} from "@zk-email/contracts/DKIMRegistry.sol"; import {Verifier} from "./utils/Verifier.sol"; -import {SubjectUtils} from "./libraries/SubjectUtils.sol"; +import {CommandUtils} from "./libraries/CommandUtils.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; /// @notice Struct to hold the email authentication/authorization message. struct EmailAuthMsg { - /// @notice The ID of the subject template that the email subject should satisfy. + /// @notice The ID of the command template that the command in the email body should satisfy. uint templateId; - /// @notice The parameters in the email subject, which should be taken according to the specified subject template. - bytes[] subjectParams; - /// @notice The number of skiiped bytes in the email subject. - uint skipedSubjectPrefix; + /// @notice The parameters in the command of the email body, which should be taken according to the specified command template. + bytes[] commandParams; + /// @notice The number of skipped bytes in the command. + uint skippedCommandPrefix; /// @notice The email proof containing the zk proof and other necessary information for the email verification by the verifier contract. EmailProof proof; } /// @title Email Authentication/Authorization Contract -/// @notice This contract provides functionalities for the authentication of the email sender and the authentication of the message in the email subject using DKIM and custom verification logic. +/// @notice This contract provides functionalities for the authentication of the email sender and the authentication of the message in the command part of the email body using DKIM and custom verification logic. /// @dev Inherits from OwnableUpgradeable and UUPSUpgradeable for upgradeability and ownership management. contract EmailAuth is OwnableUpgradeable, UUPSUpgradeable { /// The CREATE2 salt of this contract defined as a hash of an email address and an account code. @@ -31,10 +31,10 @@ contract EmailAuth is OwnableUpgradeable, UUPSUpgradeable { IDKIMRegistry internal dkim; /// An instance of the Verifier contract. Verifier internal verifier; - /// An address of a controller contract, defining the subject templates supported by this contract. + /// An address of a controller contract, defining the command templates supported by this contract. address public controller; - /// A mapping of the supported subject templates associated with its ID. - mapping(uint => string[]) public subjectTemplates; + /// A mapping of the supported command templates associated with its ID. + mapping(uint => string[]) public commandTemplates; /// A mapping of the hash of the authorized message associated with its `emailNullifier`. uint public lastTimestamp; /// The latest `timestamp` in the verified `EmailAuthMsg`. @@ -44,9 +44,9 @@ contract EmailAuth is OwnableUpgradeable, UUPSUpgradeable { event DKIMRegistryUpdated(address indexed dkimRegistry); event VerifierUpdated(address indexed verifier); - event SubjectTemplateInserted(uint indexed templateId); - event SubjectTemplateUpdated(uint indexed templateId); - event SubjectTemplateDeleted(uint indexed templateId); + event CommandTemplateInserted(uint indexed templateId); + event CommandTemplateUpdated(uint indexed templateId); + event CommandTemplateDeleted(uint indexed templateId); event EmailAuthed( bytes32 indexed emailNullifier, bytes32 indexed accountSalt, @@ -135,70 +135,70 @@ contract EmailAuth is OwnableUpgradeable, UUPSUpgradeable { emit VerifierUpdated(_verifierAddr); } - /// @notice Retrieves a subject template by its ID. - /// @param _templateId The ID of the subject template to be retrieved. - /// @return string[] The subject template as an array of strings. - function getSubjectTemplate( + /// @notice Retrieves a command template by its ID. + /// @param _templateId The ID of the command template to be retrieved. + /// @return string[] The command template as an array of strings. + function getCommandTemplate( uint _templateId ) public view returns (string[] memory) { require( - subjectTemplates[_templateId].length > 0, + commandTemplates[_templateId].length > 0, "template id not exists" ); - return subjectTemplates[_templateId]; + return commandTemplates[_templateId]; } - /// @notice Inserts a new subject template. + /// @notice Inserts a new command template. /// @dev This function can only be called by the owner of the contract. - /// @param _templateId The ID for the new subject template. - /// @param _subjectTemplate The subject template as an array of strings. - function insertSubjectTemplate( + /// @param _templateId The ID for the new command template. + /// @param _commandTemplate The command template as an array of strings. + function insertCommandTemplate( uint _templateId, - string[] memory _subjectTemplate + string[] memory _commandTemplate ) public onlyController { - require(_subjectTemplate.length > 0, "subject template is empty"); + require(_commandTemplate.length > 0, "command template is empty"); require( - subjectTemplates[_templateId].length == 0, + commandTemplates[_templateId].length == 0, "template id already exists" ); - subjectTemplates[_templateId] = _subjectTemplate; - emit SubjectTemplateInserted(_templateId); + commandTemplates[_templateId] = _commandTemplate; + emit CommandTemplateInserted(_templateId); } - /// @notice Updates an existing subject template by its ID. + /// @notice Updates an existing command template by its ID. /// @dev This function can only be called by the controller contract. /// @param _templateId The ID of the template to update. - /// @param _subjectTemplate The new subject template as an array of strings. - function updateSubjectTemplate( + /// @param _commandTemplate The new command template as an array of strings. + function updateCommandTemplate( uint _templateId, - string[] memory _subjectTemplate + string[] memory _commandTemplate ) public onlyController { - require(_subjectTemplate.length > 0, "subject template is empty"); + require(_commandTemplate.length > 0, "command template is empty"); require( - subjectTemplates[_templateId].length > 0, + commandTemplates[_templateId].length > 0, "template id not exists" ); - subjectTemplates[_templateId] = _subjectTemplate; - emit SubjectTemplateUpdated(_templateId); + commandTemplates[_templateId] = _commandTemplate; + emit CommandTemplateUpdated(_templateId); } - /// @notice Deletes an existing subject template by its ID. + /// @notice Deletes an existing command template by its ID. /// @dev This function can only be called by the owner of the contract. - /// @param _templateId The ID of the subject template to be deleted. - function deleteSubjectTemplate(uint _templateId) public onlyController { + /// @param _templateId The ID of the command template to be deleted. + function deleteCommandTemplate(uint _templateId) public onlyController { require( - subjectTemplates[_templateId].length > 0, + commandTemplates[_templateId].length > 0, "template id not exists" ); - delete subjectTemplates[_templateId]; - emit SubjectTemplateDeleted(_templateId); + delete commandTemplates[_templateId]; + emit CommandTemplateDeleted(_templateId); } - /// @notice Authenticate the email sender and authorize the message in the email subject based on the provided email auth message. + /// @notice Authenticate the email sender and authorize the message in the email command based on the provided email auth message. /// @dev This function can only be called by the controller contract. /// @param emailAuthMsg The email auth message containing all necessary information for authentication and authorization. function authEmail(EmailAuthMsg memory emailAuthMsg) public onlyController { - string[] memory template = subjectTemplates[emailAuthMsg.templateId]; + string[] memory template = commandTemplates[emailAuthMsg.templateId]; require(template.length > 0, "template id not exists"); require( dkim.isDKIMPublicKeyHashValid( @@ -222,32 +222,32 @@ contract EmailAuth is OwnableUpgradeable, UUPSUpgradeable { "invalid timestamp" ); require( - bytes(emailAuthMsg.proof.maskedSubject).length <= - verifier.SUBJECT_BYTES(), - "invalid masked subject length" + bytes(emailAuthMsg.proof.maskedCommand).length <= + verifier.COMMAND_BYTES(), + "invalid masked command length" ); require( - emailAuthMsg.skipedSubjectPrefix < verifier.SUBJECT_BYTES(), - "invalid size of the skipped subject prefix" + emailAuthMsg.skippedCommandPrefix < verifier.COMMAND_BYTES(), + "invalid size of the skipped command prefix" ); - // Construct an expectedSubject from template and the values of emailAuthMsg.subjectParams. - string memory trimmedMaskedSubject = removePrefix( - emailAuthMsg.proof.maskedSubject, - emailAuthMsg.skipedSubjectPrefix + // Construct an expectedCommand from template and the values of emailAuthMsg.commandParams. + string memory trimmedMaskedCommand = removePrefix( + emailAuthMsg.proof.maskedCommand, + emailAuthMsg.skippedCommandPrefix ); - string memory expectedSubject = ""; + string memory expectedCommand = ""; for (uint stringCase = 0; stringCase < 3; stringCase++) { - expectedSubject = SubjectUtils.computeExpectedSubject( - emailAuthMsg.subjectParams, + expectedCommand = CommandUtils.computeExpectedCommand( + emailAuthMsg.commandParams, template, stringCase ); - if (Strings.equal(expectedSubject, trimmedMaskedSubject)) { + if (Strings.equal(expectedCommand, trimmedMaskedCommand)) { break; } if (stringCase == 2) { - revert("invalid subject"); + revert("invalid command"); } } diff --git a/packages/contracts/src/interfaces/IGroth16Verifier.sol b/packages/contracts/src/interfaces/IGroth16Verifier.sol new file mode 100644 index 00000000..47bc46fd --- /dev/null +++ b/packages/contracts/src/interfaces/IGroth16Verifier.sol @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.9; + +interface IGroth16Verifier { + function verifyProof( + uint[2] calldata _pA, + uint[2][2] calldata _pB, + uint[2] calldata _pC, + uint[34] calldata _pubSignals + ) external view returns (bool); +} diff --git a/packages/contracts/src/libraries/SubjectUtils.sol b/packages/contracts/src/libraries/CommandUtils.sol similarity index 83% rename from packages/contracts/src/libraries/SubjectUtils.sol rename to packages/contracts/src/libraries/CommandUtils.sol index 84823931..71fba9d9 100644 --- a/packages/contracts/src/libraries/SubjectUtils.sol +++ b/packages/contracts/src/libraries/CommandUtils.sol @@ -6,7 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {Address} from "@openzeppelin/contracts/utils/Address.sol"; import "./DecimalUtils.sol"; -library SubjectUtils { +library CommandUtils { bytes16 private constant LOWER_HEX_DIGITS = "0123456789abcdef"; bytes16 private constant UPPER_HEX_DIGITS = "0123456789ABCDEF"; string public constant STRING_MATCHER = "{string}"; @@ -102,16 +102,16 @@ library SubjectUtils { return string(hexString); } - /// @notice Calculate the expected subject. - /// @param subjectParams Params to be used in the subject - /// @param template Template to be used for the subject - /// @param stringCase Case of the string - 0:checksumed, 1: lowercase, 2: uppercase - function computeExpectedSubject( - bytes[] memory subjectParams, + /// @notice Calculate the expected command. + /// @param commandParams Params to be used in the command + /// @param template Template to be used for the command + /// @param stringCase Case of the ethereum address string to be used for the command - 0: checksum, 1: lowercase, 2: uppercase + function computeExpectedCommand( + bytes[] memory commandParams, string[] memory template, uint stringCase - ) public pure returns (string memory expectedSubject) { - // Construct an expectedSubject from template and the values of emailAuthMsg.subjectParams. + ) public pure returns (string memory expectedCommand) { + // Construct an expectedCommand from template and the values of commandParams. uint8 nextParamIndex = 0; string memory stringParam; bool isParamExist; @@ -119,31 +119,31 @@ library SubjectUtils { isParamExist = true; if (Strings.equal(template[i], STRING_MATCHER)) { string memory param = abi.decode( - subjectParams[nextParamIndex], + commandParams[nextParamIndex], (string) ); stringParam = param; } else if (Strings.equal(template[i], UINT_MATCHER)) { uint256 param = abi.decode( - subjectParams[nextParamIndex], + commandParams[nextParamIndex], (uint256) ); stringParam = Strings.toString(param); } else if (Strings.equal(template[i], INT_MATCHER)) { int256 param = abi.decode( - subjectParams[nextParamIndex], + commandParams[nextParamIndex], (int256) ); stringParam = Strings.toStringSigned(param); } else if (Strings.equal(template[i], DECIMALS_MATCHER)) { uint256 param = abi.decode( - subjectParams[nextParamIndex], + commandParams[nextParamIndex], (uint256) ); stringParam = DecimalUtils.uintToDecimalString(param); } else if (Strings.equal(template[i], ETH_ADDR_MATCHER)) { address param = abi.decode( - subjectParams[nextParamIndex], + commandParams[nextParamIndex], (address) ); stringParam = addressToHexString(param, stringCase); @@ -153,17 +153,17 @@ library SubjectUtils { } if (i > 0) { - expectedSubject = string( - abi.encodePacked(expectedSubject, " ") + expectedCommand = string( + abi.encodePacked(expectedCommand, " ") ); } - expectedSubject = string( - abi.encodePacked(expectedSubject, stringParam) + expectedCommand = string( + abi.encodePacked(expectedCommand, stringParam) ); if (isParamExist) { nextParamIndex++; } } - return expectedSubject; + return expectedCommand; } } diff --git a/packages/contracts/src/utils/Groth16Verifier.sol b/packages/contracts/src/utils/Groth16Verifier.sol index 68dce985..ef38a3b4 100644 --- a/packages/contracts/src/utils/Groth16Verifier.sol +++ b/packages/contracts/src/utils/Groth16Verifier.sol @@ -22,140 +22,229 @@ pragma solidity >=0.7.0 <0.9.0; contract Groth16Verifier { // Scalar field size - uint256 constant r = 21888242871839275222246405745257275088548364400416034343698204186575808495617; + uint256 constant r = + 21888242871839275222246405745257275088548364400416034343698204186575808495617; // Base field size - uint256 constant q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; + uint256 constant q = + 21888242871839275222246405745257275088696311157297823662689037894645226208583; // Verification Key data - uint256 constant alphax = 20491192805390485299153009773594534940189261866228447918068658471970481763042; - uint256 constant alphay = 9383485363053290200918347156157836566562967994039712273449902621266178545958; - uint256 constant betax1 = 4252822878758300859123897981450591353533073413197771768651442665752259397132; - uint256 constant betax2 = 6375614351688725206403948262868962793625744043794305715222011528459656738731; - uint256 constant betay1 = 21847035105528745403288232691147584728191162732299865338377159692350059136679; - uint256 constant betay2 = 10505242626370262277552901082094356697409835680220590971873171140371331206856; - uint256 constant gammax1 = 11559732032986387107991004021392285783925812861821192530917403151452391805634; - uint256 constant gammax2 = 10857046999023057135944570762232829481370756359578518086990519993285655852781; - uint256 constant gammay1 = 4082367875863433681332203403145435568316851327593401208105741076214120093531; - uint256 constant gammay2 = 8495653923123431417604973247489272438418190587263600148770280649306958101930; - uint256 constant deltax1 = 15319578088144148433870292454392579210531397678084258888038350512286180645447; - uint256 constant deltax2 = 1086199161593118582719091177042876064789126336461297231728792628701689859806; - uint256 constant deltay1 = 4446519589909698948619442693220675737896467901545229603388595770900353019149; - uint256 constant deltay2 = 8139820593384559533426709059696820531467462438480254791000622464992960199684; - - - uint256 constant IC0x = 13986287304781811629818135937460078168318260622373795543277096066372223143543; - uint256 constant IC0y = 15894331243762149015069486145475096510770522826153695662065578862511865498937; - - uint256 constant IC1x = 6657352747838160193290269178909503517423918732593479650799343149184802404227; - uint256 constant IC1y = 17531545371284544846757265261390554928852673143570772606416106283932089249579; - - uint256 constant IC2x = 16051798939592501067339450771812211828093389728707303947187369590196641845613; - uint256 constant IC2y = 10642771260914469864609917257305668847488863380437098896048772227333105938215; - - uint256 constant IC3x = 11516771157572865390427149046363199727462471754207638386939698647160647244244; - uint256 constant IC3y = 17750959699385211687017966515706019664346563638845176389048062816482362876919; - - uint256 constant IC4x = 16585945905928734303656632207622552215825428661762022954125060983592130784974; - uint256 constant IC4y = 3229598948329671362480222913836846699152815669479715539731783730018250763823; - - uint256 constant IC5x = 2735854243292750270201823836486550894787960439689214123103674588113028210303; - uint256 constant IC5y = 10229313779238541038726274141671860314069645438049912809508167509745776241686; - - uint256 constant IC6x = 14190416281134666159920819160995974222908686549823480648732091214431137294963; - uint256 constant IC6y = 9029501137578433593499338927272434967030906660585173877815017333537018567602; - - uint256 constant IC7x = 12170260117675309582350267080302912575028682087359352382893089877455951772473; - uint256 constant IC7y = 20464605792252479349840655650760617496046593314952148684746613675335058350942; - - uint256 constant IC8x = 4668263935738216597600035713072363446560555431149535779407481594748353348299; - uint256 constant IC8y = 6761669100053229151181201776369124528384949481913373501345799877551671442490; - - uint256 constant IC9x = 17613426733350227864491099426537059832375604576663256857363196285633689216670; - uint256 constant IC9y = 5805908718695762877817749042508472227770796644334990955096436485320700026010; - - uint256 constant IC10x = 1007270225032823010989311002543641079754257589690234134844035082768426542620; - uint256 constant IC10y = 21475642872129196888302396594264201358769263783216674834698667474324214197953; - - uint256 constant IC11x = 15081923087373370787973554347749696256252721214961183946262805192094431665288; - uint256 constant IC11y = 16680069154888020053830495566095733479743182649643804408659380808462437769348; - - uint256 constant IC12x = 7353920573820203673864179902327357836943865465363806932276427158533966054007; - uint256 constant IC12y = 4906960257966631805968560571985842137400392165080887614941226783003180438368; - - uint256 constant IC13x = 4533862304475638755375693106780349782380565190034231050848543922795764879802; - uint256 constant IC13y = 598446044155555715891219562107384479652732465225600288479065093170075495657; - - uint256 constant IC14x = 7122480915086391928930945426177923412929688778313549168236076125436940484112; - uint256 constant IC14y = 9038961138446510912414783948801197218570794393245280448178371602457294281632; - - uint256 constant IC15x = 6714101981980268884481533101476229027015190942378292707659542820827021193397; - uint256 constant IC15y = 11272887771609959733703167827323622301549783063678829277178890525700670890129; - - uint256 constant IC16x = 20437112715761765707147148391773769986470432308919910067302657232573395960162; - uint256 constant IC16y = 15321179474484971518132512130588191553678751040283340303685576790320739150657; - - uint256 constant IC17x = 19219092435091423465633523463253249487338506702794487406401643619518191650129; - uint256 constant IC17y = 17282626638553680622130806938296519057489422178618812871701640691501519771672; - - uint256 constant IC18x = 16606183112206685785600995921349860405026995817135601022134279364752803469536; - uint256 constant IC18y = 16043499772242927375270363061004003839285471350971879635887182974533742603287; - - uint256 constant IC19x = 1210707359308302969770163002263119043614552129675869248158635495219906105852; - uint256 constant IC19y = 12680511356057658336130187063160473463083334743891046286452211277763548137276; - - uint256 constant IC20x = 11086125674217491500739269827053901222271696690174050254374133368712953243088; - uint256 constant IC20y = 6053103800204978405773186514845086084032005357588363656542377416178871564775; - - uint256 constant IC21x = 14748494146527412772741859783064786419256684299339014876234608950795174044510; - uint256 constant IC21y = 8712883247211066789641782294202642212131980591356063435892043611448376329402; - - uint256 constant IC22x = 11839379700336717343079420809622942111687375327897345508451774961872673770316; - uint256 constant IC22y = 8895701596719783222411291561512126156358240424160295697039536555088618180915; - - uint256 constant IC23x = 18344723580640218566078573334781871542714315793755378650476142891258578517167; - uint256 constant IC23y = 6037447496975377303076282689670453476478799098316334507779292520966118416141; - - uint256 constant IC24x = 1219018687863146079804927794790349811713233524506071692145203043151155579912; - uint256 constant IC24y = 12259329329644691804803466046583012104373647543094116751541858451574329049339; - - uint256 constant IC25x = 18616266469772173270024938497854580018451184027620595567381348061717260755876; - uint256 constant IC25y = 13657793433977158706390923089623450140219483127718023788044217038622204508743; - - uint256 constant IC26x = 12727423626475319557504848343871689884624000795573098126755145386839939527511; - uint256 constant IC26y = 2938262592563768549228983305699572862280081061292424052023446347112367143549; - - uint256 constant IC27x = 21487591408762398705234938070547673395123973173141617628201773263097079121694; - uint256 constant IC27y = 12720246748523909661755448585533297402316709697570936404470276522191359637563; - - uint256 constant IC28x = 16467178226026300059831605377943086050334723191464668213518101445484504783848; - uint256 constant IC28y = 9139131916495414634537516523354727831542697092324217153640571950935058484467; - - uint256 constant IC29x = 11813394657812788297263465566473337219295871229603907247462957762987163286727; - uint256 constant IC29y = 2333466569019313289053951330259295038552214976343543633683510156531235807982; - - uint256 constant IC30x = 5758319522107086585563855735449863655068464994393372981823525634565012585161; - uint256 constant IC30y = 281303738559625778766939028867621386494750433481191839742375920626126152406; - - uint256 constant IC31x = 10766255441893413771043297335573055973288564739850120191905483233382630740246; - uint256 constant IC31y = 8012588191039935342856190453376510257080197619321852273994553617995812833773; - - uint256 constant IC32x = 13740647652203492799542105246627141268848155986372129145815588390071245063824; - uint256 constant IC32y = 12989805147963975539185412669782613149167981050611353053030652178298637898321; - - uint256 constant IC33x = 11678473503165871308190682100052535955722167524502187482920769926720343167599; - uint256 constant IC33y = 13548393914151182724283386224251830133662331816742832947222699249802146353834; - - uint256 constant IC34x = 20746424191835410865488887203537015077703505567964632145891041247460534632431; - uint256 constant IC34y = 14888985375914925013094608784755252069956164909406628467775584250729953169513; - - + uint256 constant alphax = + 20491192805390485299153009773594534940189261866228447918068658471970481763042; + uint256 constant alphay = + 9383485363053290200918347156157836566562967994039712273449902621266178545958; + uint256 constant betax1 = + 4252822878758300859123897981450591353533073413197771768651442665752259397132; + uint256 constant betax2 = + 6375614351688725206403948262868962793625744043794305715222011528459656738731; + uint256 constant betay1 = + 21847035105528745403288232691147584728191162732299865338377159692350059136679; + uint256 constant betay2 = + 10505242626370262277552901082094356697409835680220590971873171140371331206856; + uint256 constant gammax1 = + 11559732032986387107991004021392285783925812861821192530917403151452391805634; + uint256 constant gammax2 = + 10857046999023057135944570762232829481370756359578518086990519993285655852781; + uint256 constant gammay1 = + 4082367875863433681332203403145435568316851327593401208105741076214120093531; + uint256 constant gammay2 = + 8495653923123431417604973247489272438418190587263600148770280649306958101930; + uint256 constant deltax1 = + 10433082117781289465772979793225448958552973147056379387107424694719430078183; + uint256 constant deltax2 = + 7275826864108750902980191877201544327099639445097295071715716197584022501217; + uint256 constant deltay1 = + 12045503589921692978672400276439014666986009309508030338062238114576580523348; + uint256 constant deltay2 = + 5167266045144281780726036397587954855586209241615262341293096620571928275241; + + uint256 constant IC0x = + 14420976692606365609454257135434328632805959473973286981673284088060119898838; + uint256 constant IC0y = + 3237727173942946479267676846429217525953135300179916547171195052204761246016; + + uint256 constant IC1x = + 11242243116165410418833602736488883618535128769898487771024836696023857465078; + uint256 constant IC1y = + 3944125875514495469428761178435611665072101970023736373804875966482548972424; + + uint256 constant IC2x = + 13444687970779241874983655345748698054742845164432935489947273666155122460289; + uint256 constant IC2y = + 21224652167029042637908968340315123408212528634456523234010312093840631034658; + + uint256 constant IC3x = + 6223278095306548402665889948737566703639314941454342116499455309193776009394; + uint256 constant IC3y = + 3166189940732838088289487889047362887677679902266639433494062252267843006033; + + uint256 constant IC4x = + 10816631512908557343349023271022520591434729012608504881463056258162562470478; + uint256 constant IC4y = + 7553268499036051315278338406042049999218595304176271777756017758867657854668; + + uint256 constant IC5x = + 4071416866028362268560008820862586961030580397814903526444213717756336978375; + uint256 constant IC5y = + 5882120478213084184478310869582676016227773303131677302373100370040076790180; + + uint256 constant IC6x = + 11734717795004643123638327357128685172014034657612399074715429226722658631266; + uint256 constant IC6y = + 16373602507399860749002874686406539840487965214428380629195095307329304471831; + + uint256 constant IC7x = + 17995242574665353969882544970809346971980578867255316834879417403787422177779; + uint256 constant IC7y = + 19598869527810550137301357794896707958610742032745888008070796990675647167438; + + uint256 constant IC8x = + 15333007330168660247285804146177263702283991094081656975888675677742499858801; + uint256 constant IC8y = + 3622983327849337081794030911901750861761088652919413360963959440884276356515; + + uint256 constant IC9x = + 14592598453216971911118910753077725013203270532742585163748407745719533451518; + uint256 constant IC9y = + 1732486974024268892903158999835737802052796658580804609834621732126532847367; + + uint256 constant IC10x = + 9608760299311764957965020896382267062379773438090355782074251684342995171221; + uint256 constant IC10y = + 18768971212393705710205169899071271227246850342771830091251994505002517649543; + + uint256 constant IC11x = + 18229713854414772793917571039862241859243290635273907596834836608693704592373; + uint256 constant IC11y = + 1354957943711196195900175201625492118583365814055323140317564226352214552501; + + uint256 constant IC12x = + 4540048316384448988784022044695474025704244408393204872837050282034324974955; + uint256 constant IC12y = + 12889131931011399139025112922332330923524276708703486137710524916145921772003; + + uint256 constant IC13x = + 10260170402680733092165416374102715050316461777911507389592209476741076666114; + uint256 constant IC13y = + 10621497058496187206533851857372855187411269122792661496327887622312773096373; + + uint256 constant IC14x = + 4211461709999443083034879779565627271437397337531026812125070026750873693080; + uint256 constant IC14y = + 18467608266766262084409632308104903215532489446465294776664019514313833622275; + + uint256 constant IC15x = + 9139115676316577941242771581653053080955401927531325123468615971408706509241; + uint256 constant IC15y = + 9164313109700564988896172664560830764060639180869132590006516315434795315437; + + uint256 constant IC16x = + 8055062813885465561166049536110231123741745748861232693686007271655092618041; + uint256 constant IC16y = + 4510221627106525233912238941858162972422084397106560474450183916928061274103; + + uint256 constant IC17x = + 1507186560667512546403688953670998250315628457214357234952217475451563331987; + uint256 constant IC17y = + 17071593518480573061174595519667499531902707878706006270613337175041459137032; + + uint256 constant IC18x = + 16762847668396014973033660303062581513242379616013803571550493698889447450812; + uint256 constant IC18y = + 17006420456782153650908127824637694821957086423954188936477697337268237314792; + + uint256 constant IC19x = + 17577663376594144399743129857840103856635877754916782842519048073412103543225; + uint256 constant IC19y = + 21284834289036339572765424015780927653463792202070493220185327060720557536153; + + uint256 constant IC20x = + 16974417587802350668283436092050410822135612040525093207677793563266434898899; + uint256 constant IC20y = + 10577911945362631640255946262746706583221370481437827188366150551549490701563; + + uint256 constant IC21x = + 7648089745961110787060572088126537400868566614244157722652493282774570897306; + uint256 constant IC21y = + 5771535376772212949945259105932244016275600714895136777592719710059589930578; + + uint256 constant IC22x = + 14921736432665742630629608167623006910311804948046840596497195761330490353359; + uint256 constant IC22y = + 14215720104074512767679668828223147475518903442603114867950535356580700634265; + + uint256 constant IC23x = + 14807951812496054917199644721274028450973199590549199626326743360499724939100; + uint256 constant IC23y = + 13396573693115293914922022639761946049996991749562789764893885956377368829023; + + uint256 constant IC24x = + 946959077341401468258673477010661575493350299894729588837485560993685482032; + uint256 constant IC24y = + 20570356357018532028601279688731350534146086904670254722628961938492868330345; + + uint256 constant IC25x = + 2148991523060877253038248533639729462350984432768284099241119419519252893539; + uint256 constant IC25y = + 19770588615554020041636512722294181393662192009340177424932751009199907422519; + + uint256 constant IC26x = + 3747878854274778152623809873153099102641291773237420658483003597255752380852; + uint256 constant IC26y = + 9101065225212227091551571514843375002653632703977216400939979268283954265300; + + uint256 constant IC27x = + 21031066699877095106651494566013301499428447799745230410837452349553101774320; + uint256 constant IC27y = + 16064211054461593402319195858630318172586733205260338032143803066661211213772; + + uint256 constant IC28x = + 7134851187269606902216669356694699867879169670464902433281001074684321873924; + uint256 constant IC28y = + 8200092285454074110879487215112662564626493123135666536713788988496182625169; + + uint256 constant IC29x = + 16783075251656600287266260045074464061567969583063942600473764372418413016777; + uint256 constant IC29y = + 16335574261246374092454229631189633336308135807569085967237651070836039968818; + + uint256 constant IC30x = + 18767147382384409410413363730064028585638124996514027800481404559552256526; + uint256 constant IC30y = + 5893729199256651364790555780931353184898130539524140758522955719432990189455; + + uint256 constant IC31x = + 16673100255008534170974248428282891797220989026129402665363975376767488775417; + uint256 constant IC31y = + 11242595605003176651284733632654591951414346866379786815099235732235467678271; + + uint256 constant IC32x = + 14304354639208062657751514661745433699866474083874289024775056731428339652996; + uint256 constant IC32y = + 21067499116906247821838563471313426612497479641552212451088084053907374443686; + + uint256 constant IC33x = + 14695351664477545562934225515932933391739717812930861530027307263509227127839; + uint256 constant IC33y = + 13797285223976228908447726624003414144346497900738839904003106351418953773996; + + uint256 constant IC34x = + 16696383166685664550749463360579321447259768183797789828152025370318762267913; + uint256 constant IC34y = + 5539498916849826447504399176766255291145081992895211478547376199843753155197; + // Memory data uint16 constant pVk = 0; uint16 constant pPairing = 128; uint16 constant pLastMem = 896; - function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[34] calldata _pubSignals) public view returns (bool) { + function verifyProof( + uint[2] calldata _pA, + uint[2][2] calldata _pB, + uint[2] calldata _pC, + uint[34] calldata _pubSignals + ) public view returns (bool) { assembly { function checkField(v) { if iszero(lt(v, r)) { @@ -163,7 +252,7 @@ contract Groth16Verifier { return(0, 0x20) } } - + // G1 function to multiply a G1 value(x,y) to value in an address function g1_mulAccC(pR, x, y, s) { let success @@ -198,79 +287,206 @@ contract Groth16Verifier { mstore(add(_pVk, 32), IC0y) // Compute the linear combination vk_x - + g1_mulAccC(_pVk, IC1x, IC1y, calldataload(add(pubSignals, 0))) - + g1_mulAccC(_pVk, IC2x, IC2y, calldataload(add(pubSignals, 32))) - + g1_mulAccC(_pVk, IC3x, IC3y, calldataload(add(pubSignals, 64))) - + g1_mulAccC(_pVk, IC4x, IC4y, calldataload(add(pubSignals, 96))) - + g1_mulAccC(_pVk, IC5x, IC5y, calldataload(add(pubSignals, 128))) - + g1_mulAccC(_pVk, IC6x, IC6y, calldataload(add(pubSignals, 160))) - + g1_mulAccC(_pVk, IC7x, IC7y, calldataload(add(pubSignals, 192))) - + g1_mulAccC(_pVk, IC8x, IC8y, calldataload(add(pubSignals, 224))) - + g1_mulAccC(_pVk, IC9x, IC9y, calldataload(add(pubSignals, 256))) - - g1_mulAccC(_pVk, IC10x, IC10y, calldataload(add(pubSignals, 288))) - - g1_mulAccC(_pVk, IC11x, IC11y, calldataload(add(pubSignals, 320))) - - g1_mulAccC(_pVk, IC12x, IC12y, calldataload(add(pubSignals, 352))) - - g1_mulAccC(_pVk, IC13x, IC13y, calldataload(add(pubSignals, 384))) - - g1_mulAccC(_pVk, IC14x, IC14y, calldataload(add(pubSignals, 416))) - - g1_mulAccC(_pVk, IC15x, IC15y, calldataload(add(pubSignals, 448))) - - g1_mulAccC(_pVk, IC16x, IC16y, calldataload(add(pubSignals, 480))) - - g1_mulAccC(_pVk, IC17x, IC17y, calldataload(add(pubSignals, 512))) - - g1_mulAccC(_pVk, IC18x, IC18y, calldataload(add(pubSignals, 544))) - - g1_mulAccC(_pVk, IC19x, IC19y, calldataload(add(pubSignals, 576))) - - g1_mulAccC(_pVk, IC20x, IC20y, calldataload(add(pubSignals, 608))) - - g1_mulAccC(_pVk, IC21x, IC21y, calldataload(add(pubSignals, 640))) - - g1_mulAccC(_pVk, IC22x, IC22y, calldataload(add(pubSignals, 672))) - - g1_mulAccC(_pVk, IC23x, IC23y, calldataload(add(pubSignals, 704))) - - g1_mulAccC(_pVk, IC24x, IC24y, calldataload(add(pubSignals, 736))) - - g1_mulAccC(_pVk, IC25x, IC25y, calldataload(add(pubSignals, 768))) - - g1_mulAccC(_pVk, IC26x, IC26y, calldataload(add(pubSignals, 800))) - - g1_mulAccC(_pVk, IC27x, IC27y, calldataload(add(pubSignals, 832))) - - g1_mulAccC(_pVk, IC28x, IC28y, calldataload(add(pubSignals, 864))) - - g1_mulAccC(_pVk, IC29x, IC29y, calldataload(add(pubSignals, 896))) - - g1_mulAccC(_pVk, IC30x, IC30y, calldataload(add(pubSignals, 928))) - - g1_mulAccC(_pVk, IC31x, IC31y, calldataload(add(pubSignals, 960))) - - g1_mulAccC(_pVk, IC32x, IC32y, calldataload(add(pubSignals, 992))) - - g1_mulAccC(_pVk, IC33x, IC33y, calldataload(add(pubSignals, 1024))) - - g1_mulAccC(_pVk, IC34x, IC34y, calldataload(add(pubSignals, 1056))) - + + g1_mulAccC( + _pVk, + IC10x, + IC10y, + calldataload(add(pubSignals, 288)) + ) + + g1_mulAccC( + _pVk, + IC11x, + IC11y, + calldataload(add(pubSignals, 320)) + ) + + g1_mulAccC( + _pVk, + IC12x, + IC12y, + calldataload(add(pubSignals, 352)) + ) + + g1_mulAccC( + _pVk, + IC13x, + IC13y, + calldataload(add(pubSignals, 384)) + ) + + g1_mulAccC( + _pVk, + IC14x, + IC14y, + calldataload(add(pubSignals, 416)) + ) + + g1_mulAccC( + _pVk, + IC15x, + IC15y, + calldataload(add(pubSignals, 448)) + ) + + g1_mulAccC( + _pVk, + IC16x, + IC16y, + calldataload(add(pubSignals, 480)) + ) + + g1_mulAccC( + _pVk, + IC17x, + IC17y, + calldataload(add(pubSignals, 512)) + ) + + g1_mulAccC( + _pVk, + IC18x, + IC18y, + calldataload(add(pubSignals, 544)) + ) + + g1_mulAccC( + _pVk, + IC19x, + IC19y, + calldataload(add(pubSignals, 576)) + ) + + g1_mulAccC( + _pVk, + IC20x, + IC20y, + calldataload(add(pubSignals, 608)) + ) + + g1_mulAccC( + _pVk, + IC21x, + IC21y, + calldataload(add(pubSignals, 640)) + ) + + g1_mulAccC( + _pVk, + IC22x, + IC22y, + calldataload(add(pubSignals, 672)) + ) + + g1_mulAccC( + _pVk, + IC23x, + IC23y, + calldataload(add(pubSignals, 704)) + ) + + g1_mulAccC( + _pVk, + IC24x, + IC24y, + calldataload(add(pubSignals, 736)) + ) + + g1_mulAccC( + _pVk, + IC25x, + IC25y, + calldataload(add(pubSignals, 768)) + ) + + g1_mulAccC( + _pVk, + IC26x, + IC26y, + calldataload(add(pubSignals, 800)) + ) + + g1_mulAccC( + _pVk, + IC27x, + IC27y, + calldataload(add(pubSignals, 832)) + ) + + g1_mulAccC( + _pVk, + IC28x, + IC28y, + calldataload(add(pubSignals, 864)) + ) + + g1_mulAccC( + _pVk, + IC29x, + IC29y, + calldataload(add(pubSignals, 896)) + ) + + g1_mulAccC( + _pVk, + IC30x, + IC30y, + calldataload(add(pubSignals, 928)) + ) + + g1_mulAccC( + _pVk, + IC31x, + IC31y, + calldataload(add(pubSignals, 960)) + ) + + g1_mulAccC( + _pVk, + IC32x, + IC32y, + calldataload(add(pubSignals, 992)) + ) + + g1_mulAccC( + _pVk, + IC33x, + IC33y, + calldataload(add(pubSignals, 1024)) + ) + + g1_mulAccC( + _pVk, + IC34x, + IC34y, + calldataload(add(pubSignals, 1056)) + ) // -A mstore(_pPairing, calldataload(pA)) - mstore(add(_pPairing, 32), mod(sub(q, calldataload(add(pA, 32))), q)) + mstore( + add(_pPairing, 32), + mod(sub(q, calldataload(add(pA, 32))), q) + ) // B mstore(add(_pPairing, 64), calldataload(pB)) @@ -292,7 +508,6 @@ contract Groth16Verifier { mstore(add(_pPairing, 384), mload(add(pMem, pVk))) mstore(add(_pPairing, 416), mload(add(pMem, add(pVk, 32)))) - // gamma2 mstore(add(_pPairing, 448), gammax1) mstore(add(_pPairing, 480), gammax2) @@ -309,8 +524,14 @@ contract Groth16Verifier { mstore(add(_pPairing, 704), deltay1) mstore(add(_pPairing, 736), deltay2) - - let success := staticcall(sub(gas(), 2000), 8, _pPairing, 768, _pPairing, 0x20) + let success := staticcall( + sub(gas(), 2000), + 8, + _pPairing, + 768, + _pPairing, + 0x20 + ) isOk := and(success, mload(_pPairing)) } @@ -319,83 +540,82 @@ contract Groth16Verifier { mstore(0x40, add(pMem, pLastMem)) // Validate that all evaluations ∈ F - + checkField(calldataload(add(_pubSignals, 0))) - + checkField(calldataload(add(_pubSignals, 32))) - + checkField(calldataload(add(_pubSignals, 64))) - + checkField(calldataload(add(_pubSignals, 96))) - + checkField(calldataload(add(_pubSignals, 128))) - + checkField(calldataload(add(_pubSignals, 160))) - + checkField(calldataload(add(_pubSignals, 192))) - + checkField(calldataload(add(_pubSignals, 224))) - + checkField(calldataload(add(_pubSignals, 256))) - + checkField(calldataload(add(_pubSignals, 288))) - + checkField(calldataload(add(_pubSignals, 320))) - + checkField(calldataload(add(_pubSignals, 352))) - + checkField(calldataload(add(_pubSignals, 384))) - + checkField(calldataload(add(_pubSignals, 416))) - + checkField(calldataload(add(_pubSignals, 448))) - + checkField(calldataload(add(_pubSignals, 480))) - + checkField(calldataload(add(_pubSignals, 512))) - + checkField(calldataload(add(_pubSignals, 544))) - + checkField(calldataload(add(_pubSignals, 576))) - + checkField(calldataload(add(_pubSignals, 608))) - + checkField(calldataload(add(_pubSignals, 640))) - + checkField(calldataload(add(_pubSignals, 672))) - + checkField(calldataload(add(_pubSignals, 704))) - + checkField(calldataload(add(_pubSignals, 736))) - + checkField(calldataload(add(_pubSignals, 768))) - + checkField(calldataload(add(_pubSignals, 800))) - + checkField(calldataload(add(_pubSignals, 832))) - + checkField(calldataload(add(_pubSignals, 864))) - + checkField(calldataload(add(_pubSignals, 896))) - + checkField(calldataload(add(_pubSignals, 928))) - + checkField(calldataload(add(_pubSignals, 960))) - + checkField(calldataload(add(_pubSignals, 992))) - + checkField(calldataload(add(_pubSignals, 1024))) - + checkField(calldataload(add(_pubSignals, 1056))) - + checkField(calldataload(add(_pubSignals, 1088))) - // Validate all evaluations let isValid := checkPairing(_pA, _pB, _pC, _pubSignals, pMem) mstore(0, isValid) - return(0, 0x20) - } - } - } + return(0, 0x20) + } + } +} diff --git a/packages/contracts/src/utils/Verifier.sol b/packages/contracts/src/utils/Verifier.sol index 2ccff85d..753c76ff 100644 --- a/packages/contracts/src/utils/Verifier.sol +++ b/packages/contracts/src/utils/Verifier.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.9; -import "./Groth16Verifier.sol"; +import "../interfaces/IGroth16Verifier.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; @@ -9,7 +9,7 @@ struct EmailProof { string domainName; // Domain name of the sender's email bytes32 publicKeyHash; // Hash of the DKIM public key used in email/proof uint timestamp; // Timestamp of the email - string maskedSubject; // Masked subject of the email + string maskedCommand; // Masked command of the email bytes32 emailNullifier; // Nullifier of the email to prevent its reuse. bytes32 accountSalt; // Create2 salt of the account bool isCodeExist; // Check if the account code is exist @@ -17,20 +17,23 @@ struct EmailProof { } contract Verifier is OwnableUpgradeable, UUPSUpgradeable { - Groth16Verifier groth16Verifier; + IGroth16Verifier groth16Verifier; uint256 public constant DOMAIN_FIELDS = 9; uint256 public constant DOMAIN_BYTES = 255; - uint256 public constant SUBJECT_FIELDS = 20; - uint256 public constant SUBJECT_BYTES = 605; + uint256 public constant COMMAND_FIELDS = 20; + uint256 public constant COMMAND_BYTES = 605; constructor() {} /// @notice Initialize the contract with the initial owner and deploy Groth16Verifier /// @param _initialOwner The address of the initial owner - function initialize(address _initialOwner) public initializer { + function initialize( + address _initialOwner, + address _groth16Verifier + ) public initializer { __Ownable_init(_initialOwner); - groth16Verifier = new Groth16Verifier(); + groth16Verifier = IGroth16Verifier(_groth16Verifier); } function verifyEmailProof( @@ -42,7 +45,7 @@ contract Verifier is OwnableUpgradeable, UUPSUpgradeable { uint256[2] memory pC ) = abi.decode(proof.proof, (uint256[2], uint256[2][2], uint256[2])); - uint256[DOMAIN_FIELDS + SUBJECT_FIELDS + 5] memory pubSignals; + uint256[DOMAIN_FIELDS + COMMAND_FIELDS + 5] memory pubSignals; uint256[] memory stringFields; stringFields = _packBytes2Fields(bytes(proof.domainName), DOMAIN_BYTES); for (uint256 i = 0; i < DOMAIN_FIELDS; i++) { @@ -52,16 +55,16 @@ contract Verifier is OwnableUpgradeable, UUPSUpgradeable { pubSignals[DOMAIN_FIELDS + 1] = uint256(proof.emailNullifier); pubSignals[DOMAIN_FIELDS + 2] = uint256(proof.timestamp); stringFields = _packBytes2Fields( - bytes(proof.maskedSubject), - SUBJECT_BYTES + bytes(proof.maskedCommand), + COMMAND_BYTES ); - for (uint256 i = 0; i < SUBJECT_FIELDS; i++) { + for (uint256 i = 0; i < COMMAND_FIELDS; i++) { pubSignals[DOMAIN_FIELDS + 3 + i] = stringFields[i]; } - pubSignals[DOMAIN_FIELDS + 3 + SUBJECT_FIELDS] = uint256( + pubSignals[DOMAIN_FIELDS + 3 + COMMAND_FIELDS] = uint256( proof.accountSalt ); - pubSignals[DOMAIN_FIELDS + 3 + SUBJECT_FIELDS + 1] = proof.isCodeExist + pubSignals[DOMAIN_FIELDS + 3 + COMMAND_FIELDS + 1] = proof.isCodeExist ? 1 : 0; diff --git a/packages/contracts/src/utils/ZKSyncCreate2Factory.sol b/packages/contracts/src/utils/ZKSyncCreate2Factory.sol index ee3ba883..125b9a9a 100644 --- a/packages/contracts/src/utils/ZKSyncCreate2Factory.sol +++ b/packages/contracts/src/utils/ZKSyncCreate2Factory.sol @@ -10,12 +10,13 @@ import {ZKSyncCreate2FactoryBase} from "./ZKSyncCreate2FactoryBase.sol"; contract ZKSyncCreate2Factory is ZKSyncCreate2FactoryBase { // // FOR_ZKSYNC:START - // function computeAddress(bytes32 salt, bytes32 bytecodeHash, bytes memory input) external view returns (address) { + // function computeAddress(bytes32 salt, bytes32 bytecodeHash, bytes memory input) external override view returns (address) { // return L2ContractHelper.computeCreate2Address(address(this), salt, bytes32(bytecodeHash), keccak256(input)); // } // function deploy(bytes32 salt, bytes32 bytecodeHash, bytes memory input) // external + // override // returns (bool success, bytes memory returnData) // { // (success, returnData) = SystemContractsCaller.systemCallWithReturndata( diff --git a/packages/contracts/test/DKIMRegistryUpgrade.t.sol b/packages/contracts/test/DKIMRegistryUpgrade.t.sol index 82342991..c3384571 100644 --- a/packages/contracts/test/DKIMRegistryUpgrade.t.sol +++ b/packages/contracts/test/DKIMRegistryUpgrade.t.sol @@ -43,15 +43,15 @@ contract DKIMRegistryUpgradeTest is StructHelper { assertEq(dkimAddr, address(dkim)); } - function _testInsertSubjectTemplate() private { - emailAuth.insertSubjectTemplate(templateId, subjectTemplate); - string[] memory result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + function _testInsertCommandTemplate() private { + emailAuth.insertCommandTemplate(templateId, commandTemplate); + string[] memory result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); } function testAuthEmail() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); diff --git a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_acceptanceSubjectTemplates.t.sol b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_acceptanceSubjectTemplates.t.sol index 71ebc88b..7e596e79 100644 --- a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_acceptanceSubjectTemplates.t.sol +++ b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_acceptanceSubjectTemplates.t.sol @@ -9,18 +9,18 @@ import {StructHelper} from "../helpers/StructHelper.sol"; import {SimpleWallet} from "../helpers/SimpleWallet.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; -contract EmailAccountRecoveryTest_acceptanceSubjectTemplates is StructHelper { +contract EmailAccountRecoveryTest_acceptanceCommandTemplates is StructHelper { constructor() {} function setUp() public override { super.setUp(); } - function testAcceptanceSubjectTemplates() public { + function testAcceptanceCommandTemplates() public { skipIfZkSync(); - + setUp(); - string[][] memory res = recoveryController.acceptanceSubjectTemplates(); + string[][] memory res = recoveryController.acceptanceCommandTemplates(); assertEq(res[0][0], "Accept"); assertEq(res[0][1], "guardian"); assertEq(res[0][2], "request"); diff --git a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_completeRecovery.t.sol b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_completeRecovery.t.sol index b76c15b7..00ba5401 100644 --- a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_completeRecovery.t.sol +++ b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_completeRecovery.t.sol @@ -50,9 +50,9 @@ contract EmailAccountRecoveryTest_completeRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -94,10 +94,10 @@ contract EmailAccountRecoveryTest_completeRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleAcceptance.t.sol b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleAcceptance.t.sol index 2bda3928..5d3e3428 100644 --- a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleAcceptance.t.sol +++ b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleAcceptance.t.sol @@ -37,7 +37,7 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { function testHandleAcceptance() public { skipIfZkSync(); - + requestGuardian(); console.log("guardian", guardian); @@ -54,9 +54,9 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -97,9 +97,9 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; emailAuthMsg.proof.accountSalt = 0x0; vm.mockCall( @@ -131,9 +131,9 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -147,7 +147,7 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { vm.stopPrank(); } - function testExpectRevertHandleAcceptanceInvalidSubjectParams() public { + function testExpectRevertHandleAcceptanceInvalidCommandParams() public { skipIfZkSync(); requestGuardian(); @@ -164,10 +164,10 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](2); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - subjectParamsForAcceptance[1] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](2); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + commandParamsForAcceptance[1] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -176,7 +176,7 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { ); vm.startPrank(someRelayer); - vm.expectRevert(bytes("invalid subject params")); + vm.expectRevert(bytes("invalid command params")); recoveryController.handleAcceptance(emailAuthMsg, templateIdx); vm.stopPrank(); } @@ -200,9 +200,9 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(0x0)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(0x0)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleRecovery.t.sol b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleRecovery.t.sol index f497a36e..ccaca48e 100644 --- a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleRecovery.t.sol +++ b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleRecovery.t.sol @@ -52,9 +52,9 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -98,10 +98,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -155,10 +155,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; emailAuthMsg.proof.accountSalt = 0x0; vm.mockCall( @@ -194,10 +194,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { uint templateIdx = 0; EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -241,10 +241,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; emailAuthMsg.proof.accountSalt = 0x0; // vm.mockCall( @@ -296,10 +296,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -313,7 +313,7 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { vm.stopPrank(); } - function testExpectRevertHandleRecoveryInvalidSubjectParams() public { + function testExpectRevertHandleRecoveryInvalidCommandParams() public { skipIfZkSync(); handleAcceptance(); @@ -337,11 +337,11 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](3); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - subjectParamsForRecovery[1] = abi.encode(address(0x0)); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](3); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + commandParamsForRecovery[1] = abi.encode(address(0x0)); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), @@ -350,7 +350,7 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { ); vm.startPrank(someRelayer); - vm.expectRevert(bytes("invalid subject params")); + vm.expectRevert(bytes("invalid command params")); recoveryController.handleRecovery(emailAuthMsg, templateIdx); vm.stopPrank(); } @@ -373,10 +373,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { // EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); // uint templateId = recoveryController.computeRecoveryTemplateId(templateIdx); // emailAuthMsg.templateId = templateId; - // bytes[] memory subjectParamsForRecovery = new bytes[](2); - // subjectParamsForRecovery[0] = abi.encode(address(0x0)); - // subjectParamsForRecovery[1] = abi.encode(newSigner); - // emailAuthMsg.subjectParams = subjectParamsForRecovery; + // bytes[] memory commandParamsForRecovery = new bytes[](2); + // commandParamsForRecovery[0] = abi.encode(address(0x0)); + // commandParamsForRecovery[1] = abi.encode(newSigner); + // emailAuthMsg.commandParams = commandParamsForRecovery; // vm.mockCall( // address(recoveryController.emailAuthImplementationAddr()), @@ -414,10 +414,10 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(address(0x0)); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(address(0x0)); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_recoverySubjectTemplates.t.sol b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_recoverySubjectTemplates.t.sol index 50e720ac..db7a925c 100644 --- a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_recoverySubjectTemplates.t.sol +++ b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_recoverySubjectTemplates.t.sol @@ -9,18 +9,18 @@ import {StructHelper} from "../helpers/StructHelper.sol"; import {SimpleWallet} from "../helpers/SimpleWallet.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; -contract EmailAccountRecoveryTest_recoverySubjectTemplates is StructHelper { +contract EmailAccountRecoveryTest_recoveryCommandTemplates is StructHelper { constructor() {} function setUp() public override { super.setUp(); } - function testRecoverySubjectTemplates() public { + function testRecoveryCommandTemplates() public { skipIfZkSync(); - - setUp(); - string[][] memory res = recoveryController.recoverySubjectTemplates(); + + setUp(); + string[][] memory res = recoveryController.recoveryCommandTemplates(); assertEq(res[0][0], "Set"); assertEq(res[0][1], "the"); assertEq(res[0][2], "new"); diff --git a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_rejectRecovery.t.sol b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_rejectRecovery.t.sol index 2c554711..d11b52c3 100644 --- a/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_rejectRecovery.t.sol +++ b/packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_rejectRecovery.t.sol @@ -9,7 +9,9 @@ import {StructHelper} from "../helpers/StructHelper.sol"; import {SimpleWallet} from "../helpers/SimpleWallet.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; -contract EmailAccountRecoveryForRejectRecoveryTest_rejectRecovery is StructHelper { +contract EmailAccountRecoveryForRejectRecoveryTest_rejectRecovery is + StructHelper +{ constructor() {} function setUp() public override { @@ -49,12 +51,12 @@ contract EmailAccountRecoveryForRejectRecoveryTest_rejectRecovery is StructHelpe uint templateIdx = 0; EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; address recoveredAccount = recoveryController - .extractRecoveredAccountFromAcceptanceSubject( - emailAuthMsg.subjectParams, + .extractRecoveredAccountFromAcceptanceCommand( + emailAuthMsg.commandParams, templateIdx ); address computedGuardian = recoveryController.computeEmailAuthAddress( @@ -107,10 +109,10 @@ contract EmailAccountRecoveryForRejectRecoveryTest_rejectRecovery is StructHelpe templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryController.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_completeRecovery.t.sol b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_completeRecovery.t.sol index 6713f75e..435a403b 100644 --- a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_completeRecovery.t.sol +++ b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_completeRecovery.t.sol @@ -50,9 +50,9 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -74,9 +74,14 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { function handleRecovery() public { handleAcceptance(); - assertEq(recoveryControllerZKSync.isRecovering(address(simpleWallet)), false); assertEq( - recoveryControllerZKSync.currentTimelockOfAccount(address(simpleWallet)), + recoveryControllerZKSync.isRecovering(address(simpleWallet)), + false + ); + assertEq( + recoveryControllerZKSync.currentTimelockOfAccount( + address(simpleWallet) + ), 0 ); assertEq(simpleWallet.owner(), deployer); @@ -94,10 +99,10 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -109,7 +114,10 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { recoveryControllerZKSync.handleRecovery(emailAuthMsg, templateIdx); vm.stopPrank(); - assertEq(recoveryControllerZKSync.isRecovering(address(simpleWallet)), true); + assertEq( + recoveryControllerZKSync.isRecovering(address(simpleWallet)), + true + ); assertEq(simpleWallet.owner(), deployer); assertEq( recoveryControllerZKSync.newSignerCandidateOfAccount( @@ -118,7 +126,9 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { newSigner ); assertEq( - recoveryControllerZKSync.currentTimelockOfAccount(address(simpleWallet)), + recoveryControllerZKSync.currentTimelockOfAccount( + address(simpleWallet) + ), block.timestamp + recoveryControllerZKSync.timelockPeriodOfAccount( address(simpleWallet) @@ -131,9 +141,14 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { handleRecovery(); - assertEq(recoveryControllerZKSync.isRecovering(address(simpleWallet)), true); assertEq( - recoveryControllerZKSync.currentTimelockOfAccount(address(simpleWallet)), + recoveryControllerZKSync.isRecovering(address(simpleWallet)), + true + ); + assertEq( + recoveryControllerZKSync.currentTimelockOfAccount( + address(simpleWallet) + ), block.timestamp + recoveryControllerZKSync.timelockPeriodOfAccount( address(simpleWallet) @@ -155,9 +170,14 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { ); vm.stopPrank(); - assertEq(recoveryControllerZKSync.isRecovering(address(simpleWallet)), false); assertEq( - recoveryControllerZKSync.currentTimelockOfAccount(address(simpleWallet)), + recoveryControllerZKSync.isRecovering(address(simpleWallet)), + false + ); + assertEq( + recoveryControllerZKSync.currentTimelockOfAccount( + address(simpleWallet) + ), 0 ); assertEq(simpleWallet.owner(), newSigner); @@ -174,9 +194,14 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { handleAcceptance(); - assertEq(recoveryControllerZKSync.isRecovering(address(simpleWallet)), false); assertEq( - recoveryControllerZKSync.currentTimelockOfAccount(address(simpleWallet)), + recoveryControllerZKSync.isRecovering(address(simpleWallet)), + false + ); + assertEq( + recoveryControllerZKSync.currentTimelockOfAccount( + address(simpleWallet) + ), 0 ); assertEq(simpleWallet.owner(), deployer); @@ -204,9 +229,14 @@ contract EmailAccountRecoveryZKSyncTest_completeRecovery is StructHelper { handleRecovery(); - assertEq(recoveryControllerZKSync.isRecovering(address(simpleWallet)), true); assertEq( - recoveryControllerZKSync.currentTimelockOfAccount(address(simpleWallet)), + recoveryControllerZKSync.isRecovering(address(simpleWallet)), + true + ); + assertEq( + recoveryControllerZKSync.currentTimelockOfAccount( + address(simpleWallet) + ), block.timestamp + recoveryControllerZKSync.timelockPeriodOfAccount( address(simpleWallet) diff --git a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleAcceptance.t.sol b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleAcceptance.t.sol index 9db78895..fa88af64 100644 --- a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleAcceptance.t.sol +++ b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleAcceptance.t.sol @@ -54,9 +54,9 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -97,9 +97,9 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; emailAuthMsg.proof.accountSalt = 0x0; vm.mockCall( @@ -131,9 +131,9 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -147,7 +147,7 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { vm.stopPrank(); } - function testExpectRevertHandleAcceptanceInvalidSubjectParams() public { + function testExpectRevertHandleAcceptanceInvalidcommandParams() public { skipIfNotZkSync(); requestGuardian(); @@ -164,10 +164,10 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](2); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - subjectParamsForAcceptance[1] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](2); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + commandParamsForAcceptance[1] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -176,7 +176,7 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { ); vm.startPrank(someRelayer); - vm.expectRevert(bytes("invalid subject params")); + vm.expectRevert(bytes("invalid command params")); recoveryControllerZKSync.handleAcceptance(emailAuthMsg, templateIdx); vm.stopPrank(); } @@ -200,9 +200,9 @@ contract EmailAccountRecoveryZKSyncTest_handleAcceptance is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(0x0)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(0x0)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleRecovery.t.sol b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleRecovery.t.sol index 3a55ec9c..288b234f 100644 --- a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleRecovery.t.sol +++ b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_handleRecovery.t.sol @@ -52,9 +52,9 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -98,10 +98,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -155,10 +155,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; emailAuthMsg.proof.accountSalt = 0x0; vm.mockCall( @@ -194,10 +194,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { uint templateIdx = 0; EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -241,10 +241,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; emailAuthMsg.proof.accountSalt = 0x0; // vm.mockCall( @@ -296,10 +296,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -313,7 +313,7 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { vm.stopPrank(); } - function testExpectRevertHandleRecoveryInvalidSubjectParams() public { + function testExpectRevertHandleRecoveryInvalidcommandParams() public { skipIfNotZkSync(); handleAcceptance(); @@ -337,11 +337,11 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](3); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - subjectParamsForRecovery[1] = abi.encode(address(0x0)); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](3); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + commandParamsForRecovery[1] = abi.encode(address(0x0)); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -350,7 +350,7 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { ); vm.startPrank(someRelayer); - vm.expectRevert(bytes("invalid subject params")); + vm.expectRevert(bytes("invalid command params")); recoveryControllerZKSync.handleRecovery(emailAuthMsg, templateIdx); vm.stopPrank(); } @@ -373,10 +373,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { // EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); // uint templateId = recoveryControllerZKSync.computeRecoveryTemplateId(templateIdx); // emailAuthMsg.templateId = templateId; - // bytes[] memory subjectParamsForRecovery = new bytes[](2); - // subjectParamsForRecovery[0] = abi.encode(address(0x0)); - // subjectParamsForRecovery[1] = abi.encode(newSigner); - // emailAuthMsg.subjectParams = subjectParamsForRecovery; + // bytes[] memory commandParamsForRecovery = new bytes[](2); + // commandParamsForRecovery[0] = abi.encode(address(0x0)); + // commandParamsForRecovery[1] = abi.encode(newSigner); + // emailAuthMsg.commandParams = commandParamsForRecovery; // vm.mockCall( // address(recoveryControllerZKSync.emailAuthImplementationAddr()), @@ -414,10 +414,10 @@ contract EmailAccountRecoveryZKSyncTest_handleRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(address(0x0)); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(address(0x0)); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_rejectRecovery.t.sol b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_rejectRecovery.t.sol index 8293060b..e17c900e 100644 --- a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_rejectRecovery.t.sol +++ b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZKSync_rejectRecovery.t.sol @@ -49,12 +49,12 @@ contract EmailAccountRecoveryZKSyncTest_rejectRecovery is StructHelper { uint templateIdx = 0; EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); - emailAuthMsg.subjectParams = subjectParamsForAcceptance; + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + emailAuthMsg.commandParams = commandParamsForAcceptance; address recoveredAccount = recoveryControllerZKSync - .extractRecoveredAccountFromAcceptanceSubject( - emailAuthMsg.subjectParams, + .extractRecoveredAccountFromAcceptanceCommand( + emailAuthMsg.commandParams, templateIdx ); address computedGuardian = recoveryControllerZKSync.computeEmailAuthAddress( @@ -107,10 +107,10 @@ contract EmailAccountRecoveryZKSyncTest_rejectRecovery is StructHelper { templateIdx ); emailAuthMsg.templateId = templateId; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(simpleWallet); - subjectParamsForRecovery[1] = abi.encode(newSigner); - emailAuthMsg.subjectParams = subjectParamsForRecovery; + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(simpleWallet); + commandParamsForRecovery[1] = abi.encode(newSigner); + emailAuthMsg.commandParams = commandParamsForRecovery; vm.mockCall( address(recoveryControllerZKSync.emailAuthImplementationAddr()), diff --git a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_acceptanceSubjectTemplates.t.sol b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_acceptanceCommandTemplates.t.sol similarity index 78% rename from packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_acceptanceSubjectTemplates.t.sol rename to packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_acceptanceCommandTemplates.t.sol index 9290a69c..81d9a67c 100644 --- a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_acceptanceSubjectTemplates.t.sol +++ b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_acceptanceCommandTemplates.t.sol @@ -9,18 +9,20 @@ import {StructHelper} from "../helpers/StructHelper.sol"; import {SimpleWallet} from "../helpers/SimpleWallet.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; -contract EmailAccountRecoveryZKSyncTest_acceptanceSubjectTemplates is StructHelper { +contract EmailAccountRecoveryZKSyncTest_acceptanceCommandTemplates is + StructHelper +{ constructor() {} function setUp() public override { super.setUp(); } - function testAcceptanceSubjectTemplates() public { + function testAcceptanceCommandTemplates() public { skipIfNotZkSync(); setUp(); - string[][] memory res = recoveryController.acceptanceSubjectTemplates(); + string[][] memory res = recoveryController.acceptanceCommandTemplates(); assertEq(res[0][0], "Accept"); assertEq(res[0][1], "guardian"); assertEq(res[0][2], "request"); diff --git a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_recoverySubjectTemplates.t.sol b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_recoveryCommandTemplates.t.sol similarity index 79% rename from packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_recoverySubjectTemplates.t.sol rename to packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_recoveryCommandTemplates.t.sol index 051c655b..62271e43 100644 --- a/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_recoverySubjectTemplates.t.sol +++ b/packages/contracts/test/EmailAccountRecoveryZkSync/EmailAccountRecoveryZkSync_recoveryCommandTemplates.t.sol @@ -9,18 +9,20 @@ import {StructHelper} from "../helpers/StructHelper.sol"; import {SimpleWallet} from "../helpers/SimpleWallet.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; -contract EmailAccountRecoveryZKSyncTest_recoverySubjectTemplates is StructHelper { +contract EmailAccountRecoveryZKSyncTest_recoveryCommandTemplates is + StructHelper +{ constructor() {} function setUp() public override { super.setUp(); } - function testRecoverySubjectTemplates() public { + function testRecoveryCommandTemplates() public { skipIfNotZkSync(); - - setUp(); - string[][] memory res = recoveryController.recoverySubjectTemplates(); + + setUp(); + string[][] memory res = recoveryController.recoveryCommandTemplates(); assertEq(res[0][0], "Set"); assertEq(res[0][1], "the"); assertEq(res[0][2], "new"); diff --git a/packages/contracts/test/EmailAuth.t.sol b/packages/contracts/test/EmailAuth.t.sol index 7ba173aa..d4010ff5 100644 --- a/packages/contracts/test/EmailAuth.t.sol +++ b/packages/contracts/test/EmailAuth.t.sol @@ -117,140 +117,140 @@ contract EmailAuthTest is StructHelper { vm.stopPrank(); } - function testGetSubjectTemplate() public { + function testGetCommandTemplate() public { vm.startPrank(deployer); - emailAuth.insertSubjectTemplate(templateId, subjectTemplate); + emailAuth.insertCommandTemplate(templateId, commandTemplate); vm.stopPrank(); - string[] memory result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + string[] memory result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); } - function testExpectRevertGetSubjectTemplateTemplateIdNotExists() public { + function testExpectRevertGetCommandTemplateTemplateIdNotExists() public { vm.expectRevert(bytes("template id not exists")); - emailAuth.getSubjectTemplate(templateId); + emailAuth.getCommandTemplate(templateId); } - function testInsertSubjectTemplate() public { + function testInsertCommandTemplate() public { vm.startPrank(deployer); vm.expectEmit(true, false, false, false); - emit EmailAuth.SubjectTemplateInserted(templateId); - _testInsertSubjectTemplate(); + emit EmailAuth.CommandTemplateInserted(templateId); + _testInsertCommandTemplate(); vm.stopPrank(); } - function _testInsertSubjectTemplate() private { - emailAuth.insertSubjectTemplate(templateId, subjectTemplate); - string[] memory result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + function _testInsertCommandTemplate() private { + emailAuth.insertCommandTemplate(templateId, commandTemplate); + string[] memory result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); } - function testExpectRevertInsertSubjectTemplateSubjectTemplateIsEmpty() + function testExpectRevertInsertCommandTemplateCommandTemplateIsEmpty() public { vm.startPrank(deployer); - string[] memory emptySubjectTemplate = new string[](0); - vm.expectRevert(bytes("subject template is empty")); - emailAuth.insertSubjectTemplate(templateId, emptySubjectTemplate); + string[] memory emptyCommandTemplate = new string[](0); + vm.expectRevert(bytes("command template is empty")); + emailAuth.insertCommandTemplate(templateId, emptyCommandTemplate); vm.stopPrank(); } - function testExpectRevertInsertSubjectTemplateTemplateIdAlreadyExists() + function testExpectRevertInsertCommandTemplateTemplateIdAlreadyExists() public { vm.startPrank(deployer); - emailAuth.insertSubjectTemplate(templateId, subjectTemplate); - string[] memory result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + emailAuth.insertCommandTemplate(templateId, commandTemplate); + string[] memory result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); vm.expectRevert(bytes("template id already exists")); - emailAuth.insertSubjectTemplate(templateId, subjectTemplate); + emailAuth.insertCommandTemplate(templateId, commandTemplate); vm.stopPrank(); } - function testUpdateSubjectTemplate() public { + function testUpdateCommandTemplate() public { vm.expectRevert(bytes("template id not exists")); - string[] memory result = emailAuth.getSubjectTemplate(templateId); + string[] memory result = emailAuth.getCommandTemplate(templateId); vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); vm.stopPrank(); - result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); vm.startPrank(deployer); vm.expectEmit(true, false, false, false); - emit EmailAuth.SubjectTemplateUpdated(templateId); - emailAuth.updateSubjectTemplate(templateId, newSubjectTemplate); + emit EmailAuth.CommandTemplateUpdated(templateId); + emailAuth.updateCommandTemplate(templateId, newCommandTemplate); vm.stopPrank(); - result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, newSubjectTemplate); + result = emailAuth.getCommandTemplate(templateId); + assertEq(result, newCommandTemplate); } - function testExpectRevertUpdateSubjectTemplateCallerIsNotTheModule() + function testExpectRevertUpdateCommandTemplateCallerIsNotTheModule() public { vm.expectRevert("only controller"); - emailAuth.updateSubjectTemplate(templateId, subjectTemplate); + emailAuth.updateCommandTemplate(templateId, commandTemplate); } - function testExpectRevertUpdateSubjectTemplateSubjectTemplateIsEmpty() + function testExpectRevertUpdateCommandTemplateCommandTemplateIsEmpty() public { vm.startPrank(deployer); - string[] memory emptySubjectTemplate = new string[](0); - vm.expectRevert(bytes("subject template is empty")); - emailAuth.updateSubjectTemplate(templateId, emptySubjectTemplate); + string[] memory emptyCommandTemplate = new string[](0); + vm.expectRevert(bytes("command template is empty")); + emailAuth.updateCommandTemplate(templateId, emptyCommandTemplate); vm.stopPrank(); } - function testExpectRevertUpdateSubjectTemplateTemplateIdNotExists() public { + function testExpectRevertUpdateCommandTemplateTemplateIdNotExists() public { vm.startPrank(deployer); vm.expectRevert(bytes("template id not exists")); - emailAuth.updateSubjectTemplate(templateId, subjectTemplate); + emailAuth.updateCommandTemplate(templateId, commandTemplate); vm.stopPrank(); } - function testDeleteSubjectTemplate() public { + function testDeleteCommandTemplate() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); vm.stopPrank(); - string[] memory result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + string[] memory result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); vm.startPrank(deployer); vm.expectEmit(true, false, false, false); - emit EmailAuth.SubjectTemplateDeleted(templateId); - emailAuth.deleteSubjectTemplate(templateId); + emit EmailAuth.CommandTemplateDeleted(templateId); + emailAuth.deleteCommandTemplate(templateId); vm.stopPrank(); vm.expectRevert(bytes("template id not exists")); - emailAuth.getSubjectTemplate(templateId); + emailAuth.getCommandTemplate(templateId); } - function testExpectRevertDeleteSubjectTemplateCallerIsNotTheModule() + function testExpectRevertDeleteCommandTemplateCallerIsNotTheModule() public { vm.expectRevert("only controller"); - emailAuth.deleteSubjectTemplate(templateId); + emailAuth.deleteCommandTemplate(templateId); } - function testExpectRevertDeleteSubjectTemplateTemplateIdNotExists() public { + function testExpectRevertDeleteCommandTemplateTemplateIdNotExists() public { vm.startPrank(deployer); vm.expectRevert(bytes("template id not exists")); - emailAuth.deleteSubjectTemplate(templateId); + emailAuth.deleteCommandTemplate(templateId); vm.stopPrank(); } function testAuthEmail() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -310,7 +310,7 @@ contract EmailAuthTest is StructHelper { function testExpectRevertAuthEmailInvalidDkimPublicKeyHash() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -329,7 +329,7 @@ contract EmailAuthTest is StructHelper { function testExpectRevertAuthEmailEmailNullifierAlreadyUsed() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -348,7 +348,7 @@ contract EmailAuthTest is StructHelper { function testExpectRevertAuthEmailInvalidAccountSalt() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -367,7 +367,7 @@ contract EmailAuthTest is StructHelper { function testExpectRevertAuthEmailInvalidTimestamp() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); emailAuth.authEmail(emailAuthMsg); vm.stopPrank(); @@ -387,9 +387,9 @@ contract EmailAuthTest is StructHelper { vm.stopPrank(); } - function testExpectRevertAuthEmailInvalidSubject() public { + function testExpectRevertAuthEmailInvalidCommand() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -400,15 +400,15 @@ contract EmailAuthTest is StructHelper { assertEq(emailAuth.lastTimestamp(), 0); vm.startPrank(deployer); - emailAuthMsg.subjectParams[0] = abi.encode(2 ether); - vm.expectRevert(bytes("invalid subject")); + emailAuthMsg.commandParams[0] = abi.encode(2 ether); + vm.expectRevert(bytes("invalid command")); emailAuth.authEmail(emailAuthMsg); vm.stopPrank(); } function testExpectRevertAuthEmailInvalidEmailProof() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -432,9 +432,9 @@ contract EmailAuthTest is StructHelper { vm.stopPrank(); } - function testExpectRevertAuthEmailInvalidMaskedSubjectLength() public { + function testExpectRevertAuthEmailInvalidMaskedCommandLength() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -444,18 +444,20 @@ contract EmailAuthTest is StructHelper { ); assertEq(emailAuth.lastTimestamp(), 0); - // Set masked subject length to 606, which should be 605 or less defined in the verifier. - emailAuthMsg.proof.maskedSubject = string(new bytes(606)); + // Set masked command length to 606, which should be 605 or less defined in the verifier. + emailAuthMsg.proof.maskedCommand = string(new bytes(606)); vm.startPrank(deployer); - vm.expectRevert(bytes("invalid masked subject length")); + vm.expectRevert(bytes("invalid masked command length")); emailAuth.authEmail(emailAuthMsg); vm.stopPrank(); } - function testExpectRevertAuthEmailInvalidSizeOfTheSkippedSubjectPrefix() public { + function testExpectRevertAuthEmailInvalidSizeOfTheSkippedCommandPrefix() + public + { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); @@ -465,11 +467,11 @@ contract EmailAuthTest is StructHelper { ); assertEq(emailAuth.lastTimestamp(), 0); - // Set skipped subject prefix length to 605, it should be less than 605. - emailAuthMsg.skipedSubjectPrefix = 605; + // Set skipped command prefix length to 605, it should be less than 605. + emailAuthMsg.skippedCommandPrefix = 605; vm.startPrank(deployer); - vm.expectRevert(bytes("invalid size of the skipped subject prefix")); + vm.expectRevert(bytes("invalid size of the skipped command prefix")); emailAuth.authEmail(emailAuthMsg); vm.stopPrank(); } diff --git a/packages/contracts/test/EmailAuthWithUserOverrideableDkim.t.sol b/packages/contracts/test/EmailAuthWithUserOverrideableDkim.t.sol index 3f55ef7d..26e10597 100644 --- a/packages/contracts/test/EmailAuthWithUserOverrideableDkim.t.sol +++ b/packages/contracts/test/EmailAuthWithUserOverrideableDkim.t.sol @@ -49,15 +49,15 @@ contract EmailAuthWithUserOverrideableDkimTest is StructHelper { ); } - function _testInsertSubjectTemplate() private { - emailAuth.insertSubjectTemplate(templateId, subjectTemplate); - string[] memory result = emailAuth.getSubjectTemplate(templateId); - assertEq(result, subjectTemplate); + function _testInsertCommandTemplate() private { + emailAuth.insertCommandTemplate(templateId, commandTemplate); + string[] memory result = emailAuth.getCommandTemplate(templateId); + assertEq(result, commandTemplate); } function testAuthEmail() public { vm.startPrank(deployer); - _testInsertSubjectTemplate(); + _testInsertCommandTemplate(); EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg(); vm.stopPrank(); diff --git a/packages/contracts/test/Integration.t.sol b/packages/contracts/test/Integration.t.sol index b17fc0cf..bc463d34 100644 --- a/packages/contracts/test/Integration.t.sol +++ b/packages/contracts/test/Integration.t.sol @@ -9,6 +9,7 @@ import "@zk-email/contracts/DKIMRegistry.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "../src/EmailAuth.sol"; import "../src/utils/Verifier.sol"; +import "../src/utils/Groth16Verifier.sol"; import "../src/utils/ECDSAOwnedDKIMRegistry.sol"; import "./helpers/SimpleWallet.sol"; import "./helpers/RecoveryController.sol"; @@ -76,9 +77,13 @@ contract IntegrationTest is Test { // Create Verifier { Verifier verifierImpl = new Verifier(); + Groth16Verifier groth16Verifier = new Groth16Verifier(); ERC1967Proxy verifierProxy = new ERC1967Proxy( address(verifierImpl), - abi.encodeCall(verifierImpl.initialize, (msg.sender)) + abi.encodeCall( + verifierImpl.initialize, + (msg.sender, address(groth16Verifier)) + ) ); verifier = Verifier(address(verifierProxy)); } @@ -141,7 +146,7 @@ contract IntegrationTest is Test { console.log("SimpleWallet is at ", address(simpleWallet)); assertEq( address(simpleWallet), - 0xeb8E21A363Dce22ff6057dEEF7c074062037F571 + 0xf22ECf2028fe74129dB8e8946b56bef0cD8Ecd5E ); address simpleWalletOwner = simpleWallet.owner(); @@ -163,7 +168,7 @@ contract IntegrationTest is Test { string memory publicInputFile = vm.readFile( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_public.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_public.json" ) ); string[] memory pubSignals = abi.decode( @@ -176,7 +181,7 @@ contract IntegrationTest is Test { emailProof.publicKeyHash = bytes32(vm.parseUint(pubSignals[9])); emailProof.timestamp = vm.parseUint(pubSignals[11]); emailProof - .maskedSubject = "Accept guardian request for 0xeb8E21A363Dce22ff6057dEEF7c074062037F571"; + .maskedCommand = "Accept guardian request for 0xf22ECf2028fe74129dB8e8946b56bef0cD8Ecd5E"; emailProof.emailNullifier = bytes32(vm.parseUint(pubSignals[10])); emailProof.accountSalt = bytes32(vm.parseUint(pubSignals[32])); accountSalt = emailProof.accountSalt; @@ -184,7 +189,7 @@ contract IntegrationTest is Test { emailProof.proof = proofToBytes( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_proof.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_proof.json" ) ); @@ -210,14 +215,14 @@ contract IntegrationTest is Test { ); // Call handleAcceptance -> GuardianStatus.ACCEPTED - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); EmailAuthMsg memory emailAuthMsg = EmailAuthMsg({ templateId: recoveryController.computeAcceptanceTemplateId( templateIdx ), - subjectParams: subjectParamsForAcceptance, - skipedSubjectPrefix: 0, + commandParams: commandParamsForAcceptance, + skippedCommandPrefix: 0, proof: emailProof }); recoveryController.handleAcceptance(emailAuthMsg, templateIdx); @@ -245,7 +250,7 @@ contract IntegrationTest is Test { publicInputFile = vm.readFile( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_public.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_public.json" ) ); pubSignals = abi.decode(vm.parseJson(publicInputFile), (string[])); @@ -257,7 +262,7 @@ contract IntegrationTest is Test { // 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 is account 9 emailProof - .maskedSubject = "Set the new signer of 0xeb8E21A363Dce22ff6057dEEF7c074062037F571 to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"; + .maskedCommand = "Set the new signer of 0xf22ECf2028fe74129dB8e8946b56bef0cD8Ecd5E to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"; emailProof.emailNullifier = bytes32(vm.parseUint(pubSignals[10])); emailProof.accountSalt = bytes32(vm.parseUint(pubSignals[32])); @@ -269,7 +274,7 @@ contract IntegrationTest is Test { emailProof.proof = proofToBytes( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_proof.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_proof.json" ) ); @@ -283,17 +288,17 @@ contract IntegrationTest is Test { console.log("is code exist: ", vm.parseUint(pubSignals[33])); // Call handleRecovery -> isRecovering = true; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(address(simpleWallet)); - subjectParamsForRecovery[1] = abi.encode( + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(address(simpleWallet)); + commandParamsForRecovery[1] = abi.encode( address(0xa0Ee7A142d267C1f36714E4a8F75612F20a79720) ); emailAuthMsg = EmailAuthMsg({ templateId: recoveryController.computeRecoveryTemplateId( templateIdx ), - subjectParams: subjectParamsForRecovery, - skipedSubjectPrefix: 0, + commandParams: commandParamsForRecovery, + skippedCommandPrefix: 0, proof: emailProof }); recoveryController.handleRecovery(emailAuthMsg, templateIdx); diff --git a/packages/contracts/test/IntegrationZKSync.t.sol b/packages/contracts/test/IntegrationZKSync.t.sol index f30cc72b..806b8696 100644 --- a/packages/contracts/test/IntegrationZKSync.t.sol +++ b/packages/contracts/test/IntegrationZKSync.t.sol @@ -9,6 +9,7 @@ import "@zk-email/contracts/DKIMRegistry.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "../src/EmailAuth.sol"; import "../src/utils/Verifier.sol"; +import "../src/utils/Groth16Verifier.sol"; import "../src/utils/ECDSAOwnedDKIMRegistry.sol"; import "./helpers/SimpleWallet.sol"; import "./helpers/RecoveryControllerZKSync.sol"; @@ -76,9 +77,13 @@ contract IntegrationZKSyncTest is Test { // Create Verifier { Verifier verifierImpl = new Verifier(); + Groth16Verifier groth16Verifier = new Groth16Verifier(); ERC1967Proxy verifierProxy = new ERC1967Proxy( address(verifierImpl), - abi.encodeCall(verifierImpl.initialize, (msg.sender)) + abi.encodeCall( + verifierImpl.initialize, + (msg.sender, address(groth16Verifier)) + ) ); verifier = Verifier(address(verifierProxy)); } @@ -142,7 +147,7 @@ contract IntegrationZKSyncTest is Test { console.log("SimpleWallet is at ", address(simpleWallet)); assertEq( address(simpleWallet), - 0x7c5E4b26643682AF77A196781A851c9Fe769472d + 0xc9a403a0f75924677Dc0b011Da7eD8dD902063A6 ); address simpleWalletOwner = simpleWallet.owner(); @@ -164,7 +169,7 @@ contract IntegrationZKSyncTest is Test { string memory publicInputFile = vm.readFile( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_public.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_public.json" ) ); string[] memory pubSignals = abi.decode( @@ -177,7 +182,7 @@ contract IntegrationZKSyncTest is Test { emailProof.publicKeyHash = bytes32(vm.parseUint(pubSignals[9])); emailProof.timestamp = vm.parseUint(pubSignals[11]); emailProof - .maskedSubject = "Accept guardian request for 0x7c5E4b26643682AF77A196781A851c9Fe769472d"; + .maskedCommand = "Accept guardian request for 0xc9a403a0f75924677Dc0b011Da7eD8dD902063A6"; emailProof.emailNullifier = bytes32(vm.parseUint(pubSignals[10])); emailProof.accountSalt = bytes32(vm.parseUint(pubSignals[32])); accountSalt = emailProof.accountSalt; @@ -185,7 +190,7 @@ contract IntegrationZKSyncTest is Test { emailProof.proof = proofToBytes( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_proof.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_proof.json" ) ); @@ -211,14 +216,14 @@ contract IntegrationZKSyncTest is Test { ); // Call handleAcceptance -> GuardianStatus.ACCEPTED - bytes[] memory subjectParamsForAcceptance = new bytes[](1); - subjectParamsForAcceptance[0] = abi.encode(address(simpleWallet)); + bytes[] memory commandParamsForAcceptance = new bytes[](1); + commandParamsForAcceptance[0] = abi.encode(address(simpleWallet)); EmailAuthMsg memory emailAuthMsg = EmailAuthMsg({ templateId: recoveryControllerZKSync.computeAcceptanceTemplateId( templateIdx ), - subjectParams: subjectParamsForAcceptance, - skipedSubjectPrefix: 0, + commandParams: commandParamsForAcceptance, + skippedCommandPrefix: 0, proof: emailProof }); recoveryControllerZKSync.handleAcceptance(emailAuthMsg, templateIdx); @@ -246,7 +251,7 @@ contract IntegrationZKSyncTest is Test { publicInputFile = vm.readFile( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_public.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_public.json" ) ); pubSignals = abi.decode(vm.parseJson(publicInputFile), (string[])); @@ -258,7 +263,7 @@ contract IntegrationZKSyncTest is Test { // 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 is account 9 emailProof - .maskedSubject = "Set the new signer of 0x7c5E4b26643682AF77A196781A851c9Fe769472d to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"; + .maskedCommand = "Set the new signer of 0xc9a403a0f75924677Dc0b011Da7eD8dD902063A6 to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"; emailProof.emailNullifier = bytes32(vm.parseUint(pubSignals[10])); emailProof.accountSalt = bytes32(vm.parseUint(pubSignals[32])); @@ -270,7 +275,7 @@ contract IntegrationZKSyncTest is Test { emailProof.proof = proofToBytes( string.concat( vm.projectRoot(), - "/test/build_integration/email_auth_proof.json" + "/test/build_integration/email_auth_with_body_parsing_with_qp_encoding_proof.json" ) ); @@ -284,17 +289,17 @@ contract IntegrationZKSyncTest is Test { console.log("is code exist: ", vm.parseUint(pubSignals[33])); // Call handleRecovery -> isRecovering = true; - bytes[] memory subjectParamsForRecovery = new bytes[](2); - subjectParamsForRecovery[0] = abi.encode(address(simpleWallet)); - subjectParamsForRecovery[1] = abi.encode( + bytes[] memory commandParamsForRecovery = new bytes[](2); + commandParamsForRecovery[0] = abi.encode(address(simpleWallet)); + commandParamsForRecovery[1] = abi.encode( address(0xa0Ee7A142d267C1f36714E4a8F75612F20a79720) ); emailAuthMsg = EmailAuthMsg({ templateId: recoveryControllerZKSync.computeRecoveryTemplateId( templateIdx ), - subjectParams: subjectParamsForRecovery, - skipedSubjectPrefix: 0, + commandParams: commandParamsForRecovery, + skippedCommandPrefix: 0, proof: emailProof }); recoveryControllerZKSync.handleRecovery(emailAuthMsg, templateIdx); diff --git a/packages/contracts/test/bin/accept.sh b/packages/contracts/test/bin/accept.sh index a952045a..86792f4e 100755 --- a/packages/contracts/test/bin/accept.sh +++ b/packages/contracts/test/bin/accept.sh @@ -10,5 +10,6 @@ yarn workspace @zk-email/ether-email-auth-circom gen-input \ --email-file $EMAIL_FILE_PATH \ --account-code $ACCOUNT_CODE \ --input-file $INPUT_FILE \ - --prove + --prove \ + --body exit 0 \ No newline at end of file diff --git a/packages/contracts/test/bin/recovery.sh b/packages/contracts/test/bin/recovery.sh index d212762b..fe3eda69 100755 --- a/packages/contracts/test/bin/recovery.sh +++ b/packages/contracts/test/bin/recovery.sh @@ -10,5 +10,6 @@ yarn workspace @zk-email/ether-email-auth-circom gen-input \ --email-file $EMAIL_FILE_PATH \ --account-code $ACCOUNT_CODE \ --input-file $INPUT_FILE \ - --prove + --prove \ + --body exit 0 \ No newline at end of file diff --git a/packages/contracts/test/emails/300/accept.eml b/packages/contracts/test/emails/300/accept.eml index 7e10ce7a..b6491ad7 100644 --- a/packages/contracts/test/emails/300/accept.eml +++ b/packages/contracts/test/emails/300/accept.eml @@ -1,90 +1,102 @@ -Delivered-To: rrelayerbob@gmail.com -Received: by 2002:a05:6400:2670:b0:264:9270:cc66 with SMTP id jy48csp750570ecb; - Wed, 28 Aug 2024 00:53:22 -0700 (PDT) -X-Received: by 2002:a05:6214:5b0a:b0:6bf:8cb9:420 with SMTP id 6a1803df08f44-6c3362e69d4mr13631006d6.28.1724831602260; - Wed, 28 Aug 2024 00:53:22 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1724831602; cv=none; +Delivered-To: suegamisora@gmail.com +Received: by 2002:a05:7010:8c26:b0:403:8332:eb9c with SMTP id gq38csp1824832mdb; + Tue, 10 Sep 2024 09:38:37 -0700 (PDT) +X-Received: by 2002:a17:903:943:b0:207:18f5:7e78 with SMTP id d9443c01a7336-2074c70afcemr18749795ad.48.1725986317661; + Tue, 10 Sep 2024 09:38:37 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725986317; cv=none; d=google.com; s=arc-20160816; - b=XHYkOsPNkoh6Z/JlWBpmbftiVMlvTrQleXhtrViXaWIdnKIvwTAPXdaICvrHd/Gx6P - 3oVxnHb8Cuhi3cJ+ctMJ40RfT+f2+DRWXG2Csihny9ayIWeJ4mhPEy1Y6ZXkCEr3Gud8 - mVeHCXLthekdgQly8uhWxC6vn3wXtCEvx49iJM0gyfcyAI4Nt1eYDS0hr2gH6XNY4F+Q - mEiHfFbZj6s95egRsp2ZipfGz7yojKoKDTUWupDDPF4YpM9TxHrKyqVhk7mgT5PHaAWm - xkgUr8fWf+2/a+ini06UovznocNQCwGEHbRyPcIQ8SssjV21Xh0P3vwUSdKQKZYJJvTD - wUIg== + b=dfLhRCAZSEmyw8FkqKJk0waxN/95QBsbDUSCEX1OdRfdTxotPVdpR8WS1/K+pjWtAj + tMutbQqgaGxvu4m9mTotCIVPT/yu/YWA1ZCEEYIGRDv6CnFOxqdQJTOiPJm7k0PSq+WM + 92Thc03PWWdr6qbqUx0sMcEPWSeQA+51ehQIxfc03yjK7sYov3YLBherTHW55uy6vkgw + vImTmvEXm7PGMPdXlqf8erUf+lLNZRxFj2+kgXeFt98+/sq93tPJ9GmFxeDTNz2Ps6rB + 1zAXhl/A3humFOBEC/KpjkDPS/x+tq/u8IbHJZfsutZiu+ilusNpyswk1Qi5CjwWgkTH + hKVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=to:subject:message-id:date:from:mime-version:dkim-signature; - bh=wfoUswYdacWo98C2NPNyTM5htDNHLSMk6+9pc8+wtuY=; - fh=OYPr0JdXtRRlM3Htj/E6+khbD9huvtdqkRTmPoW0wko=; - b=H8LtD87fAH1qc7wN2hssgsTYQ10genWfiNzNwL+379b1AP/AMubRu3Ekep9uRlkgle - K7AUiX3xkCtX0jmtFAm4EgRqByv9EgAaedHzXbrc/jOBWUq7g0zJM+uk6QffM7ETNNvt - aI263gbooi401SQK+epiPYQ+yF4nXX6cNidm/HyGR0LzxEKWio3NPblQUxihlUKbwN/T - 4MWYgM18G4/ebFrdkbe9707tKHDK6P/BuK9P4mWH6DJwHmGVK40Pyu7xKCtr0/L74/Zu - U04dV6Rho5On1vS0fiEjdhSJdQ5Co1UkyMhn2s8Oalxk9pm95yN6EIcMM+81l2l6dI4+ - GkbA==; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=Vk745v+8yhNcqTm1mm8X+W3Zd9/M2jmlVHdKY4AKXs0=; + fh=r9ZW45D/4i7BIl/4UeFGrkYKwbplztqhOVKfbV+WD3I=; + b=EfGIbo2tnRbkq2StKoKJb+7cJcwTt4XdwuNClcYnpQt9THcWWorOKP+MIgfE55paDy + U8EsHTtKYRf//a4qKhNAOJWrTWAcg3vs9zPx1Bxg2pXMpdEA0cKcvGGm+XYm5MNcxpXi + CpPU+cMD44aiqC9P7oGSARQSMZybhgBxIjzKF91d6P+KjkUvHXIha2cpi0i+676Xx4Y3 + 6IjQSQBdtaLjIvGN2lsW4dym9D8oeUfu0X7GiDu3njniQDvFWIhtdCviKALHw1/bDSA3 + RDQvzvkiHitGxvlNgC17wTFAnFdJvoxDpPHz5DsNcqZExkmxxVQGXwLIDBX7T3bo96o3 + pbyw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; - dkim=pass header.i=@gmail.com header.s=20230601 header.b=kOFwnIGQ; - spf=pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emailwalletrelayer987@gmail.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=URaXcH62; + spf=pass (google.com: domain of emaiwallet.alice@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emaiwallet.alice@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@gmail.com -Return-Path:Hello!
+This is a test email with a basic HTML body.
+ + + + =20 +--===============7312056348872157310==-- diff --git a/packages/contracts/test/emails/300/recovery.eml b/packages/contracts/test/emails/300/recovery.eml index 5b795415..b1b1be5d 100644 --- a/packages/contracts/test/emails/300/recovery.eml +++ b/packages/contracts/test/emails/300/recovery.eml @@ -1,90 +1,101 @@ -Delivered-To: rrelayerbob@gmail.com -Received: by 2002:a05:6400:2670:b0:264:9270:cc66 with SMTP id jy48csp750751ecb; - Wed, 28 Aug 2024 00:54:02 -0700 (PDT) -X-Received: by 2002:a05:6102:26c9:b0:492:a9f8:4a71 with SMTP id ada2fe7eead31-49a4ed30da9mr1309811137.8.1724831642136; - Wed, 28 Aug 2024 00:54:02 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1724831642; cv=none; +Delivered-To: suegamisora@gmail.com +Received: by 2002:a05:7010:8c26:b0:403:8332:eb9c with SMTP id gq38csp1825082mdb; + Tue, 10 Sep 2024 09:39:06 -0700 (PDT) +X-Received: by 2002:a05:6a20:e609:b0:1cf:42ab:5776 with SMTP id adf61e73a8af0-1cf62d5ca4amr429112637.32.1725986345693; + Tue, 10 Sep 2024 09:39:05 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725986345; cv=none; d=google.com; s=arc-20160816; - b=cpTbX87GQyaBGaVXbNadJs8tRJ3H6JwDzUCyAR6zbLifi7OvRIHe/CqXAdOjD88MEN - S5Vri34IQ0pQX+/0KPKejM0sKlvuQXSca6+H87JzalG4kkXOChT58Wjm5zrWcY9Xslh5 - s275+Zh5T6gx7IBZZZtXLcOgtRgZgsHhpF2DkzgSiRh1FtJC35ewsspFC1VtqWZqUAZh - +41nK1p++/vFWBqpB3YZXSdWFDGsyJ7QtHFfi3vG/x8b/h6c4vHrvT0zx5lDwZB+YmV+ - xXROwXhRH2ND5375vtZz8OyfaQHhY43HVSP4dOfrHgeUbtVzcQiYW+SR3Q6FPHCUqStc - EycQ== + b=b0EtK1nljCR3bWa33hL+U9UOs6bxgLbIDEWs+/NW+WPtgxuadYjIdDXgR3gqPAeQ6C + XdasCPKLFxl+ioOj8RmjMo+gfNU4wZQhEbM/plNiliwXlMAA54+ZeilxbdPH2wo34YN2 + 8qF3EeRf9IOg8yw2hBIn6KxZ1vLGvbHoA+1Ojy9HpsN3VoSNBZbMihBAEdeiEqEJoNAF + 5S0dCnLy2Koz3fxfWWh30wx/tuStkzDWAzwhs//43Fj+qBNug3GR8IE+gQDs3HYW1mjG + wqS7lEyPzf7LKoiV420U1ulVeVFxmvC5jWwtkd3xDTJiUoHgsqbI0Y+GYkESzvQ9YWmr + 6HlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=to:subject:message-id:date:from:mime-version:dkim-signature; - bh=IehaSA/JR4L/KX7NlPKK5B7zTFO/0C8UNbHTPhhIN84=; - fh=OYPr0JdXtRRlM3Htj/E6+khbD9huvtdqkRTmPoW0wko=; - b=OUQ5TcZbiTNRl396nTBZH0uojnYZfc5tChwa5yntVLuQouy9qXfZXnKWHKNwRb/MiT - P2sVT7nG4DDbzSMdsOi7fG06vsBJfq4Oetaco5s1zyL7T7dCC0L4PnwJ2sRQbpSoh/Zb - YAknwfYkp1F0bjeYw2HBdfqlT93kzDLe7sI6zk2uADL1gp9oUMzKpotSMIrbzBIX6nGv - 26ASehd6ceNdxqCKCFCagi8WOuQQBNjN8E+G2m+7Zx1YjGif1LTgmzh6RxtpYT/M02gW - 4eidLLTEv6bQzFwKo9rwJq3iD1A9H9HESrEJGGWjAd5dTDxOLRQXge3igywzFjOnwPq0 - 9huw==; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=6hPBp+vlBrxTRnD9R3qQENApN0jmx2Fg0r+sci7UQ0w=; + fh=r9ZW45D/4i7BIl/4UeFGrkYKwbplztqhOVKfbV+WD3I=; + b=krFTcSGb5iLOt44J//Vp1U9YZ1zRjGjhSOqgtqOknaMcE5aE3+stluCK1VqjGEBKl7 + 5eyiuSOvK0sJj8vWIQITdZt+mk3JEEBS3O04ZZq70NarB+WzKhPvwQmxkE6LHhPIMwqV + e9gKBNFn/Vk499qWjrpnxCb+22+KWfhQrFwSLiMp8j30UpMe9hn4I9u8uAQbZ03q5m02 + XDstL7Nnz9ocpv2rA5gTD4jMaHTOKuXQFrv6N+36c9dqfIkp0AzNDB8cv/Z9Z9kyyxuv + ILq4EGk5hQA7Bg/ld2z0EuPDt08zeQNk834N0WfiK+o1hWby/1vEcRZ4ZLXyGgBJhRQ1 + aI4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; - dkim=pass header.i=@gmail.com header.s=20230601 header.b=XTkwK+MJ; - spf=pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emailwalletrelayer987@gmail.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=WQF01ftP; + spf=pass (google.com: domain of emaiwallet.alice@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emaiwallet.alice@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@gmail.com -Return-Path:Hello!
+This is a test email with a basic HTML body.
+ + + + =20 +--===============3282306698450311126==-- diff --git a/packages/contracts/test/emails/8453/accept.eml b/packages/contracts/test/emails/8453/accept.eml index 1cc21c9b..ff7fc182 100644 --- a/packages/contracts/test/emails/8453/accept.eml +++ b/packages/contracts/test/emails/8453/accept.eml @@ -1,90 +1,102 @@ -Delivered-To: rrelayerbob@gmail.com -Received: by 2002:a05:6400:28a:b0:271:da57:79 with SMTP id hs10csp865237ecb; - Sun, 8 Sep 2024 17:38:53 -0700 (PDT) -X-Received: by 2002:a05:6358:9143:b0:1b8:226a:2622 with SMTP id e5c5f4694b2df-1b84beaea04mr864194555d.21.1725842333641; - Sun, 08 Sep 2024 17:38:53 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1725842333; cv=none; +Delivered-To: suegamisora@gmail.com +Received: by 2002:a05:7010:8c26:b0:403:8332:eb9c with SMTP id gq38csp1724905mdb; + Tue, 10 Sep 2024 07:09:58 -0700 (PDT) +X-Received: by 2002:a05:6300:42:b0:1cf:42bf:6af1 with SMTP id adf61e73a8af0-1cf5e051643mr1238931637.2.1725977398587; + Tue, 10 Sep 2024 07:09:58 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725977398; cv=none; d=google.com; s=arc-20160816; - b=Eo8FQDuq26qqB1YlOaTQ5KkpTWjMuduMUW/YTGvZXhX88eYKZsBZHO1Qgucz7eT4GP - lxiIeLbUjVkJU/kbWNOLusUabrsuMYm3UnOTVeiTZBX8LtHpy8/kWi72IiL0/wpszOB6 - M+CKFud0FgParMBL/FeowgITRN2lfSXXcrEFE7OJ46OUeZTkZH6o5klmAxRaP/WWnK7Q - Lv72Pleqdm7epcpoduR2K5V2t4WD/6hEhqFxkJQf3LfxOAIRYXX2brBpCKGNN7AmnMGJ - 1j4yTPYwX3FjSYBB0dFgRQpO7JqUQuoIWQWuE2IsFf8MowINFSOfzG2HGLCptV7GBdu8 - nR5g== + b=h51zfKeIkjKkNUI7VK2C5oPZzRKSQa9XCcDF2ms/6wvtRpe6/bTOK7VgTKtw/9VZkl + ksmUkZHECkjiGeS87dEVbwE3xmPA+RRL0Xnzcb2OldZu/Qia0/Eeo+55DnSbIL1W8xuY + d9UvnInusZRZtkL8WCtaeQsMnc8xbL2V47J7L+CSnus4mHelRAq65xUhzD3gbeC5MnC9 + WT7/clwYPnBGEf1+giGujnFpYL1ipT8v7JO5g3usTISAzTlVFdoFZG5TbSZzxrYeMhAL + Q5PgB1ij6+9R5I3pWkw1kyVjQ2u6D1E/WCPbSx7DOX56Nj/mFqZn3epWtdhtjitVsiAb + Hm0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=to:subject:message-id:date:from:mime-version:dkim-signature; - bh=u3BMBmOH3oo7W5+AST9Mudcc8sUjkyZ9Ee118Aw1hRA=; - fh=OYPr0JdXtRRlM3Htj/E6+khbD9huvtdqkRTmPoW0wko=; - b=S7CO2YA0iDfPdwyRITTdtNCwpPJQ8OA27yWCiXjsYME+l2C6U73hWlxoUbTO8XqTOL - sQEE4O8zwppLIWznAgRsdXQ5tvcJjn8J+hRO/sDeiGAfeMVyKOXBFWfGwUpbUHHBZ1wS - 6rS2zhzDcrjm6qmnqUY+AeptvSkeb46ECH+QIutZ3BU8iXIe6xYhf7XL/5AkoSrrrTf6 - 4gmti0p2vUJcV+Npyb7QHzcW+AjCFpLPtvkDXRJMHeFxKlMFiaiiugn7vOk1yjxCSaVn - ahfeCUgcBSwkAp03icM2nTpYCVr6Ou0/ZOS74+yal0VsHbQkKAk6Xr6qP4AwCowX0Sc/ - //0w==; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=UtwrridezOg1yynyK4xAGQzZRbhS0kPTHkNHUnvvunw=; + fh=r9ZW45D/4i7BIl/4UeFGrkYKwbplztqhOVKfbV+WD3I=; + b=D3gxw/xgOKa6ZyN6wxlayhqA4WgBobKrSXyDhhtGlHOPND01KGxNwODR5vc2pnKIVk + 7l5wi3l50XN9JufwPXsbybIq4iBWRWO0/RthBkm6hCZO+adAkojP8+sVbOE/Ko46DSkQ + NZzgI0Hk8w/q6mefk8h96SwMN66ZN9Igi+3LKO3Ls9l/h3p/BRblyvNNFLbAtRzszRbw + cMQyNlwV0ChYtXbzPDTLWcYJvF9CODHiLu4r9mQMta09CPAQrpmjd+yHTXdky8/MeT1f + X9VhoGfl8HyI1yGd9P/dfQsCGDhhKPJtr6rV3EtkRywFZHhfKni4aDMpv4ORBFI7GRz2 + I8eg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; - dkim=pass header.i=@gmail.com header.s=20230601 header.b=RwyfZUyf; - spf=pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emailwalletrelayer987@gmail.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=GPNlST0X; + spf=pass (google.com: domain of emaiwallet.alice@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emaiwallet.alice@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@gmail.com -Return-Path:Hello!
+This is a test email with a basic HTML body.
+ + + + =20 +--===============6570435142598105272==-- diff --git a/packages/contracts/test/emails/8453/recovery.eml b/packages/contracts/test/emails/8453/recovery.eml index 0be721ce..b21a41bf 100644 --- a/packages/contracts/test/emails/8453/recovery.eml +++ b/packages/contracts/test/emails/8453/recovery.eml @@ -1,89 +1,101 @@ -Delivered-To: rrelayerbob@gmail.com -Received: by 2002:a05:6400:28a:b0:271:da57:79 with SMTP id hs10csp865517ecb; - Sun, 8 Sep 2024 17:39:56 -0700 (PDT) -X-Received: by 2002:a05:6102:e0f:b0:49c:1bc:1eff with SMTP id ada2fe7eead31-49c01bc22femr2263104137.28.1725842396118; - Sun, 08 Sep 2024 17:39:56 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1725842396; cv=none; +Delivered-To: suegamisora@gmail.com +Received: by 2002:a05:7010:8c26:b0:403:8332:eb9c with SMTP id gq38csp1725181mdb; + Tue, 10 Sep 2024 07:10:18 -0700 (PDT) +X-Received: by 2002:a05:6a21:4581:b0:1cf:4483:18cf with SMTP id adf61e73a8af0-1cf5e032211mr1253128637.9.1725977418263; + Tue, 10 Sep 2024 07:10:18 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1725977418; cv=none; d=google.com; s=arc-20160816; - b=D41hDnFU3G2f/9wRCrVHNx7sasI4u/B06uRAaZgq+tOf6E/zpCTbGcMG2Qk83mFEIM - L00rZK/B4/akwHdjQW8Iel1GwfkdJNHEM+XGiEW6641RId75OwQC2kMG/m+fHakpBsLU - Xpcq4RjCaKJ1WqwkhYjrHxpH/ScVA1vp5sLVbHaymmFVYtC3ztYrVhyYnuKrUjgnAqdR - +PelC5UCIbuORBiLbdTc+cCzQIJV4OlI+u641PQJwrs67H2UrgZnyl6cXMcPNJrzXZiw - oKoD/mTHXGmPY+k6vO23OFy6fU63scpYc6i29ZIuseE2X6+CBodBAtPiYFmeK+hUxTDP - R1SQ== + b=zroQS7O/wy+4Xq65GFlkeS32J3ad9s5Rtn1ZZHHTIqht72Bt7nzQmCmD/MC6fcun0+ + ha/N5a09FR3yL/moVEwHvgoNL5GF4Jl6SQHtGb/XfJS+RLKDHGrmP4nSnqhm7IV1JA63 + TDQJqZMflQM4+J3/rqiSDnac1GT/0+cZeJqkhzcJ16E3MMjx9OMgwOVloJ/pKmUX5AzB + CW2YyV0f2dFTCMbSucVouQ7QORILBzdzQJbFKQxsuI+B0xfiJoBdWNfHz49pFfEFZ9H8 + Lae0UDJWRCu8PXUn8mNVGb9QAC66/mWnGQQWOVvQLn8vTBeVIPXDQtZLtNO40CF15sKO + H4sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=to:subject:message-id:date:from:mime-version:dkim-signature; - bh=mvDapCNNa9oKBO12XFAqF92pzaTTjGLTiE2clMtdRzM=; - fh=OYPr0JdXtRRlM3Htj/E6+khbD9huvtdqkRTmPoW0wko=; - b=a9iG6t8RdHTSDJrDnbsG10Kdnq2Es9QDHumVktkIoOi0UF2vf5YprDs0nj7OFSPoCc - nAZAZvIwB8fL4f+cqM+ZIWzFjplOY1tfspreWsfZkxDUrhKNUhhiuyVI3JkdY/BMeCJ2 - mim96jnyH3ckvBPgeJdiCkZWknstuQrce1CQyfp64rUB0WQ4MgdgyPYBLSrbc2ZfQo3r - jahYqae1lJTY37m29wLIMh/vix2SJutq47+/St2rIk59SpgTz3xIJSPKI76ovOBR3sbU - /PjYxt8wFw2eP0g/etqbGS1sxVdu4UMWDqXpCrEQ63bTlfgTpwrYMh9ugZNfG4kHxD96 - 3uAA==; + h=subject:to:from:mime-version:date:message-id:dkim-signature; + bh=DmuuCSkWIuDD9dHgMJvud0Des6CJSRGWEXWicibZGr0=; + fh=r9ZW45D/4i7BIl/4UeFGrkYKwbplztqhOVKfbV+WD3I=; + b=aQ7Y64foZ4iSgxa9/w3hCljESalXAl3JRQulhCEXVJAjBBEP55HXyl/AcPtT6V0M/H + gfLG8IIThWWfS0SeI5JUPunWO08UBfqNi7z3BfA89pIuTQFpuLHt6diB4twd9H3weyrF + raNsYoD9+UH2dXvh4UsOPRaQsLhvzuKipwVxjc513AMrSjZKREscvcS/2QJcY1Sc3HaZ + JhzCEHFlMyK06VrjHDeaqDVwDN0YY2ELFnTHvM0Ufy7JRa69yGVUXB53nneVTc5tU7iA + vMkVRxHeflLwMQyjbgty7tT12L4OU4jVGafrXUQmzf6ZLY1QZYPnWsl64HFZ9k/JhdHr + sdCA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; - dkim=pass header.i=@gmail.com header.s=20230601 header.b=RfgErx0i; - spf=pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emailwalletrelayer987@gmail.com; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZauiTwkO; + spf=pass (google.com: domain of emaiwallet.alice@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emaiwallet.alice@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@gmail.com -Return-Path:Hello!
+This is a test email with a basic HTML body.
+ + + + =20 +--===============0526941080473938676==-- diff --git a/packages/contracts/test/helpers/DeploymentHelper.sol b/packages/contracts/test/helpers/DeploymentHelper.sol index dc345500..b96894d1 100644 --- a/packages/contracts/test/helpers/DeploymentHelper.sol +++ b/packages/contracts/test/helpers/DeploymentHelper.sol @@ -7,6 +7,7 @@ import "forge-std/console.sol"; import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {EmailAuth, EmailAuthMsg} from "../../src/EmailAuth.sol"; import {Verifier, EmailProof} from "../../src/utils/Verifier.sol"; +import {Groth16Verifier} from "../../src/utils/Groth16Verifier.sol"; import {ECDSAOwnedDKIMRegistry} from "../../src/utils/ECDSAOwnedDKIMRegistry.sol"; import {UserOverrideableDKIMRegistry} from "@zk-email/contracts/UserOverrideableDKIMRegistry.sol"; import {SimpleWallet} from "./SimpleWallet.sol"; @@ -43,8 +44,8 @@ contract DeploymentHelper is Test { bytes32 accountSalt; uint templateId; - string[] subjectTemplate; - string[] newSubjectTemplate; + string[] commandTemplate; + string[] newCommandTemplate; bytes mockProof = abi.encodePacked(bytes1(0x01)); string selector = "12345"; @@ -101,9 +102,13 @@ contract DeploymentHelper is Test { "Verifier implementation deployed at: %s", address(verifierImpl) ); + Groth16Verifier groth16Verifier = new Groth16Verifier(); ERC1967Proxy verifierProxy = new ERC1967Proxy( address(verifierImpl), - abi.encodeCall(verifierImpl.initialize, (msg.sender)) + abi.encodeCall( + verifierImpl.initialize, + (msg.sender, address(groth16Verifier)) + ) ); verifier = Verifier(address(verifierProxy)); } @@ -115,8 +120,8 @@ contract DeploymentHelper is Test { uint templateIdx = 0; templateId = uint256(keccak256(abi.encodePacked("TEST", templateIdx))); - subjectTemplate = ["Send", "{decimals}", "ETH", "to", "{ethAddr}"]; - newSubjectTemplate = ["Send", "{decimals}", "USDC", "to", "{ethAddr}"]; + commandTemplate = ["Send", "{decimals}", "ETH", "to", "{ethAddr}"]; + newCommandTemplate = ["Send", "{decimals}", "USDC", "to", "{ethAddr}"]; // Create RecoveryController as EmailAccountRecovery implementation RecoveryController recoveryControllerImpl = new RecoveryController(); @@ -136,7 +141,6 @@ contract DeploymentHelper is Test { payable(address(recoveryControllerProxy)) ); - // Create SimpleWallet simpleWalletImpl = new SimpleWallet(); address recoveryControllerAddress = address(recoveryController); diff --git a/packages/contracts/test/helpers/RecoveryController.sol b/packages/contracts/test/helpers/RecoveryController.sol index 725bca68..a73e5b7e 100644 --- a/packages/contracts/test/helpers/RecoveryController.sol +++ b/packages/contracts/test/helpers/RecoveryController.sol @@ -22,12 +22,6 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { mapping(address => uint) public timelockPeriodOfAccount; mapping(address => uint) public currentTimelockOfAccount; - // modifier onlyNotRecoveringOwner() { - // require(msg.sender == owner(), "only owner"); - // require(!isRecovering, "recovery in progress"); - // _; - // } - constructor() {} function initialize( @@ -48,7 +42,7 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { return isActivatedOfAccount[recoveredAccount]; } - function acceptanceSubjectTemplates() + function acceptanceCommandTemplates() public pure override @@ -64,7 +58,7 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { return templates; } - function recoverySubjectTemplates() + function recoveryCommandTemplates() public pure override @@ -83,22 +77,22 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { return templates; } - function extractRecoveredAccountFromAcceptanceSubject( - bytes[] memory subjectParams, + function extractRecoveredAccountFromAcceptanceCommand( + bytes[] memory commandParams, uint templateIdx ) public pure override returns (address) { require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 1, "invalid subject params"); - return abi.decode(subjectParams[0], (address)); + require(commandParams.length == 1, "invalid command params"); + return abi.decode(commandParams[0], (address)); } - function extractRecoveredAccountFromRecoverySubject( - bytes[] memory subjectParams, + function extractRecoveredAccountFromRecoveryCommand( + bytes[] memory commandParams, uint templateIdx ) public pure override returns (address) { require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 2, "invalid subject params"); - return abi.decode(subjectParams[0], (address)); + require(commandParams.length == 2, "invalid command params"); + return abi.decode(commandParams[0], (address)); } function requestGuardian(address guardian) public { @@ -122,10 +116,10 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { function acceptGuardian( address guardian, uint templateIdx, - bytes[] memory subjectParams, + bytes[] memory commandParams, bytes32 ) internal override { - address account = abi.decode(subjectParams[0], (address)); + address account = abi.decode(commandParams[0], (address)); require(!isRecovering[account], "recovery in progress"); require(guardian != address(0), "invalid guardian"); @@ -134,17 +128,17 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { "guardian status must be REQUESTED" ); require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 1, "invalid subject params"); + require(commandParams.length == 1, "invalid command params"); guardians[guardian] = GuardianStatus.ACCEPTED; } function processRecovery( address guardian, uint templateIdx, - bytes[] memory subjectParams, + bytes[] memory commandParams, bytes32 ) internal override { - address account = abi.decode(subjectParams[0], (address)); + address account = abi.decode(commandParams[0], (address)); require(!isRecovering[account], "recovery in progress"); require(guardian != address(0), "invalid guardian"); require( @@ -152,8 +146,8 @@ contract RecoveryController is OwnableUpgradeable, EmailAccountRecovery { "guardian status must be ACCEPTED" ); require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 2, "invalid subject params"); - address newSignerInEmail = abi.decode(subjectParams[1], (address)); + require(commandParams.length == 2, "invalid command params"); + address newSignerInEmail = abi.decode(commandParams[1], (address)); require(newSignerInEmail != address(0), "invalid new signer"); isRecovering[account] = true; newSignerCandidateOfAccount[account] = newSignerInEmail; diff --git a/packages/contracts/test/helpers/RecoveryControllerZKSync.sol b/packages/contracts/test/helpers/RecoveryControllerZKSync.sol index f9a7a67c..14e15a9c 100644 --- a/packages/contracts/test/helpers/RecoveryControllerZKSync.sol +++ b/packages/contracts/test/helpers/RecoveryControllerZKSync.sol @@ -6,7 +6,10 @@ import {EmailAccountRecoveryZKSync} from "../../src/EmailAccountRecoveryZKSync.s import {Address} from "@openzeppelin/contracts/utils/Address.sol"; import {SimpleWallet} from "./SimpleWallet.sol"; -contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKSync { +contract RecoveryControllerZKSync is + OwnableUpgradeable, + EmailAccountRecoveryZKSync +{ enum GuardianStatus { NONE, REQUESTED, @@ -49,7 +52,7 @@ contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKS return isActivatedOfAccount[recoveredAccount]; } - function acceptanceSubjectTemplates() + function acceptanceCommandTemplates() public pure override @@ -65,7 +68,7 @@ contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKS return templates; } - function recoverySubjectTemplates() + function recoveryCommandTemplates() public pure override @@ -84,22 +87,22 @@ contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKS return templates; } - function extractRecoveredAccountFromAcceptanceSubject( - bytes[] memory subjectParams, + function extractRecoveredAccountFromAcceptanceCommand( + bytes[] memory commandParams, uint templateIdx ) public pure override returns (address) { require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 1, "invalid subject params"); - return abi.decode(subjectParams[0], (address)); + require(commandParams.length == 1, "invalid command params"); + return abi.decode(commandParams[0], (address)); } - function extractRecoveredAccountFromRecoverySubject( - bytes[] memory subjectParams, + function extractRecoveredAccountFromRecoveryCommand( + bytes[] memory commandParams, uint templateIdx ) public pure override returns (address) { require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 2, "invalid subject params"); - return abi.decode(subjectParams[0], (address)); + require(commandParams.length == 2, "invalid command params"); + return abi.decode(commandParams[0], (address)); } function requestGuardian(address guardian) public { @@ -123,10 +126,10 @@ contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKS function acceptGuardian( address guardian, uint templateIdx, - bytes[] memory subjectParams, + bytes[] memory commandParams, bytes32 ) internal override { - address account = abi.decode(subjectParams[0], (address)); + address account = abi.decode(commandParams[0], (address)); require(!isRecovering[account], "recovery in progress"); require(guardian != address(0), "invalid guardian"); @@ -135,17 +138,17 @@ contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKS "guardian status must be REQUESTED" ); require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 1, "invalid subject params"); + require(commandParams.length == 1, "invalid command params"); guardians[guardian] = GuardianStatus.ACCEPTED; } function processRecovery( address guardian, uint templateIdx, - bytes[] memory subjectParams, + bytes[] memory commandParams, bytes32 ) internal override { - address account = abi.decode(subjectParams[0], (address)); + address account = abi.decode(commandParams[0], (address)); require(!isRecovering[account], "recovery in progress"); require(guardian != address(0), "invalid guardian"); require( @@ -153,8 +156,8 @@ contract RecoveryControllerZKSync is OwnableUpgradeable, EmailAccountRecoveryZKS "guardian status must be ACCEPTED" ); require(templateIdx == 0, "invalid template index"); - require(subjectParams.length == 2, "invalid subject params"); - address newSignerInEmail = abi.decode(subjectParams[1], (address)); + require(commandParams.length == 2, "invalid command params"); + address newSignerInEmail = abi.decode(commandParams[1], (address)); require(newSignerInEmail != address(0), "invalid new signer"); isRecovering[account] = true; newSignerCandidateOfAccount[account] = newSignerInEmail; diff --git a/packages/contracts/test/helpers/SimpleWallet.sol b/packages/contracts/test/helpers/SimpleWallet.sol index 27678ebb..c5d476d3 100644 --- a/packages/contracts/test/helpers/SimpleWallet.sol +++ b/packages/contracts/test/helpers/SimpleWallet.sol @@ -49,4 +49,9 @@ contract SimpleWallet is OwnableUpgradeable { ); _transferOwnership(newOwner); } + + function requestGuardian(address guardian) public { + require(msg.sender == owner(), "only owner"); + RecoveryController(recoveryController).requestGuardian(guardian); + } } diff --git a/packages/contracts/test/helpers/StructHelper.sol b/packages/contracts/test/helpers/StructHelper.sol index cae1eb2f..e8c75761 100644 --- a/packages/contracts/test/helpers/StructHelper.sol +++ b/packages/contracts/test/helpers/StructHelper.sol @@ -8,9 +8,9 @@ contract StructHelper is DeploymentHelper { public returns (EmailAuthMsg memory emailAuthMsg) { - bytes[] memory subjectParams = new bytes[](2); - subjectParams[0] = abi.encode(1 ether); - subjectParams[1] = abi.encode( + bytes[] memory commandParams = new bytes[](2); + commandParams[0] = abi.encode(1 ether); + commandParams[1] = abi.encode( "0x0000000000000000000000000000000000000020" ); @@ -18,7 +18,7 @@ contract StructHelper is DeploymentHelper { domainName: "gmail.com", publicKeyHash: publicKeyHash, timestamp: 1694989812, - maskedSubject: "Send 1 ETH to 0x0000000000000000000000000000000000000020", + maskedCommand: "Send 1 ETH to 0x0000000000000000000000000000000000000020", emailNullifier: emailNullifier, accountSalt: accountSalt, isCodeExist: true, @@ -27,8 +27,8 @@ contract StructHelper is DeploymentHelper { emailAuthMsg = EmailAuthMsg({ templateId: templateId, - subjectParams: subjectParams, - skipedSubjectPrefix: 0, + commandParams: commandParams, + skippedCommandPrefix: 0, proof: emailProof }); diff --git a/packages/contracts/test/script/ChangeOwners.t.sol b/packages/contracts/test/script/ChangeOwnersScript.t.sol similarity index 97% rename from packages/contracts/test/script/ChangeOwners.t.sol rename to packages/contracts/test/script/ChangeOwnersScript.t.sol index dcbe183f..a64ef96e 100644 --- a/packages/contracts/test/script/ChangeOwners.t.sol +++ b/packages/contracts/test/script/ChangeOwnersScript.t.sol @@ -10,7 +10,7 @@ import {ChangeOwners} from "../../script/ChangeOwners.s.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {StructHelper} from "../helpers/StructHelper.sol"; -contract ChangeOwnersTest is StructHelper { +contract ChangeOwnersScriptTest is StructHelper { function setUp() public override { vm.setEnv( "PRIVATE_KEY", diff --git a/packages/contracts/test/script/ChangeSignerInECDSAOwnedDKIMRegistry.t.sol b/packages/contracts/test/script/ChangeSignerInECDSAOwnedDKIMRegistryScript.t.sol similarity index 93% rename from packages/contracts/test/script/ChangeSignerInECDSAOwnedDKIMRegistry.t.sol rename to packages/contracts/test/script/ChangeSignerInECDSAOwnedDKIMRegistryScript.t.sol index 26bc8797..46218861 100644 --- a/packages/contracts/test/script/ChangeSignerInECDSAOwnedDKIMRegistry.t.sol +++ b/packages/contracts/test/script/ChangeSignerInECDSAOwnedDKIMRegistryScript.t.sol @@ -9,7 +9,7 @@ import {ChangeSigner} from "../../script/ChangeSignerInECDSAOwnedDKIMRegistry.s. import {ECDSAOwnedDKIMRegistry} from "../../src/utils/ECDSAOwnedDKIMRegistry.sol"; import {StructHelper} from "../helpers/StructHelper.sol"; -contract ChangeSignerInECDSAOwnedDKIMRegistryTest is StructHelper { +contract ChangeSignerInECDSAOwnedDKIMRegistryScriptTest is StructHelper { function setUp() public override { vm.setEnv( "PRIVATE_KEY", @@ -21,7 +21,7 @@ contract ChangeSignerInECDSAOwnedDKIMRegistryTest is StructHelper { function test_run() public { skipIfZkSync(); - + Deploy deploy = new Deploy(); deploy.run(); ChangeSigner changeSigner = new ChangeSigner(); diff --git a/packages/contracts/test/script/ChangeSourceInForwardDKIMRegistry.t.sol b/packages/contracts/test/script/ChangeSourceInForwardDKIMRegistryScript.t.sol similarity index 95% rename from packages/contracts/test/script/ChangeSourceInForwardDKIMRegistry.t.sol rename to packages/contracts/test/script/ChangeSourceInForwardDKIMRegistryScript.t.sol index 0c90097a..7b7e22b5 100644 --- a/packages/contracts/test/script/ChangeSourceInForwardDKIMRegistry.t.sol +++ b/packages/contracts/test/script/ChangeSourceInForwardDKIMRegistryScript.t.sol @@ -10,7 +10,7 @@ import {ChangeSource} from "../../script/ChangeSourceInForwardDKIMRegistry.s.sol import {ForwardDKIMRegistry} from "../../src/utils/ForwardDKIMRegistry.sol"; import {StructHelper} from "../helpers/StructHelper.sol"; -contract ChangeSourceInForwardDKIMRegistryTest is StructHelper { +contract ChangeSourceInForwardDKIMRegistryScriptTest is StructHelper { function setUp() public override { vm.setEnv( "PRIVATE_KEY", diff --git a/packages/contracts/test/script/DeployCommons.t.sol b/packages/contracts/test/script/DeployCommonsScript.t.sol similarity index 56% rename from packages/contracts/test/script/DeployCommons.t.sol rename to packages/contracts/test/script/DeployCommonsScript.t.sol index a9ff89b2..4767fd66 100644 --- a/packages/contracts/test/script/DeployCommons.t.sol +++ b/packages/contracts/test/script/DeployCommonsScript.t.sol @@ -4,24 +4,21 @@ pragma solidity ^0.8.12; import "forge-std/Test.sol"; import "forge-std/console.sol"; -import { Deploy } from "../../script/DeployCommons.s.sol"; -import { StructHelper } from "../helpers/StructHelper.sol"; +import {Deploy} from "../../script/DeployCommons.s.sol"; +import {StructHelper} from "../helpers/StructHelper.sol"; -contract DeployCommonsTest is StructHelper { +contract DeployCommonsScriptTest is StructHelper { function setUp() public override { vm.setEnv( - "PRIVATE_KEY", + "PRIVATE_KEY", "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" ); - vm.setEnv( - "SIGNER", - "0x69bec2dd161d6bbcc91ec32aa44d9333ebc864c0" - ); + vm.setEnv("SIGNER", "0x69bec2dd161d6bbcc91ec32aa44d9333ebc864c0"); } function test_run() public { skipIfZkSync(); - + Deploy deploy = new Deploy(); deploy.run(); } diff --git a/packages/contracts/test/script/DeployRecoveryController.t.sol b/packages/contracts/test/script/DeployRecoveryControllerScript.t.sol similarity index 64% rename from packages/contracts/test/script/DeployRecoveryController.t.sol rename to packages/contracts/test/script/DeployRecoveryControllerScript.t.sol index 6a66b7f1..33294a01 100644 --- a/packages/contracts/test/script/DeployRecoveryController.t.sol +++ b/packages/contracts/test/script/DeployRecoveryControllerScript.t.sol @@ -7,7 +7,7 @@ import "forge-std/console.sol"; import {Deploy} from "../../script/DeployRecoveryController.s.sol"; import {StructHelper} from "../helpers/StructHelper.sol"; -contract DeployRecoveryControllerTest is StructHelper { +contract DeployRecoveryControllerScriptTest is StructHelper { function setUp() public override { vm.setEnv( "PRIVATE_KEY", @@ -18,7 +18,7 @@ contract DeployRecoveryControllerTest is StructHelper { function test_run() public { skipIfZkSync(); - + Deploy deploy = new Deploy(); deploy.run(); require( @@ -39,16 +39,4 @@ contract DeployRecoveryControllerTest is StructHelper { "SIMPLE_WALLET is not set" ); } - - // TODO: Comment out this test case because removing environment variables will affect other tests - // If you want to run this test case, please run `forge test --match-test testFail_run_no_signer`. It works. - // function testFail_run_no_signer() public { - // // Remove DKIM and SIGNER from the environment variables - // vm.setEnv("DKIM", vm.toString(address(0))); - // vm.setEnv("SIGNER", vm.toString(address(0))); - - // Deploy deploy = new Deploy(); - // deploy.run(); - // require(vm.envAddress("DKIM") != address(0), "DKIM is not set"); - // } } diff --git a/packages/contracts/test/script/DeploySimpleWallet.t.sol b/packages/contracts/test/script/DeploySimpleWalletScript.t.sol similarity index 62% rename from packages/contracts/test/script/DeploySimpleWallet.t.sol rename to packages/contracts/test/script/DeploySimpleWalletScript.t.sol index a0bbf164..82bdcc2f 100644 --- a/packages/contracts/test/script/DeploySimpleWallet.t.sol +++ b/packages/contracts/test/script/DeploySimpleWalletScript.t.sol @@ -4,37 +4,22 @@ pragma solidity ^0.8.12; import "forge-std/Test.sol"; import "forge-std/console.sol"; -import { Deploy } from "../../script/DeployCommons.s.sol"; -import { StructHelper } from "../helpers/StructHelper.sol"; +import {Deploy} from "../../script/DeployCommons.s.sol"; +import {StructHelper} from "../helpers/StructHelper.sol"; -contract DeploySimpleWalletTest is StructHelper { +contract DeploySimpleWalletScriptTest is StructHelper { function setUp() public override { super.setUp(); vm.setEnv( - "PRIVATE_KEY", + "PRIVATE_KEY", "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" ); - vm.setEnv( - "SIGNER", - "0x69bec2dd161d6bbcc91ec32aa44d9333ebc864c0" - ); - - vm.setEnv( - "DKIM", - vm.toString(address(dkim)) - ); - vm.setEnv( - "VERIFIER", - vm.toString(address(verifier)) - ); - vm.setEnv( - "EMAIL_AUTH_IMPL", - vm.toString(address(emailAuth)) - ); - vm.setEnv( - "SIMPLE_WALLET_IMPL", - vm.toString(address(simpleWalletImpl)) - ); + vm.setEnv("SIGNER", "0x69bec2dd161d6bbcc91ec32aa44d9333ebc864c0"); + + vm.setEnv("DKIM", vm.toString(address(dkim))); + vm.setEnv("VERIFIER", vm.toString(address(verifier))); + vm.setEnv("EMAIL_AUTH_IMPL", vm.toString(address(emailAuth))); + vm.setEnv("SIMPLE_WALLET_IMPL", vm.toString(address(simpleWalletImpl))); } function test_run() public { diff --git a/packages/contracts/test/script/RenounceOwners.t.sol b/packages/contracts/test/script/RenounceOwnersScript.t.sol similarity index 96% rename from packages/contracts/test/script/RenounceOwners.t.sol rename to packages/contracts/test/script/RenounceOwnersScript.t.sol index cafb6610..d2ec7274 100644 --- a/packages/contracts/test/script/RenounceOwners.t.sol +++ b/packages/contracts/test/script/RenounceOwnersScript.t.sol @@ -10,7 +10,7 @@ import {RenounceOwners} from "../../script/RenounceOwners.s.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {StructHelper} from "../helpers/StructHelper.sol"; -contract RenounceOwnersTest is StructHelper { +contract RenounceOwnersScriptTest is StructHelper { function setUp() public override { vm.setEnv( "PRIVATE_KEY", diff --git a/packages/contracts/test/script/Upgrades.t.sol b/packages/contracts/test/script/UpgradesScript.t.sol similarity index 98% rename from packages/contracts/test/script/Upgrades.t.sol rename to packages/contracts/test/script/UpgradesScript.t.sol index 862eba32..c6ac7b36 100644 --- a/packages/contracts/test/script/Upgrades.t.sol +++ b/packages/contracts/test/script/UpgradesScript.t.sol @@ -11,7 +11,7 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol"; import {StructHelper} from "../helpers/StructHelper.sol"; -contract UpgradesTest is StructHelper { +contract UpgradesScriptTest is StructHelper { uint256 internal constant IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc; @@ -25,7 +25,7 @@ contract UpgradesTest is StructHelper { function test_run() public { skipIfZkSync(); - + Deploy deploy = new Deploy(); deploy.run(); vm.setEnv("SOURCE_DKIM", vm.toString(vm.envAddress("ECDSA_DKIM"))); diff --git a/packages/prover/Dockerfile b/packages/prover/Dockerfile index 256a6db4..97296dd7 100644 --- a/packages/prover/Dockerfile +++ b/packages/prover/Dockerfile @@ -1,50 +1,67 @@ -FROM python:3.10 +FROM nvidia/cuda:12.4.0-devel-ubuntu22.04 RUN apt-get update && apt-get upgrade -y # Update the package list and install necessary dependencies RUN apt-get update && \ - apt install -y cmake build-essential pkg-config libssl-dev libgmp-dev libsodium-dev nasm git awscli gcc nodejs npm + DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \ + cmake \ + build-essential \ + pkg-config \ + libssl-dev \ + libgmp-dev \ + libffi-dev \ + libsodium-dev \ + nasm \ + git \ + awscli \ + gcc \ + nodejs \ + npm \ + curl \ + m4 \ + python3 \ + python3-pip \ + python3-dev \ + wget \ + software-properties-common \ + unzip \ + && rm -rf /var/lib/apt/lists/* + +# Set Python 3 as the default python version +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \ + && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 # Node install RUN npm install -g n -RUN n 18 +RUN n 22 RUN npm install -g yarn snarkjs RUN git clone https://github.com/zkemail/ether-email-auth.git WORKDIR /ether-email-auth/packages/prover RUN pip install -r requirements.txt RUN cp ./circom_proofgen.sh /root +RUN cp ./email_auth_with_body_parsing_with_qp_encoding /root WORKDIR /root RUN ls /root -# RUN mkdir params -# RUN cp /email-wallet/packages/prover/params/account_creation.wasm /root/params -# RUN cp /email-wallet/packages/prover/params/account_init.wasm /root/params -# RUN cp /email-wallet/packages/prover/params/account_transport.wasm /root/params -# RUN cp /email-wallet/packages/prover/params/claim.wasm /root/params -# RUN cp /email-wallet/packages/prover/params/email_sender.wasm /root/params RUN mkdir params WORKDIR /root/params -RUN gdown "https://drive.google.com/uc?id=1Ybtxe1TCVUtHzCPUs9cuZAGbM-MVwigE" +RUN gdown "https://drive.google.com/uc?id=1l3mNqFYv-YZc2efFlphFUkoaCnGCxFtE" RUN unzip params.zip RUN mv params/* /root/params WORKDIR /root RUN ls params -# RUN mv build params -# RUN curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-account-creation/contributions/emailwallet-account-creation_00019.zkey --output ./params/account_creation.zkey -# RUN curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-account-init/contributions/emailwallet-account-init_00007.zkey --output ./params/account_init.zkey -# RUN curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-account-transport/contributions/emailwallet-account-transport_00005.zkey --output ./params/account_transport.zkey -# RUN curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-claim/contributions/emailwallet-claim_00006.zkey --output ./params/claim.zkey -# RUN curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-email-sender/contributions/emailwallet-email-sender_00006.zkey --output ./params/email_sender.zkey RUN chmod +x circom_proofgen.sh RUN mkdir build -RUN git clone https://github.com/iden3/rapidsnark-old.git rapidsnark +RUN git clone https://github.com/Orbiter-Finance/rapidsnark.git rapidsnark WORKDIR /root/rapidsnark RUN yarn RUN git submodule init RUN git submodule update -RUN npx task createFieldSources -RUN npx task buildPistache -RUN npx task buildProver -RUN chmod +x build/prover +RUN ./build_gmp.sh host +RUN mkdir build_prover +WORKDIR /root/rapidsnark/build_prover +RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../package -DNVML_LIBRARY=/usr/local/cuda-12.4/targets/x86_64-linux/lib/stubs/libnvidia-ml.so +RUN make -j$(nproc) && make install +RUN chmod +x ../package/bin/prover_cuda WORKDIR /root \ No newline at end of file diff --git a/packages/prover/circom_proofgen.sh b/packages/prover/circom_proofgen.sh index 738f2e2c..18ac8162 100755 --- a/packages/prover/circom_proofgen.sh +++ b/packages/prover/circom_proofgen.sh @@ -21,21 +21,9 @@ public_path="${buildDir}/rapidsnark_public_${circuitName}_${nonce}.json" cd "${SCRIPT_DIR}" echo "entered zk email path: ${SCRIPT_DIR}" -echo "NODE_OPTIONS='--max-old-space-size=644000' snarkjs wc "${paramsDir}/${circuitName}.wasm" "${input_path}" "${witness_path}"" -NODE_OPTIONS='--max-old-space-size=644000' snarkjs wc "${paramsDir}/${circuitName}.wasm" "${input_path}" "${witness_path}" | tee /dev/stderr +${paramsDir}/${circuitName}_cpp/${circuitName} "${input_path}" "${witness_path}" | tee /dev/stderr status_jswitgen=$? -echo "✓ Finished witness generation with js! ${status_jswitgen}" - -# TODO: Get C-based witness gen to work -# echo "/${build_dir}/${CIRCUIT_NAME}_cpp/${CIRCUIT_NAME} ${input_wallet_path} ${witness_path}" -# "/${build_dir}/${CIRCUIT_NAME}_cpp/${CIRCUIT_NAME}" "${input_wallet_path}" "${witness_path}" -# status_c_wit=$? - -# echo "Finished C witness gen! Status: ${status_c_wit}" -# if [ $status_c_wit -ne 0 ]; then -# echo "C based witness gen failed with status (might be on machine specs diff than compilation): ${status_c_wit}" -# exit 1 -# fi +echo "✓ Finished witness generation with cpp! ${status_jswitgen}" if [ $isLocal = 1 ]; then # DEFAULT SNARKJS PROVER (SLOW) @@ -43,14 +31,14 @@ if [ $isLocal = 1 ]; then status_prover=$? echo "✓ Finished slow proofgen! Status: ${status_prover}" else - # RAPIDSNARK PROVER (10x FASTER) - echo "ldd ${SCRIPT_DIR}/rapidsnark/build/prover" - ldd "${SCRIPT_DIR}/rapidsnark/build/prover" + # RAPIDSNARK PROVER GPU + echo "ldd ${SCRIPT_DIR}/rapidsnark/package/bin/prover_cuda" + ldd "${SCRIPT_DIR}/rapidsnark/package/bin/prover_cuda" status_lld=$? echo "✓ lld prover dependencies present! ${status_lld}" - echo "${SCRIPT_DIR}/rapidsnark/build/prover ${paramsDir}/${circuitName}.zkey ${witness_path} ${proof_path} ${public_path}" - "${SCRIPT_DIR}/rapidsnark/build/prover" "${paramsDir}/${circuitName}.zkey" "${witness_path}" "${proof_path}" "${public_path}" | tee /dev/stderr + echo "${SCRIPT_DIR}/rapidsnark/package/bin/prover_cuda ${paramsDir}/${circuitName}.zkey ${witness_path} ${proof_path} ${public_path}" + "${SCRIPT_DIR}/rapidsnark/package/bin/prover_cuda" "${paramsDir}/${circuitName}.zkey" "${witness_path}" "${proof_path}" "${public_path}" | tee /dev/stderr status_prover=$? echo "✓ Finished rapid proofgen! Status: ${status_prover}" fi diff --git a/packages/prover/core.py b/packages/prover/core.py index d182cc81..eb4c1f74 100644 --- a/packages/prover/core.py +++ b/packages/prover/core.py @@ -3,11 +3,11 @@ import json import logging -logger = logging.getLogger(__name__) +# logger = logging.getLogger(__name__) def gen_email_auth_proof(nonce: str, is_local: bool, input: dict) -> dict: - circuit_name = "email_auth" + circuit_name = "email_auth_with_body_parsing_with_qp_encoding" print("Store input") store_input(circuit_name, nonce, input) print("Generate proof") @@ -19,18 +19,28 @@ def gen_email_auth_proof(nonce: str, is_local: bool, input: dict) -> dict: def store_input(circuit_name: str, nonce: str, json_data: dict): + print("Storing input") cur_dir = get_cur_dir() + print(f"Current dir: {cur_dir}") build_dir = os.path.join(cur_dir, "build") # check if build_dir exists if not os.path.exists(build_dir): os.makedirs(build_dir) + print(f"Build dir: {build_dir}") json_file_path = os.path.join( build_dir, "input_" + circuit_name + "_" + nonce + ".json" ) - logger.info(f"Store user input to {json_file_path}") + print(f"Json file path: {json_file_path}") + print(f"Json data: {json_data}") + print(f"Json data type: {type(json_data)}") + # logger.info(f"Store user input to {json_file_path}") with open(json_file_path, "w") as json_file: json_file.write(json_data) + # Read the file back + with open(json_file_path, "r") as json_file: + print(json_file.read()) + print("Stored input") def load_proof(circuit_name: str, nonce: str) -> dict: @@ -39,7 +49,7 @@ def load_proof(circuit_name: str, nonce: str) -> dict: json_file_path = os.path.join( build_dir, "rapidsnark_proof_" + circuit_name + "_" + nonce + ".json" ) - logger.info(f"Loading proof from {json_file_path}") + # logger.info(f"Loading proof from {json_file_path}") with open(json_file_path, "r") as json_file: return json.loads(json_file.read()) @@ -50,7 +60,7 @@ def load_pub_signals(circuit_name: str, nonce: str) -> dict: json_file_path = os.path.join( build_dir, "rapidsnark_public_" + circuit_name + "_" + nonce + ".json" ) - logger.info(f"Loading public signals from {json_file_path}") + # logger.info(f"Loading public signals from {json_file_path}") with open(json_file_path, "r") as json_file: return json.loads(json_file.read()) @@ -59,9 +69,9 @@ def gen_proof(circuit_name: str, nonce: str, is_local: bool): is_local_int: int = 1 if is_local else 0 cur_dir = get_cur_dir() params_dir = os.path.join(cur_dir, "params") - logger.info(f"Params dir: {params_dir}") + # logger.info(f"Params dir: {params_dir}") build_dir = os.path.join(cur_dir, "build") - logger.info(f"Build dir: {build_dir}") + # logger.info(f"Build dir: {build_dir}") result = subprocess.run( [ os.path.join(cur_dir, "circom_proofgen.sh"), @@ -72,9 +82,9 @@ def gen_proof(circuit_name: str, nonce: str, is_local: bool): str(is_local_int), ] ) - logger.info(f"Proof generation result: {result.returncode}") - if result.stderr is not None: - logger.error(result.stderr) + # logger.info(f"Proof generation result: {result.returncode}") + # if result.stderr is not None: + # logger.error(result.stderr) print(result.stdout) print(result.stderr) diff --git a/packages/prover/local_setup.sh b/packages/prover/local_setup.sh index b8266f1e..026f0cfb 100755 --- a/packages/prover/local_setup.sh +++ b/packages/prover/local_setup.sh @@ -6,11 +6,6 @@ mkdir -p build npm install -g snarkjs@latest pip install -r requirements.txt mkdir build && cd build -gdown "https://drive.google.com/uc?id=1Ybtxe1TCVUtHzCPUs9cuZAGbM-MVwigE" +gdown "https://drive.google.com/uc?id=1l3mNqFYv-YZc2efFlphFUkoaCnGCxFtE" unzip params.zip -# curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-account-creation/contributions/emailwallet-account-creation_00019.zkey --output /root/params/account_creation.zkey -# curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-account-init/contributions/emailwallet-account-init_00007.zkey --output /root/params/account_init.zkey -# curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-account-transport/contributions/emailwallet-account-transport_00005.zkey --output /root/params/account_transport.zkey -# curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-claim/contributions/emailwallet-claim_00006.zkey --output /root/params/claim.zkey -# curl https://email-wallet-trusted-setup-ceremony-pse-p0tion-production.s3.eu-central-1.amazonaws.com/circuits/emailwallet-email-sender/contributions/emailwallet-email-sender_00006.zkey --output /root/params/email_sender.zkey chmod +x circom_proofgen.sh diff --git a/packages/prover/modal_server.py b/packages/prover/modal_server.py index 54b93b3d..44d95f58 100644 --- a/packages/prover/modal_server.py +++ b/packages/prover/modal_server.py @@ -5,7 +5,7 @@ from google.cloud.logging_v2.handlers import setup_logging from google.oauth2 import service_account -app = modal.App("email-auth-prover-v1.1.0") +app = modal.App("email-auth-prover-v1.4.0") image = modal.Image.from_dockerfile("Dockerfile") @@ -15,8 +15,10 @@ mounts=[ modal.Mount.from_local_python_packages("core"), ], - cpu=14, + cpu=16, + gpu="any", secrets=[modal.Secret.from_name("gc-ether-email-auth-prover")], + keep_warm=True ) @modal.wsgi_app() def flask_app(): @@ -45,17 +47,17 @@ def prove_email_auth(): print("prove_email_auth") req = request.get_json() input = req["input"] - logger = logging.getLogger(__name__) - logger.info(req) + # logger = logging.getLogger(__name__) + # logger.info(req) print(req) nonce = random.randint( 0, sys.maxsize, ) - logger.info(nonce) + # logger.info(nonce) print(nonce) proof = gen_email_auth_proof(str(nonce), False, input) - logger.info(proof) + # logger.info(proof) print(proof) return jsonify(proof) diff --git a/packages/relayer/.env.example b/packages/relayer/.env.example deleted file mode 100644 index fe8fd1be..00000000 --- a/packages/relayer/.env.example +++ /dev/null @@ -1,21 +0,0 @@ -EMAIL_ACCOUNT_RECOVERY_VERSION_ID= # Version ID of the email account recovery. -PRIVATE_KEY= # Private key for Relayer's account. -CHAIN_RPC_PROVIDER=http://127.0.0.1:8545 -CHAIN_RPC_EXPLORER= -CHAIN_ID=11155111 # Chain ID of the testnet. - -SMTP_SERVER= - -PROVER_ADDRESS="https://zkemail--email-auth-prover-v1-0-4-flask-app.modal.run" - -DATABASE_URL= "postgres://test@localhost/emailauth_test" -RELAYER_EMAIL_ADDR= -WEB_SERVER_ADDRESS="127.0.0.1:4500" -CIRCUITS_DIR_PATH= #Path to email-wallet/packages/circuits -EMAIL_TEMPLATES_PATH= #Path to email templates, e.g. ./packages/relayer/eml_templates/ - -CANISTER_ID="q7eci-dyaaa-aaaak-qdbia-cai" -PEM_PATH="./.ic.pem" -IC_REPLICA_URL="https://a4gq6-oaaaa-aaaab-qaa4q-cai.raw.icp0.io/?id=q7eci-dyaaa-aaaak-qdbia-cai" - -JSON_LOGGER=false \ No newline at end of file diff --git a/packages/relayer/CODING_GUIDELINES.md b/packages/relayer/CODING_GUIDELINES.md new file mode 100644 index 00000000..93043ca2 --- /dev/null +++ b/packages/relayer/CODING_GUIDELINES.md @@ -0,0 +1,98 @@ +# Coding Guidelines for Relayer + +This document outlines the coding guidelines for contributing to the Relayer. Following these guidelines will help maintain a consistent and high-quality codebase. + +## 1. Code Formatting + +- **Tool**: Use `rustfmt` to automatically format your code. Ensure that all code is formatted before committing. Run `cargo fmt` to format your code according to the project's style guidelines. +- **Indentation**: Use 4 spaces per indentation level. Do not use tabs. +- **Line Length**: Aim to keep lines under 100 characters, but it's not a strict rule. Use your judgment to ensure readability. +- **Imports**: Group imports into four sections: `extern crate`, `use`, `use crate`, and `use super`. + - Example: + ```rust + extern crate serde; + + use std::collections::HashMap; + use std::io::{self, Read}; + + use crate::utils::config; + + use super::super::common::logger; + ``` +- **Braces**: Use the Allman style for braces, where the opening brace is on the same line as the function signature. + - Example: + ```rust + fn main() { + // function body + } + ``` +- **Comments**: Use `//` for single-line comments and `/* ... */` for multi-line comments. +- **Whitespace**: Use a single space after commas and colons, and no space before commas and colons. + - Example: + ```rust + let numbers = vec![1, 2, 3]; + let user = User { name: "Alice", age: 30 }; + ``` +- **Function Length**: Aim to keep functions short and focused. If a function is too long, consider breaking it up into smaller functions. +- **Code Duplication**: Avoid duplicating code. If you find yourself copying and pasting code, consider refactoring it into a shared function or module. +- **No warnings**: Ensure that your code compiles without warnings. Fix any warnings before committing. + +## 2. Code Linting + +- **Tool**: Use `cargo clippy` to lint your code and catch common mistakes and improve your Rust code. Run `cargo clippy` before committing your code to ensure it adheres to Rust's best practices and the project's specific requirements. +- **Handling Lints**: Address all warnings and errors reported by `clippy`. If you must ignore a lint, use `#[allow(clippy::lint_name)]` and provide a comment explaining why. + +## 3. Naming Conventions + +- **Variables and Functions**: Use `snake_case`. + - Example: `let user_name = "Alice";` +- **Structs and Enums**: Use `PascalCase`. + - Example: `struct UserAccount { ... }` +- **Constants**: Use `UPPER_SNAKE_CASE`. + - Example: `const MAX_USERS: u32 = 100;` +- **Module Names**: Use `snake_case`. + - Example: `mod user_account;` + +## 4. Documentation + +- **Public Items**: All public functions, structs, and modules must have documentation comments using `///`. + - Example: + ```rust + /// Creates a new user account. + /// + /// # Arguments + /// + /// * `name` - The name of the user. + /// + /// # Returns + /// + /// A `UserAccount` struct. + pub fn create_user_account(name: &str) -> UserAccount { + // function body + } + ``` +- **Private Items**: Document private items where the intent or functionality is not immediately clear. +- **Module Documentation**: Each module should have a comment at the top explaining its purpose. + - Example: + ```rust + //! This module contains utility functions for user management. + + // module contents + ``` + +## 5. Error Handling + +- **Use of `Result` and `Option`**: + - Use `Result` for operations that can fail and `Option` for values that may or may not be present. + - Example: + ```rust + fn find_user(id: u32) -> Option
+
+
|
+
+
+
|
+
+
+
|
+
+
+
|
+
| - |
-
-
-
- |
- - |
- 
- 
- 
- | - |
-
-
-
-
|
- - |
| - | - - | -- |
- | - |
-
-
-
-
|
- - |
| - | - - | -- |
| - |
-
-
-
-
|
- - |
| - | - - | -- |
| - |
-
-
-
-
|
- - |
| - |
-
-
-
-
|
- - |