|
|
|
|
@ -2,8 +2,7 @@ import { PluginClient } from '@remixproject/plugin' |
|
|
|
|
import { createClient } from '@remixproject/plugin-webview' |
|
|
|
|
import EventManager from 'events' |
|
|
|
|
import pathModule from 'path' |
|
|
|
|
// @ts-ignore
|
|
|
|
|
import { parse, compile, generate_witness, generate_r1cs, compiler_list } from '../../../pkg' |
|
|
|
|
import { parse, compile, generate_witness, generate_r1cs, compiler_list } from 'circom_wasm' |
|
|
|
|
import { extractNameFromKey, extractParentFromKey } from '@remix-ui/helper' |
|
|
|
|
import { CompilationConfig, CompilerReport } from '../types' |
|
|
|
|
|
|
|
|
|
@ -13,8 +12,9 @@ export class CircomPluginClient extends PluginClient { |
|
|
|
|
version: "2.1.5", |
|
|
|
|
prime: "bn128" |
|
|
|
|
} |
|
|
|
|
public lastCompiledCircuitPath: string = '' |
|
|
|
|
public lastParsedFiles: Record<string, string> = {} |
|
|
|
|
private lastCompiledCircuitPath: string = '' |
|
|
|
|
private lastParsedFiles: Record<string, string> = {} |
|
|
|
|
private lastCompiledFile: string = '' |
|
|
|
|
|
|
|
|
|
constructor() { |
|
|
|
|
super() |
|
|
|
|
@ -43,7 +43,6 @@ export class CircomPluginClient extends PluginClient { |
|
|
|
|
this.lastParsedFiles = await this.resolveDependencies(path, fileContent, this.lastParsedFiles) |
|
|
|
|
const parsedOutput = parse(path, this.lastParsedFiles) |
|
|
|
|
|
|
|
|
|
console.log('parsedOutput: ', parsedOutput) |
|
|
|
|
try { |
|
|
|
|
const result: CompilerReport[] = JSON.parse(parsedOutput.report()) |
|
|
|
|
const mapReportFilePathToId = {} |
|
|
|
|
@ -139,6 +138,7 @@ export class CircomPluginClient extends PluginClient { |
|
|
|
|
|
|
|
|
|
throw new Error(circuitErrors) |
|
|
|
|
} else { |
|
|
|
|
this.lastCompiledFile = path |
|
|
|
|
const fileName = extractNameFromKey(path) |
|
|
|
|
|
|
|
|
|
this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'wasm') |
|
|
|
|
@ -156,63 +156,6 @@ export class CircomPluginClient extends PluginClient { |
|
|
|
|
this.internalEvents.emit('circuit_compiling_done', []) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// const witness = await generate_witness(compiledOutput, '{ "identityTrapdoor": "12656283236575022300303467601783819380815431272685589718060054649894766174337", "identityNullifier": "15178877681550417450385541477607788220584140707925739215609273992582659710290", "treePathIndices": "0", "treeSiblings": "1", "externalNullifier": "5df6e0e3480d6fbc32925076897ec6b9b935d75ae8f4d9f4858a426f8f6a4ab": "signalHash": "[85, 139, 239, 32, 221, 194, 165, 19, 20, 52, 104, 144, 41, 16, 40, 204, 171, 245, 198, 77, 94, 143, 30, 112, 105, 165, 33, 15, 62, 156, 18, 118]"}')
|
|
|
|
|
|
|
|
|
|
// const ptau_final = "https://ipfs-cluster.ethdevops.io/ipfs/QmTiT4eiYz5KF7gQrDsgfCSTRv3wBPYJ4bRN1MmTRshpnW";
|
|
|
|
|
// const r1cs_ipfs = "http://127.0.0.1:8081/ipfs/QmVzKPbmyuaTUjoLqWEA5wPAMkUqe4t6WYKHeeC9Dot4ds";
|
|
|
|
|
// const r1cs_ipfs1 = "http://127.0.0.1:8081/ipfs/QmXP1BC2bc8n1zPnexPoRpFCEDoG9QZc3yZn5Wik5w2TAm";
|
|
|
|
|
|
|
|
|
|
// const buff = await fetch(r1cs_ipfs1).then( function(res) {
|
|
|
|
|
// return res.arrayBuffer();
|
|
|
|
|
// }).then(function (ab) {
|
|
|
|
|
// return new Uint8Array(ab);
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
// console.log('r1cs_buff: ', buff)
|
|
|
|
|
// // const wasm = "http://127.0.0.1:8081/ipfs/QmUbpEvHHKaHEqYLjhn93S8rEsUGeqiTYgRjGPk7g8tBbz";
|
|
|
|
|
// const zkey_0 = { type: "mem" };
|
|
|
|
|
// const zkey_1 = { type: "mem" };
|
|
|
|
|
// const zkey_final = { type: "mem" };
|
|
|
|
|
|
|
|
|
|
// console.log('newZkey')
|
|
|
|
|
// // @ts-ignore
|
|
|
|
|
// await snarkjs.zKey.newZKey(r1cs, ptau_final, zkey_0);
|
|
|
|
|
|
|
|
|
|
// console.log('contribute')
|
|
|
|
|
// // @ts-ignore
|
|
|
|
|
// await snarkjs.zKey.contribute(zkey_0, zkey_1, "first_contribution", "entropy_QmbMk4ksBYLQzJ6TiZfzaALF8W11xvB8Wz6a2GrG9oDrXW");
|
|
|
|
|
|
|
|
|
|
// console.log('beacon')
|
|
|
|
|
// // @ts-ignore
|
|
|
|
|
// await snarkjs.zKey.beacon(zkey_1, zkey_final, "B3", "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20", 10);
|
|
|
|
|
|
|
|
|
|
// console.log('verifyFromR1cs')
|
|
|
|
|
// // @ts-ignore
|
|
|
|
|
// const verifyFromR1csResult = await snarkjs.zKey.verifyFromR1cs(r1cs, ptau_final, zkey_final);
|
|
|
|
|
// console.assert(verifyFromR1csResult);
|
|
|
|
|
|
|
|
|
|
// console.log('verifyFromInit')
|
|
|
|
|
// // @ts-ignore
|
|
|
|
|
// const verifyFromInit = await snarkjs.zKey.verifyFromInit(zkey_0, ptau_final, zkey_final);
|
|
|
|
|
// console.assert(verifyFromInit);
|
|
|
|
|
|
|
|
|
|
// console.log('exportVerificationKey')
|
|
|
|
|
// // @ts-ignore
|
|
|
|
|
// const vKey = await snarkjs.zKey.exportVerificationKey(zkey_final)
|
|
|
|
|
|
|
|
|
|
// console.log('vKey: ', vKey)
|
|
|
|
|
|
|
|
|
|
// const templates = {
|
|
|
|
|
// groth16: await remix.call('fileManager', 'readFile', './zk/templates/groth16_verifier.sol.ejs')
|
|
|
|
|
// }
|
|
|
|
|
// const solidityContract = await snarkjs.zKey.exportSolidityVerifier(zkey_final, templates)
|
|
|
|
|
|
|
|
|
|
// await remix.call('fileManager', 'writeFile', './zk/build/zk_verifier.sol', solidityContract)
|
|
|
|
|
|
|
|
|
|
// console.log('buffer', (zkey_final as any).data.length)
|
|
|
|
|
// await remix.call('fileManager', 'writeFile', './zk/build/zk_setup.txt', JSON.stringify(Array.from(((zkey_final as any).data))))
|
|
|
|
|
|
|
|
|
|
// console.log('setup done.')
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
async generateR1cs (path: string, compilationConfig?: CompilationConfig): Promise<void> { |
|
|
|
|
@ -337,4 +280,40 @@ export class CircomPluginClient extends PluginClient { |
|
|
|
|
) |
|
|
|
|
return output |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
async resolveReportPath (path: string): Promise<string> { |
|
|
|
|
// @ts-ignore
|
|
|
|
|
const pathExists = await this.call('fileManager', 'exists', path) |
|
|
|
|
|
|
|
|
|
if (pathExists) return path |
|
|
|
|
else { |
|
|
|
|
// if include import (path) does not exist, try to construct relative path using the original file path (current file opened in editor)
|
|
|
|
|
let relativePath = pathModule.resolve(this.lastCompiledFile.slice(0, this.lastCompiledFile.lastIndexOf('/')), path) |
|
|
|
|
if (relativePath.indexOf('/') === 0) relativePath = relativePath.slice(1) |
|
|
|
|
// @ts-ignore
|
|
|
|
|
const relativePathExists = await this.call('fileManager', 'exists', relativePath) |
|
|
|
|
|
|
|
|
|
if (relativePathExists) return relativePath |
|
|
|
|
else { |
|
|
|
|
if (path.startsWith('circomlib')) { |
|
|
|
|
// try to resolve include import from github if it is a circomlib dependency
|
|
|
|
|
const splitInclude = path.split('/') |
|
|
|
|
const version = splitInclude[1].match(/v[0-9]+.[0-9]+.[0-9]+/g) |
|
|
|
|
|
|
|
|
|
if (version && version[0]) { |
|
|
|
|
path = `/.deps/https/raw.githubusercontent.com/iden3/circomlib/${version[0]}/circuits/${splitInclude.slice(2).join('/')}` |
|
|
|
|
} else { |
|
|
|
|
path = `/.deps/https/raw.githubusercontent.com/iden3/circomlib/master/circuits/${splitInclude.slice(1).join('/')}` |
|
|
|
|
} |
|
|
|
|
// @ts-ignore
|
|
|
|
|
const exists = await this.call('fileManager', 'exists', path) |
|
|
|
|
|
|
|
|
|
if (exists) return path |
|
|
|
|
else throw new Error(`Report path ${path} do no exist in the Remix FileSystem`) |
|
|
|
|
} else { |
|
|
|
|
throw new Error(`Report path ${path} do no exist in the Remix FileSystem`) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
ioedeveloper
1 year ago