Fix maskedCommand

zkemail · Oct 15, 2024 · 27b1093 · 27b1093
1 parent d967e67
commit 27b1093
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/circuits/scripts/gen-input.ts b/packages/circuits/scripts/gen-input.ts
@@ -58,7 +58,7 @@ async function main() {
 
   const { rawJWT, publicKey } = generateJWT(header, {
     ...payload,
-    nonce: "Send 0.1 ETH to [email protected]",
+    nonce: "Send 0.12 ETH to 0x1234",
   });
 
   const jwtVerifierInputs = await generateJWTVerifierInputs(
@@ -104,7 +104,7 @@ async function main() {
     const fileContent = fs.readFileSync(options.inputFile as string, 'utf-8');
     const jsonData = JSON.parse(fileContent);
     const payload = JSON.stringify({ input: jsonData });
-    const urlObject = new URL("https://zkemail--jwt-prover-v0-1-4-flask-app.modal.run/prove/jwt");
+    const urlObject = new URL("https://zkemail--jwt-prover-v0-1-0-flask-app.modal.run/prove/jwt");
     const reqOptions = {
       hostname: urlObject.hostname,
       path: urlObject.pathname,

diff --git a/packages/contracts/src/utils/JwtVerifier.sol b/packages/contracts/src/utils/JwtVerifier.sol
@@ -66,15 +66,13 @@ contract JwtVerifier is IVerifier, OwnableUpgradeable, UUPSUpgradeable {
         pubSignals[1 + ISS_FIELDS + 2] = uint256(proof.timestamp);
 
         // maskedCommand
-        // TODO Somehow gen-input.ts returns 43113996133614694763028116931624199507
-        // stringFields = _packBytes2Fields(
-        //     bytes(proof.maskedCommand),
-        //     COMMAND_BYTES
-        // );
-        // for (uint256 i = 0; i < COMMAND_FIELDS; i++) {
-        //     pubSignals[1 + ISS_FIELDS + 3 + i] = stringFields[i];
-        // }
-        pubSignals[6] = 43113996133614694763028116931624199507;
+        stringFields = _packBytes2Fields(
+            bytes(proof.maskedCommand),
+            COMMAND_BYTES
+        );
+        for (uint256 i = 0; i < COMMAND_FIELDS; i++) {
+            pubSignals[1 + ISS_FIELDS + 3 + i] = stringFields[i];
+        }
         // accountSalt;
         pubSignals[1 + ISS_FIELDS + 3 + COMMAND_FIELDS] = uint256(
             proof.accountSalt

diff --git a/packages/contracts/test/JwtVerifier/JwtVerifier.t.sol b/packages/contracts/test/JwtVerifier/JwtVerifier.t.sol
@@ -65,7 +65,7 @@ contract JwtVerifierTest_verifyEmailProof is Test {
         // timestamp -> pubSignals[5]
         uint timeStamp = vm.parseUint(pubSignals[5]);
         // maskedCommand -> pubSignals[6] - pubSignals[25]
-        string memory maskedCommand = "Send 0.1 ETH to [email protected]";
+        string memory maskedCommand = "Send 0.12 ETH to 0x1234";
         // accountSalt -> pubSignals[26]
         bytes32 accountSalt = bytes32(vm.parseUint(pubSignals[26]));
         // azp -> pubSignals[27] - pubSignals[29]