Skip to content

Commit

Permalink
Modify tests and remove unused files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SoraSuegami
SoraSuegami committed May 14, 2024
1 parent 2306857 commit f385439
Show file tree
Hide file tree
Showing 32 changed files with 932 additions and 3,071 deletions.
129 changes: 46 additions & 83 deletions packages/circom/circuits/common/email_addr_regex.circom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ template EmailAddrRegex(msg_bytes) {
in[i+1] <== msg[i];
}

component eq[24][num_bytes];
component lt[8][num_bytes];
component and[9][num_bytes];
component multi_or[4][num_bytes];
component eq[23][num_bytes];
component lt[6][num_bytes];
component and[8][num_bytes];
component multi_or[3][num_bytes];
signal states[num_bytes+1][4];
signal states_tmp[num_bytes+1][4];
signal from_zero_enabled[num_bytes+1];
Expand All @@ -41,7 +41,7 @@ template EmailAddrRegex(msg_bytes) {
and[0][i].a <== lt[0][i].out;
and[0][i].b <== lt[1][i].out;
lt[2][i] = LessEqThan(8);
lt[2][i].in[0] <== 95;
lt[2][i].in[0] <== 94;
lt[2][i].in[1] <== in[i];
lt[3][i] = LessEqThan(8);
lt[3][i].in[0] <== in[i];
Expand Down Expand Up @@ -112,12 +112,9 @@ template EmailAddrRegex(msg_bytes) {
eq[20][i] = IsEqual();
eq[20][i].in[0] <== in[i];
eq[20][i].in[1] <== 63;
eq[21][i] = IsEqual();
eq[21][i].in[0] <== in[i];
eq[21][i].in[1] <== 255;
and[2][i] = AND();
and[2][i].a <== states[i][0];
multi_or[0][i] = MultiOR(24);
multi_or[0][i] = MultiOR(23);
multi_or[0][i].in[0] <== and[0][i].out;
multi_or[0][i].in[1] <== and[1][i].out;
multi_or[0][i].in[2] <== eq[0][i].out;
Expand All @@ -141,89 +138,55 @@ template EmailAddrRegex(msg_bytes) {
multi_or[0][i].in[20] <== eq[18][i].out;
multi_or[0][i].in[21] <== eq[19][i].out;
multi_or[0][i].in[22] <== eq[20][i].out;
multi_or[0][i].in[23] <== eq[21][i].out;
and[2][i].b <== multi_or[0][i].out;
and[3][i] = AND();
and[3][i].a <== states[i][1];
and[3][i].b <== multi_or[0][i].out;
states_tmp[i+1][1] <== and[3][i].out;
eq[21][i] = IsEqual();
eq[21][i].in[0] <== in[i];
eq[21][i].in[1] <== 64;
and[4][i] = AND();
and[4][i].a <== states[i][1];
and[4][i].b <== eq[21][i].out;
states[i+1][2] <== and[4][i].out;
lt[4][i] = LessEqThan(8);
lt[4][i].in[0] <== 94;
lt[4][i].in[0] <== 97;
lt[4][i].in[1] <== in[i];
lt[5][i] = LessEqThan(8);
lt[5][i].in[0] <== in[i];
lt[5][i].in[1] <== 126;
and[3][i] = AND();
and[3][i].a <== lt[4][i].out;
and[3][i].b <== lt[5][i].out;
and[4][i] = AND();
and[4][i].a <== states[i][1];
multi_or[1][i] = MultiOR(23);
multi_or[1][i].in[0] <== and[0][i].out;
multi_or[1][i].in[1] <== and[3][i].out;
multi_or[1][i].in[2] <== eq[0][i].out;
multi_or[1][i].in[3] <== eq[1][i].out;
multi_or[1][i].in[4] <== eq[2][i].out;
multi_or[1][i].in[5] <== eq[3][i].out;
multi_or[1][i].in[6] <== eq[4][i].out;
multi_or[1][i].in[7] <== eq[5][i].out;
multi_or[1][i].in[8] <== eq[6][i].out;
multi_or[1][i].in[9] <== eq[7][i].out;
multi_or[1][i].in[10] <== eq[8][i].out;
multi_or[1][i].in[11] <== eq[9][i].out;
multi_or[1][i].in[12] <== eq[10][i].out;
multi_or[1][i].in[13] <== eq[11][i].out;
multi_or[1][i].in[14] <== eq[12][i].out;
multi_or[1][i].in[15] <== eq[13][i].out;
multi_or[1][i].in[16] <== eq[14][i].out;
multi_or[1][i].in[17] <== eq[15][i].out;
multi_or[1][i].in[18] <== eq[16][i].out;
multi_or[1][i].in[19] <== eq[17][i].out;
multi_or[1][i].in[20] <== eq[18][i].out;
multi_or[1][i].in[21] <== eq[19][i].out;
multi_or[1][i].in[22] <== eq[20][i].out;
and[4][i].b <== multi_or[1][i].out;
states_tmp[i+1][1] <== and[4][i].out;
lt[5][i].in[1] <== 122;
and[5][i] = AND();
and[5][i].a <== lt[4][i].out;
and[5][i].b <== lt[5][i].out;
eq[22][i] = IsEqual();
eq[22][i].in[0] <== in[i];
eq[22][i].in[1] <== 64;
and[5][i] = AND();
and[5][i].a <== states[i][1];
and[5][i].b <== eq[22][i].out;
states[i+1][2] <== and[5][i].out;
lt[6][i] = LessEqThan(8);
lt[6][i].in[0] <== 97;
lt[6][i].in[1] <== in[i];
lt[7][i] = LessEqThan(8);
lt[7][i].in[0] <== in[i];
lt[7][i].in[1] <== 122;
eq[22][i].in[1] <== 45;
and[6][i] = AND();
and[6][i].a <== lt[6][i].out;
and[6][i].b <== lt[7][i].out;
eq[23][i] = IsEqual();
eq[23][i].in[0] <== in[i];
eq[23][i].in[1] <== 45;
and[6][i].a <== states[i][2];
multi_or[1][i] = MultiOR(14);
multi_or[1][i].in[0] <== and[0][i].out;
multi_or[1][i].in[1] <== and[5][i].out;
multi_or[1][i].in[2] <== eq[22][i].out;
multi_or[1][i].in[3] <== eq[8][i].out;
multi_or[1][i].in[4] <== eq[9][i].out;
multi_or[1][i].in[5] <== eq[10][i].out;
multi_or[1][i].in[6] <== eq[11][i].out;
multi_or[1][i].in[7] <== eq[12][i].out;
multi_or[1][i].in[8] <== eq[13][i].out;
multi_or[1][i].in[9] <== eq[14][i].out;
multi_or[1][i].in[10] <== eq[15][i].out;
multi_or[1][i].in[11] <== eq[16][i].out;
multi_or[1][i].in[12] <== eq[17][i].out;
multi_or[1][i].in[13] <== eq[18][i].out;
and[6][i].b <== multi_or[1][i].out;
and[7][i] = AND();
and[7][i].a <== states[i][2];
multi_or[2][i] = MultiOR(14);
multi_or[2][i].in[0] <== and[0][i].out;
multi_or[2][i].in[1] <== and[6][i].out;
multi_or[2][i].in[2] <== eq[23][i].out;
multi_or[2][i].in[3] <== eq[8][i].out;
multi_or[2][i].in[4] <== eq[9][i].out;
multi_or[2][i].in[5] <== eq[10][i].out;
multi_or[2][i].in[6] <== eq[11][i].out;
multi_or[2][i].in[7] <== eq[12][i].out;
multi_or[2][i].in[8] <== eq[13][i].out;
multi_or[2][i].in[9] <== eq[14][i].out;
multi_or[2][i].in[10] <== eq[15][i].out;
multi_or[2][i].in[11] <== eq[16][i].out;
multi_or[2][i].in[12] <== eq[17][i].out;
multi_or[2][i].in[13] <== eq[18][i].out;
and[7][i].b <== multi_or[2][i].out;
and[8][i] = AND();
and[8][i].a <== states[i][3];
and[8][i].b <== multi_or[2][i].out;
multi_or[3][i] = MultiOR(2);
multi_or[3][i].in[0] <== and[7][i].out;
multi_or[3][i].in[1] <== and[8][i].out;
states[i+1][3] <== multi_or[3][i].out;
and[7][i].a <== states[i][3];
and[7][i].b <== multi_or[1][i].out;
multi_or[2][i] = MultiOR(2);
multi_or[2][i].in[0] <== and[6][i].out;
multi_or[2][i].in[1] <== and[7][i].out;
states[i+1][3] <== multi_or[2][i].out;
from_zero_enabled[i] <== MultiNOR(3)([states_tmp[i+1][1], states[i+1][2], states[i+1][3]]);
states[i+1][1] <== MultiOR(2)([states_tmp[i+1][1], from_zero_enabled[i] * and[2][i].out]);
state_changed[i].in[0] <== states[i+1][1];
Expand Down
Loading

0 comments on commit f385439

Please sign in to comment.