mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Support includes import for circom wasm build

Browse Source
pull/3996/head
ioedeveloper 2 years ago
parent d4da5bc063
commit 75b011964f
1 changed files with 56 additions and 51 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 107
      apps/circuit-compiler/src/app/services/circomPluginClient.ts

107
apps/circuit-compiler/src/app/services/circomPluginClient.ts
Unescape View File

@ -23,81 +23,86 @@ export class CircomPluginClient extends PluginClient {
}
async compile (path: string) {
this.parse(path)
// const fileContent = await this.call('fileManager', 'readFile', path)
// let buildFiles = await this.resolveDependencies(path, fileContent)
const fileContent = await this.call('fileManager', 'readFile', path)
let buildFiles = {
[path]: fileContent
}
// buildFiles = buildFiles.flat(Infinity)
// const compilationResult = main_browser(path, buildFiles, { prime: "bn128" })
buildFiles = await this.resolveDependencies(path, fileContent, buildFiles)
const compilationResult = main_browser(path, buildFiles, { prime: "bn128" })
// console.log('compilation result: ' + compilationResult)
console.log('compilation result: ' + compilationResult)
// // generate_witness(compilationResult, '{ "a": "3", "b": "11" }')
generate_witness(compilationResult, '{ "a": "3", "b": "11" }')
generate_witness(compilationResult, '{ "a": "5", "b": "77" }')
}
async parse (path: string) {
const fileContent = await this.call('fileManager', 'readFile', path)
let buildFiles = await this.resolveDependencies(path, fileContent)
let buildFiles = {
[path]: fileContent
}
buildFiles = buildFiles.flat(Infinity)
buildFiles.reverse()
buildFiles = await this.resolveDependencies(path, fileContent, buildFiles)
const parsingResult = parse_circuit_browser(path, buildFiles, { prime: "bn128" })
console.log('parsing result: ' + parsingResult)
}
async resolveDependencies (filePath: string, fileContent: string, depPath: string = '') {
async resolveDependencies (filePath: string, fileContent: string, output = {}, depPath: string = '', blackPath: string[] = []) {
const includes = (fileContent.match(/include ['"].*['"]/g) || []).map(include => include.replace(/include ['"]/g, '').replace(/['"]/g, ''))
if (includes.length === 0) {
return [fileContent]
} else {
const depFiles = await Promise.all(includes.map(async include => {
let dependencyContent = ''
let path = include
await Promise.all(includes.map(async include => {
// fix for endless recursive includes
if (blackPath.includes(include)) return
let dependencyContent = ''
let path = include
// @ts-ignore
const pathExists = await this.call('fileManager', 'exists', path)
if (pathExists) {
dependencyContent = await this.call('fileManager', 'readFile', path)
} else {
let relativePath = pathModule.resolve(filePath.slice(0, filePath.lastIndexOf('/')), include)
if (relativePath.indexOf('/') === 0) relativePath = relativePath.slice(1)
// @ts-ignore
const pathExists = await this.call('fileManager', 'exists', path)
const relativePathExists = await this.call('fileManager', 'exists', relativePath)
if (pathExists) {
dependencyContent = await this.call('fileManager', 'readFile', path)
if (relativePathExists) {
dependencyContent = await this.call('fileManager', 'readFile', relativePath)
} else {
let relativePath = pathModule.resolve(filePath.slice(0, filePath.lastIndexOf('/')), include)
if (relativePath.indexOf('/') === 0) relativePath = relativePath.slice(1)
// @ts-ignore
const relativePathExists = await this.call('fileManager', 'exists', relativePath)
if (relativePathExists) {
dependencyContent = await this.call('fileManager', 'readFile', relativePath)
if (depPath) {
path = pathModule.resolve(depPath.slice(0, depPath.lastIndexOf('/')), include)
if (path.indexOf('/') === 0) path = path.slice(1)
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
} else {
if (depPath) {
path = pathModule.resolve(depPath.slice(0, depPath.lastIndexOf('/')), include)
if (path.indexOf('/') === 0) path = path.slice(1)
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
} else {
if (include.startsWith('circomlib')) {
const splitInclude = include.split('/')
const version = splitInclude[1].match(/v[0-9]+.[0-9]+.[0-9]+/g)
if (version && version[0]) {
path = `https://raw.githubusercontent.com/iden3/circomlib/${version[0]}/circuits/${splitInclude.slice(2).join('/')}`
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
} else {
path = `https://raw.githubusercontent.com/iden3/circomlib/master/circuits/${splitInclude.slice(1).join('/')}`
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
}
if (include.startsWith('circomlib')) {
const splitInclude = include.split('/')
const version = splitInclude[1].match(/v[0-9]+.[0-9]+.[0-9]+/g)
if (version && version[0]) {
path = `https://raw.githubusercontent.com/iden3/circomlib/${version[0]}/circuits/${splitInclude.slice(2).join('/')}`
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
} else {
path = `https://raw.githubusercontent.com/iden3/circomlib/master/circuits/${splitInclude.slice(1).join('/')}`
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
}
} else {
dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
}
}
}
const dependencyIncludes = (dependencyContent.match(/include ['"].*['"]/g) || []).map(include => include.replace(/include ['"]/g, '').replace(/['"]/g, ''))
if (dependencyIncludes.length > 0) return await this.resolveDependencies(filePath, dependencyContent, path)
else return dependencyContent
}))
depFiles.push(fileContent)
return depFiles
}
}
const dependencyIncludes = (dependencyContent.match(/include ['"].*['"]/g) || []).map(include => include.replace(/include ['"]/g, '').replace(/['"]/g, ''))
blackPath.push(include)
if (dependencyIncludes.length > 0) {
await this.resolveDependencies(filePath, dependencyContent, output, path, blackPath)
output[include] = dependencyContent
} else {
output[include] = dependencyContent
}
}))
return output
}
}

Write Preview
Loading…
Cancel
Save