From 946bd4725e6c2a108602d040a3fd261736ec68ab Mon Sep 17 00:00:00 2001 From: Divide-By-0 Date: Thu, 8 Jun 2023 14:49:11 -0400 Subject: [PATCH] e2e passes --- package.json | 2 +- src/pages/MainPage.tsx | 9 ++--- src/scripts/generate_input.ts | 3 +- yarn.lock | 68 ++++++++++++----------------------- 4 files changed, 28 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 5d49889..845b47e 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "react-use": "^17.3.2", "readline": "^1.3.0", "serve": "^14.0.1", - "snarkjs": "latest", + "snarkjs": "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e", "sshpk": "^1.17.0", "styled-components": "^5.3.5", "ts-node": "^10.9.1", diff --git a/src/pages/MainPage.tsx b/src/pages/MainPage.tsx index aa57b6c..f55b0fc 100644 --- a/src/pages/MainPage.tsx +++ b/src/pages/MainPage.tsx @@ -5,7 +5,7 @@ import { useAsync, useMount, useUpdateEffect } from "react-use"; // @ts-ignore import _, { add } from "lodash"; // @ts-ignore -import { generate_inputs, insert13Before10 } from "../scripts/generate_input"; +import { generate_inputs, insert13Before10, CircuitType } from "../scripts/generate_input"; import styled, { CSSProperties } from "styled-components"; import { sshSignatureToPubKey } from "../helpers/sshFormat"; import { Link, useSearchParams } from "react-router-dom"; @@ -24,11 +24,8 @@ import { useAccount, useContractWrite, usePrepareContractWrite } from "wagmi"; import { ProgressBar } from "../components/ProgressBar"; import { abi } from "../helpers/twitterEmailHandler.abi"; import { isSetIterator } from "util/types"; -import { CircuitType } from "../scripts/generate_input"; var Buffer = require("buffer/").Buffer; // note: the trailing slash is important! -const generate_input = require("../scripts/generate_input"); - export const MainPage: React.FC<{}> = (props) => { // raw user inputs const filename = "email"; @@ -265,9 +262,9 @@ export const MainPage: React.FC<{}> = (props) => { console.log("buffFormArray", Buffer.from(formattedArray.buffer)); console.log("buffFormArray", formattedArray.toString()); console.log("ethereumAddress", ethereumAddress); - let input = ""; + let input; try { - input = await generate_input.generate_inputs(Buffer.from(formattedArray.buffer), ethereumAddress, CircuitType.EMAIL_TWITTER); + input = await generate_inputs(Buffer.from(formattedArray.buffer), ethereumAddress, CircuitType.EMAIL_TWITTER); } catch (e) { console.log("Error generating input", e); setDisplayMessage("Prove"); diff --git a/src/scripts/generate_input.ts b/src/scripts/generate_input.ts index 04e1d03..e13f77e 100644 --- a/src/scripts/generate_input.ts +++ b/src/scripts/generate_input.ts @@ -310,12 +310,11 @@ export async function generate_inputs( let message = result.results[0].status.signature_header; let body = result.results[0].body; let body_hash = result.results[0].bodyHash; - let circuitType = CircuitType.EMAIL_SUBJECT; let pubkey = result.results[0].publicKey; const pubKeyData = pki.publicKeyFromPem(pubkey.toString()); let modulus = BigInt(pubKeyData.n.toString()); - let fin_result = await getCircuitInputs(sig, modulus, message, body, body_hash, eth_address, circuitType); + let fin_result = await getCircuitInputs(sig, modulus, message, body, body_hash, eth_address, type); return fin_result.circuitInputs; } diff --git a/yarn.lock b/yarn.lock index 1e1915e..2646870 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6760,17 +6760,6 @@ __metadata: languageName: node linkType: hard -"circom_runtime@npm:0.1.22": - version: 0.1.22 - resolution: "circom_runtime@npm:0.1.22" - dependencies: - ffjavascript: 0.2.57 - bin: - calcwit: calcwit.js - checksum: bf7b2e9f74cd7704ebc45ce686d4df49e58ed09114070a98beaab90e5ff7784d1943468ea3315bd4db638e6a76cda24e8b610aa2cd50be56adb4391e20469366 - languageName: node - linkType: hard - "circom_tester@npm:^0.0.19": version: 0.0.19 resolution: "circom_tester@npm:0.0.19" @@ -9925,7 +9914,7 @@ __metadata: languageName: node linkType: hard -"ffjavascript@npm:0.2.57, ffjavascript@npm:^0.2.45": +"ffjavascript@npm:^0.2.45": version: 0.2.57 resolution: "ffjavascript@npm:0.2.57" dependencies: @@ -16852,18 +16841,6 @@ __metadata: languageName: node linkType: hard -"r1csfile@npm:0.0.45": - version: 0.0.45 - resolution: "r1csfile@npm:0.0.45" - dependencies: - "@iden3/bigarray": 0.0.2 - "@iden3/binfileutils": 0.0.11 - fastfile: 0.0.20 - ffjavascript: 0.2.57 - checksum: ae2d7ab3f2c37640aea2b4f45753d1f2258f5d904a51d7aaff67c32a931c3e90d22d257e8f10752044fa36b3ac31516f60e503f858913a625015b9b05575ba47 - languageName: node - linkType: hard - "raf@npm:^3.4.1": version: 3.4.1 resolution: "raf@npm:3.4.1" @@ -18609,6 +18586,27 @@ __metadata: languageName: node linkType: hard +"snarkjs@https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e": + version: 0.5.0 + resolution: "snarkjs@https://github.com/sampritipanda/snarkjs.git#commit=fef81fc51d17a734637555c6edbd585ecda02d9e" + dependencies: + "@iden3/binfileutils": 0.0.11 + bfj: ^7.0.2 + blake2b-wasm: ^2.4.0 + circom_runtime: 0.1.21 + ejs: ^3.1.6 + fastfile: 0.0.20 + ffjavascript: 0.2.56 + js-sha3: ^0.8.0 + localforage: ^1.10.0 + logplease: ^1.2.15 + r1csfile: 0.0.41 + bin: + snarkjs: build/cli.cjs + checksum: f2050f0135d50d459ea0edddf3e394e833a2d28c6648e5889b2f896814865e5c60606e978a8a106bd5bfe7e27501c315f249db5b71895d5e7e6e9a87bfcd55ab + languageName: node + linkType: hard + "snarkjs@npm:0.5.0": version: 0.5.0 resolution: "snarkjs@npm:0.5.0" @@ -18629,26 +18627,6 @@ __metadata: languageName: node linkType: hard -"snarkjs@npm:latest": - version: 0.6.11 - resolution: "snarkjs@npm:0.6.11" - dependencies: - "@iden3/binfileutils": 0.0.11 - bfj: ^7.0.2 - blake2b-wasm: ^2.4.0 - circom_runtime: 0.1.22 - ejs: ^3.1.6 - fastfile: 0.0.20 - ffjavascript: 0.2.57 - js-sha3: ^0.8.0 - logplease: ^1.2.15 - r1csfile: 0.0.45 - bin: - snarkjs: build/cli.cjs - checksum: 692508b6f8048b6879975844cae4b9a6713713e20fec488ebd21a4b224b7e0318f6aba59ce06d332728d184148c943fa04e3a49e0af173d325011f506e42363e - languageName: node - linkType: hard - "sockjs-client@npm:^1.5.0": version: 1.6.1 resolution: "sockjs-client@npm:1.6.1" @@ -21916,7 +21894,7 @@ __metadata: readline: ^1.3.0 selenium-webdriver: ^4.8.1 serve: ^14.0.1 - snarkjs: latest + snarkjs: "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e" sshpk: ^1.17.0 styled-components: ^5.3.5 ts-node: ^10.9.1