Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow patterns to have only private reveals #49

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −15
Open

Allow patterns to have only private reveals #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41fe5a0
fix: update template to handle no reveals
javiersuweijie Oct 17, 2024
893d7e8
fix: contract gen to support no reveals
javiersuweijie Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions packages/app/src/lib/code-gen/templates/zkemail_example/circuit/<%- name %>.circom.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,30 @@ template <%- name %>(maxHeaderLength, maxBodyLength, n, k, packSize) {

<% values.forEach(function(value){ %>
// <%- value.name.toUpperCase() %> Extraction
signal input <%- value.name %>RegexIdx;
var <%- value.name %>MaxLength = <%- value.maxLength %>;
signal <%- value.name %>RegexOut, <%- value.name %>RegexReveal[<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>];
<% if (["from", "to"].includes(value.location)) { %>
<% // Custom regex circuit to extract from and to%>
signal <%- value.name %>RegexOut, <%- value.name %>RegexReveal[<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>];
(<%- value.name %>RegexOut, <%- value.name %>RegexReveal) <== <%- value.location === 'to' ? 'ToAddrRegex' : 'FromAddrRegex' %>(maxHeaderLength)(emailHeader);
<%- value.name %>RegexOut === 1;
signal output <%- value.name %>PackedOut[computeIntChunkLength(<%- value.name %>MaxLength)];
<%- value.name %>PackedOut <== PackRegexReveal(<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>, <%- value.name %>MaxLength)(<%- value.name %>RegexReveal, <%- value.name %>RegexIdx);
<% } else { %>
<% if (value.parts.find(a => a.is_public)) { %>
<% // Handle case when regex have a public reveal%>
signal <%- value.name %>RegexOut, <%- value.name %>RegexReveal[<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>];
signal input <%- value.name %>RegexIdx;
(<%- value.name %>RegexOut, <%- value.name %>RegexReveal) <== <%- value.name %>Regex(<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>)(<%- (value.location === 'body') ? 'emailBody' : 'emailHeader' %>);
<% } %>
<%- value.name %>RegexOut === 1;

signal output <%- value.name %>PackedOut[computeIntChunkLength(<%- value.name %>MaxLength)];
<%- value.name %>PackedOut <== PackRegexReveal(<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>, <%- value.name %>MaxLength)(<%- value.name %>RegexReveal, <%- value.name %>RegexIdx);
<% } else { %>
<% // Handle case when regex have no public reveal%>
signal <%- value.name %>RegexOut;
<%- value.name %>RegexOut <== <%- value.name %>Regex(<%- (value.location === 'body') ? 'maxBodyLength' : 'maxHeaderLength' %>)(<%- (value.location === 'body') ? 'emailBody' : 'emailHeader' %>);
<%- value.name %>RegexOut === 1;
<% } %>
<% } %>
<% }); %>

}
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/lib/code-gen/templates/zkemail_example/contract/src/contract.sol.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ contract Contract is Ownable {
uint16 public constant pack_size = 31;
uint16 public constant pubkey_hash_len = 1;
string public constant domain = "<%- senderDomain %>";
<% let signal_size = 1; values.forEach(function(value) { const packSize = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0) %>
<% let signal_size = 1; values.filter(v => v.parts.find(a => a.is_public)).forEach(function(value) { const packSize = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0) %>
uint16 public constant <%- value.name %>_len = <%- packSize %>;<% signal_size += packSize;}) %>

<% externalInputs.forEach(function(value) { const packSize = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0) %>
Expand All @@ -38,7 +38,7 @@ contract Contract is Ownable {
// verify RSA
bytes32 ph = bytes32(signals[0]);
require(dkimRegistry.isDKIMPublicKeyHashValid(domain, ph), "RSA public key incorrect");
<% let cur_idx = 1; values.forEach(function(value) { %>
<% let cur_idx = 1; values.filter(v => v.parts.find(a => a.is_public)).forEach(function(value) { %>
// unpack <%- value.name %>
uint[] memory packed_<%- value.name %> = new uint[](<%- value.name %>_len);
for (uint i = 0; i < <%- value.name %>_len; i++) {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/lib/code-gen/templates/zkemail_example/contract/src/verifier.sol.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pragma solidity >=0.7.0 <0.9.0;

contract Groth16Verifier {

<% let cur_idx = 1; values.forEach(function(value) { const packSize = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0); cur_idx += packSize; });%>
<% let cur_idx = 1; values.filter(v => v.parts.find(a => a.is_public)).forEach(function(value) { const packSize = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0); cur_idx += packSize; });%>
<% externalInputs.forEach(function(value) { const packSize = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0); cur_idx += packSize; });%>
function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[<%-cur_idx%>] calldata _pubSignals) public view returns (bool) {
// verification code will only be filled after the circuit proving keys are generated
Expand Down
3 changes: 2 additions & 1 deletion packages/app/src/lib/code-gen/templates/zkemail_example/index.ts.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@ try {

let currentIndex = 2;
<% values.forEach(function(value) { %>
<% if (value.parts.find(a => a.is_public)) { // skip output unpacking when there isn't going to be an output%>
{
const packedLength = <%- Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0) %>
const packedValue = witness.slice(currentIndex, currentIndex + packedLength);
const unpackedValue = packedNBytesToString(packedValue);
console.log("<%- value.name %>: ", unpackedValue);
currentIndex += packedLength;
}
<% }) %>
<% }}) %>

<% externalInputs.forEach(function(input) { %>
{
Expand Down
16 changes: 9 additions & 7 deletions packages/app/src/lib/contract/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,15 @@ export const parseOutput = (entry: Entry, output: string[]) => {
return result;
}
for (const value of (entry.parameters as any).values || []) {
const packLength = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0);
const data = output.slice(i, i+packLength);
const unpackedValue = packedNBytesToString(data.map(BigInt)).replaceAll('\u0000', '');
i += packLength;
result = {
...result,
[value.name]: unpackedValue
if (value.parts.find((a: {is_public: boolean}) => a.is_public)) {
const packLength = Math.floor(value.maxLength / 31) + (value.maxLength % 31 ? 1 : 0);
const data = output.slice(i, i+packLength);
const unpackedValue = packedNBytesToString(data.map(BigInt)).replaceAll('\u0000', '');
i += packLength;
result = {
...result,
[value.name]: unpackedValue
}
}
}
for (const value of (entry.parameters as any).externalInputs || []) {
Expand Down
Loading