From b440ac002fba085db7e806336a6a7ebd7dcf300f Mon Sep 17 00:00:00 2001 From: Saleel Date: Thu, 5 Oct 2023 10:12:42 +0530 Subject: [PATCH] chore: rebuild circuit and redeploy --- packages/helpers/src/zkp.ts | 2 +- packages/twitter-verifier-app/.env | 2 +- .../contracts/verifier.sol | 8 +- .../twitter-verifier-circuits/package.json | 2 +- .../src/Groth16VerifierTwitter.sol | 8 +- .../src/test/TestTwitter.t.sol | 32 ++--- yarn.lock | 109 +++++++++++++++++- 7 files changed, 134 insertions(+), 29 deletions(-) diff --git a/packages/helpers/src/zkp.ts b/packages/helpers/src/zkp.ts index e368ba9..f516d51 100644 --- a/packages/helpers/src/zkp.ts +++ b/packages/helpers/src/zkp.ts @@ -5,7 +5,7 @@ import { uncompressGz as uncompress } from "./uncompress"; // @ts-ignore import * as snarkjs from "snarkjs"; -export const loadURL = "https://twitter-verifier-zkeys.s3.amazonaws.com/c36f251befdaab2ea9a082ca25f55ff534b3df25/"; +export const loadURL = "https://twitter-verifier-zkeys.s3.amazonaws.com/751fae9012c8a36543f60a2d2ec528d088ed6df0/"; // export const loadURL = "http://localhost:3001/"; const compressed = true; // const loadURL = "/zkemail-zkey-chunks/"; diff --git a/packages/twitter-verifier-app/.env b/packages/twitter-verifier-app/.env index 41cfef6..fffafe7 100644 --- a/packages/twitter-verifier-app/.env +++ b/packages/twitter-verifier-app/.env @@ -1 +1 @@ -VITE_CONTRACT_ADDRESS=0xa127bf93568195163F8696Af2DD98a20B92682f7 +VITE_CONTRACT_ADDRESS=0x578dB0f1c7F34ef133216027FCbA09D8753Fbb2A diff --git a/packages/twitter-verifier-circuits/contracts/verifier.sol b/packages/twitter-verifier-circuits/contracts/verifier.sol index 479e7d2..32c7f9a 100644 --- a/packages/twitter-verifier-circuits/contracts/verifier.sol +++ b/packages/twitter-verifier-circuits/contracts/verifier.sol @@ -194,10 +194,10 @@ contract Verifier { 8495653923123431417604973247489272438418190587263600148770280649306958101930] ); vk.delta2 = Pairing.G2Point( - [6948608301720469848926271067353480857221409785570045183346943184020886083835, - 19736533367432115942357061740446963205020803925228233062642724250060250534927], - [215832430551991985695716314084119848284390880887235433427340587156598189194, - 3372415740539128806766956189227626033065668377953998060876942965252478817691] + [5938801666574625047566102233959687460952152363696515606168583822921507389119, + 10918201764747649777782799376622765302845679246108662722964209581764572035297], + [6990274420431404026324684434662820352800238926844941333351340078923202666983, + 6109800108489389215058190689963113905869810537652575151335623354060770121283] ); vk.IC = new Pairing.G1Point[](6); diff --git a/packages/twitter-verifier-circuits/package.json b/packages/twitter-verifier-circuits/package.json index cb30d69..923aa98 100644 --- a/packages/twitter-verifier-circuits/package.json +++ b/packages/twitter-verifier-circuits/package.json @@ -8,7 +8,7 @@ "@zk-email/circuits": "workspace:^", "@zk-email/helpers": "workspace:^", "big-integer": "^1.6.51", - "snarkjs": "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e" + "snarkjs": "git+https://github.com/vb7401/snarkjs.git#24981febe8826b6ab76ae4d76cf7f9142919d2b8" }, "devDependencies": { "chai": "^4.3.7", diff --git a/packages/twitter-verifier-contracts/src/Groth16VerifierTwitter.sol b/packages/twitter-verifier-contracts/src/Groth16VerifierTwitter.sol index 38a08d8..0ac2e5d 100644 --- a/packages/twitter-verifier-contracts/src/Groth16VerifierTwitter.sol +++ b/packages/twitter-verifier-contracts/src/Groth16VerifierTwitter.sol @@ -194,10 +194,10 @@ contract Verifier { 8495653923123431417604973247489272438418190587263600148770280649306958101930] ); vk.delta2 = Pairing.G2Point( - [6948608301720469848926271067353480857221409785570045183346943184020886083835, - 19736533367432115942357061740446963205020803925228233062642724250060250534927], - [215832430551991985695716314084119848284390880887235433427340587156598189194, - 3372415740539128806766956189227626033065668377953998060876942965252478817691] + [5938801666574625047566102233959687460952152363696515606168583822921507389119, + 10918201764747649777782799376622765302845679246108662722964209581764572035297], + [6990274420431404026324684434662820352800238926844941333351340078923202666983, + 6109800108489389215058190689963113905869810537652575151335623354060770121283] ); vk.IC = new Pairing.G1Point[](6); diff --git a/packages/twitter-verifier-contracts/src/test/TestTwitter.t.sol b/packages/twitter-verifier-contracts/src/test/TestTwitter.t.sol index 78f8745..c63a2d1 100644 --- a/packages/twitter-verifier-contracts/src/test/TestTwitter.t.sol +++ b/packages/twitter-verifier-contracts/src/test/TestTwitter.t.sol @@ -72,23 +72,23 @@ contract TwitterUtilsTest is Test { publicSignals[4] = 0; uint256[2] memory proof_a = [ - 3649334755569831907195520428833223867325566261927662850697457548576548541399, - 20499460910231109259355812649801775326681878390015543064856133800701501255403 + 6404912094438959771270170015708692679163975170331123763947869280533330020948, + 16431746252867738581190734044362323467317260581534469863954001717354720033449 ]; // Note: you need to swap the order of the two elements in each subarray uint256[2][2] memory proof_b = [ [ - 18350509772374090875478186427591896475635971401417632667703989186821213732907, - 20920114183638997246250474302534489120211558454058706857869471742330436930623 + 8795231851098125041774532684066622968473503351895932688930282151189868525269, + 8400965518420081537874913758124060525192033588615011110881123763850464376004 ], [ - 20833324547309395598049634278012419609902774577170241984625358609703786913471, - 4785607205750561958206192558685274396831815058929208114308096742945548253150 + 1261603040832110057103451457904097254368501842246415202852613834792443845304, + 13121771595022702619727734608109555365032821396670202768909783661374406380222 ] ]; uint256[2] memory proof_c = [ - 18541471899472993603764612117992065692236194406154776508711447996685912128129, - 18293183002901335551240602175803470788428633072792368323293246337532330600419 + 16050409289279435737057519079981506516910719341869168962865371387104118882619, + 18176072645632006430426495213203541931818956668410385812518837732883642216531 ]; uint256[8] memory proof = [ @@ -124,23 +124,23 @@ contract TwitterUtilsTest is Test { // TODO switch order uint256[2] memory proof_a = [ - 19817492339401278465118121019448349479859144740707433510837170782894149706567, - 15749628588921306470037688834174003557365460195275885180096519684182988993851 + 16235597139600534219471648014557261007889045173822970670513181240240086214174, + 6621518204030293388915371133361934397921786415041615077394701602185030032541 ]; // Note: you need to swap the order of the two elements in each subarray uint256[2][2] memory proof_b = [ [ - 9445954524163501509323374709856803201722448233533184553724049008118035508127, - 142095833772938065131103402668070554947744431473673314140149330287323466706 + 6161412334642964861189612033303217945413875036507487954316771559158415662599, + 6394243861551970426687159580195338783768207351061112276435055148070946593649 ], [ - 18208536814044026568200697428816501374520119192737872922858886575185380278853, - 7254444262876114770206692341372538312518785956834239213367767335479093449856 + 10941698291835179415420256896712218454699332411237939219040895798597821967702, + 7728456040917771404709714590797935142996631885733167964164791489962500861862 ] ]; uint256[2] memory proof_c = [ - 3882923767928427172202563836745259073814708409183251252709845187636427784165, - 7429146966844533533925641512762548303501115923920311043478436173514135368876 + 14259974788240734152903966067523528600222540226580955926764767170021226788296, + 21676216180115608963745703352692727568438367369380511035841665454472016757320 ]; uint256[8] memory proof = [ diff --git a/yarn.lock b/yarn.lock index 55d7be7..58a5002 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2426,6 +2426,16 @@ __metadata: languageName: node linkType: hard +"@iden3/binfileutils@npm:0.0.10": + version: 0.0.10 + resolution: "@iden3/binfileutils@npm:0.0.10" + dependencies: + fastfile: 0.0.19 + ffjavascript: ^0.2.48 + checksum: cdeb8ac01e12f485d9fb236654c00d5d5016fc89eae24f7822885dd42f09935cbef601dbdd8a0c96dfb00ded9f4f623e0eec0b568aa86d16522cf77ce6f9498b + languageName: node + linkType: hard + "@iden3/binfileutils@npm:0.0.11": version: 0.0.11 resolution: "@iden3/binfileutils@npm:0.0.11" @@ -3629,7 +3639,7 @@ __metadata: ffjavascript: ^0.2.59 jest: ^29.5.0 mocha: ^10.2.0 - snarkjs: "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e" + snarkjs: "git+https://github.com/vb7401/snarkjs.git#24981febe8826b6ab76ae4d76cf7f9142919d2b8" languageName: unknown linkType: soft @@ -5558,7 +5568,7 @@ __metadata: languageName: node linkType: hard -"big-integer@npm:^1.6.51": +"big-integer@npm:^1.6.42, big-integer@npm:^1.6.48, big-integer@npm:^1.6.51": version: 1.6.51 resolution: "big-integer@npm:1.6.51" checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518 @@ -5650,6 +5660,13 @@ __metadata: languageName: node linkType: hard +"blakejs@npm:^1.1.0": + version: 1.2.1 + resolution: "blakejs@npm:1.2.1" + checksum: d699ba116cfa21d0b01d12014a03e484dd76d483133e6dc9eb415aa70a119f08beb3bcefb8c71840106a00b542cba77383f8be60cd1f0d4589cb8afb922eefbe + languageName: node + linkType: hard + "bluebird@npm:^3.5.5": version: 3.7.2 resolution: "bluebird@npm:3.7.2" @@ -6337,6 +6354,17 @@ __metadata: languageName: node linkType: hard +"circom_runtime@npm:0.1.17": + version: 0.1.17 + resolution: "circom_runtime@npm:0.1.17" + dependencies: + ffjavascript: 0.2.48 + bin: + calcwit: calcwit.js + checksum: 595fc0cc3a62ba5daf8d849feae41c48805c0df43965f85dde4dc434efb607e455fa7801d41c1feacfe0c3c71952a45cd3985abf26fde40c54138392891afd8c + languageName: node + linkType: hard + "circom_runtime@npm:0.1.21": version: 0.1.21 resolution: "circom_runtime@npm:0.1.21" @@ -8453,6 +8481,13 @@ __metadata: languageName: node linkType: hard +"fastfile@npm:0.0.19, fastfile@npm:^0.0.19": + version: 0.0.19 + resolution: "fastfile@npm:0.0.19" + checksum: 6179bdd7c21be9882294dae66103795c099594098b51958bcf08a4545c91387321b43511730d0542a5a9ed8c5ec9069c065e065fd67255453ac900a23895dac1 + languageName: node + linkType: hard + "fastfile@npm:0.0.20": version: 0.0.20 resolution: "fastfile@npm:0.0.20" @@ -8494,6 +8529,18 @@ __metadata: languageName: node linkType: hard +"ffjavascript@npm:0.2.48": + version: 0.2.48 + resolution: "ffjavascript@npm:0.2.48" + dependencies: + big-integer: ^1.6.48 + wasmbuilder: ^0.0.12 + wasmcurves: 0.1.0 + web-worker: ^1.2.0 + checksum: 68beae9a4f642c06656685353b84fd7655020ca0e628ea046e94452ab779587953cc45cde106d74b68be7177b49c8f19b105d6552c4a1d715e784ae9e7c9ed34 + languageName: node + linkType: hard + "ffjavascript@npm:0.2.56": version: 0.2.56 resolution: "ffjavascript@npm:0.2.56" @@ -13454,6 +13501,18 @@ __metadata: languageName: node linkType: hard +"r1csfile@npm:0.0.35": + version: 0.0.35 + resolution: "r1csfile@npm:0.0.35" + dependencies: + "@iden3/bigarray": 0.0.2 + "@iden3/binfileutils": 0.0.10 + fastfile: 0.0.19 + ffjavascript: 0.2.48 + checksum: 84f7b4eab5bcdd6a3f6d699998c9479a5eff8d670383d4f0c5afc08431f45353abab9a8b07eeabaef89807e24b0ba50611d4d6280eb6c3a7483e1487a91f0ac6 + languageName: node + linkType: hard + "r1csfile@npm:0.0.41, r1csfile@npm:^0.0.41": version: 0.0.41 resolution: "r1csfile@npm:0.0.41" @@ -13727,6 +13786,13 @@ __metadata: languageName: node linkType: hard +"readline@npm:^1.3.0": + version: 1.3.0 + resolution: "readline@npm:1.3.0" + checksum: dfaf8e6ac20408ea00d650e95f7bb47f77c4c62dd12ed7fb51731ee84532a2f3675fcdc4cab4923dc1eef227520a2e082a093215190907758bea9f585b19438e + languageName: node + linkType: hard + "real-require@npm:^0.1.0": version: 0.1.0 resolution: "real-require@npm:0.1.0" @@ -14517,6 +14583,26 @@ __metadata: languageName: node linkType: hard +"snarkjs@git+https://github.com/vb7401/snarkjs.git#24981febe8826b6ab76ae4d76cf7f9142919d2b8": + version: 0.4.12 + resolution: "snarkjs@https://github.com/vb7401/snarkjs.git#commit=24981febe8826b6ab76ae4d76cf7f9142919d2b8" + dependencies: + "@iden3/binfileutils": 0.0.10 + blake2b-wasm: ^2.4.0 + circom_runtime: 0.1.17 + ejs: ^3.1.6 + fastfile: ^0.0.19 + ffjavascript: 0.2.48 + js-sha3: ^0.8.0 + logplease: ^1.2.15 + r1csfile: 0.0.35 + readline: ^1.3.0 + bin: + snarkjs: build/cli.cjs + checksum: 9011df4b58475a0b4ae988f8b459a9a4d2bb5d2b60221d0ec370a10f2492c88909768215f3b22e514b2cf24dca79818790447005a33ed6aee177b9fda6948a75 + 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" @@ -16206,6 +16292,25 @@ __metadata: languageName: node linkType: hard +"wasmbuilder@npm:^0.0.12": + version: 0.0.12 + resolution: "wasmbuilder@npm:0.0.12" + dependencies: + big-integer: ^1.6.48 + checksum: 327b3c50b0e1e5e3aac9e218e0f96fdc638b7952ab86acc2ad53960371996826dbb0a8095edce482cf1d9c245d96884449701909bc962920aa7ec8241db01214 + languageName: node + linkType: hard + +"wasmcurves@npm:0.1.0": + version: 0.1.0 + resolution: "wasmcurves@npm:0.1.0" + dependencies: + big-integer: ^1.6.42 + blakejs: ^1.1.0 + checksum: 6bf6719e659a88904af0b98d152316e3b22435ca6a2cfc8bbf4530576806f17b2776b2c7d91d1a678fe0d51485a0d1748efcd080808c181c7977bee50b26efa9 + languageName: node + linkType: hard + "wasmcurves@npm:0.2.0": version: 0.2.0 resolution: "wasmcurves@npm:0.2.0"