Merge branch 'circom-desktop' of https://github.com/ethereum/remix-project into circomdesktoptest

apps/circuit-compiler/src/app/actions/index.ts

@@ -29,7 +29,7 @@ export const computeWitness = async (plugin: CircomPluginClient, appState: AppSt
         const wtns = await snarkjs.wtns.exportJson(witness)
         const wtnsJson = wtns.map(wtn => wtn.toString())
         const fileName = extractNameFromKey(appState.filePath)
-        const writePath = extractParentFromKey(appState.filePath) + `/.bin/${fileName.replace('.circom', '.wtn.json')}`
+        const writePath = extractParentFromKey(appState.filePath) + `/.bin/${fileName.replace('.circom', '_js')}/${fileName.replace('.circom', '.wtn.json')}`
 
         await plugin.call('fileManager', 'writeFile', writePath, JSON.stringify(wtnsJson, null, 2))
         plugin._paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'wtns.exportJson', writePath])

apps/circuit-compiler/src/app/services/circomPluginClient.ts

@@ -181,7 +181,7 @@ export class CircomPluginClient extends PluginClient {
         this.lastCompiledFile = path
         const fileName = extractNameFromKey(path)
 
-        this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'wasm')
+        this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + '/' + fileName.replace('.circom', '.wasm')
         // @ts-ignore
         await this.call('fileManager', 'writeFile', this.lastCompiledCircuitPath, circuitProgram, { encoding: null })
         const fileContent = this.lastParsedFiles[path]
@@ -235,7 +235,7 @@ export class CircomPluginClient extends PluginClient {
       const { stdout, stderr } = await this.call('circom', 'run', path, versionToInstall, { prime: prime, wasm: "", inputs: "" })
       const fileName = extractNameFromKey(path)
 
-      this.lastCompiledCircuitPath = pathModule.normalize(extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + "/" + fileName.replace('circom', 'wasm'))
+      this.lastCompiledCircuitPath = pathModule.normalize(extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + "/" + fileName.replace('.circom', '.wasm'))
       if (stderr) this.call('terminal', 'log', { type: 'error', value: stderr })
       if (stdout) this.call('terminal', 'log', { type: 'log', value: stdout })
     } catch (error) {
@@ -290,7 +290,7 @@ export class CircomPluginClient extends PluginClient {
         throw new Error(r1csErrors)
       } else {
         const fileName = extractNameFromKey(path)
-        const writePath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'r1cs')
+        const writePath = extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '.r1cs')
 
         // @ts-ignore
         await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)

apps/remix-ide-e2e/src/tests/circom.test.ts

@@ -38,8 +38,8 @@ module.exports = {
       .waitForElementPresent('[data-id="verticalIconsKindcircuit-compiler"]')
       .waitForElementVisible('[data-id="verticalIconsKindcircuit-compiler"]')
       .click('[data-id="play-editor"]')
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
-      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
   },
   'Should compute a witness for a simple circuit #group1': function (browser: NightwatchBrowser) {
     browser
@@ -55,8 +55,8 @@ module.exports = {
       .click('[data-id="compute_witness_btn"]')
       .frameParent()
       .clickLaunchIcon('filePanel')
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wtn"]')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wtn"]')
-      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wtn"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wtn"]')
   },
   'Should compile a simple circuit using compile button in circom plugin #group2': function (browser: NightwatchBrowser) {
     browser
@@ -70,8 +70,8 @@ module.exports = {
       .click('button[data-id="compile_circuit_btn"]')
       .frameParent()
       .clickLaunchIcon('filePanel')
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
-      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
   },
   'Should run Groth16 setup and export for a simple circuit using the GUI #group2': function (browser: NightwatchBrowser) {
     browser
@@ -116,8 +116,8 @@ module.exports = {
 
         return actions.keyDown(this.Keys.CONTROL).sendKeys('s')
       })
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
-      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
   },
   'Should display warnings for compiled circuit without pragma version #group4': function (browser: NightwatchBrowser) {
     browser
@@ -164,7 +164,7 @@ module.exports = {
       .waitForElementNotPresent('[data-id="circuit_feedback"]')
       .frameParent()
       .clickLaunchIcon('filePanel')
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
   },
   'Should create a new workspace using hash checker template #group5 #group6': function (browser: NightwatchBrowser) {
     browser

apps/remixdesktop/src/plugins/circomElectronBasePlugin.ts

@@ -1,6 +1,6 @@
 import { ElectronBasePlugin, ElectronBasePluginClient } from "@remixproject/plugin-electron"
 import { Profile } from "@remixproject/plugin-utils"
-import { getInstallationPath, circomCli, extractParentFromKey, getInstallationUrl, getLogInputSignalsPath } from "../tools/circom"
+import { getInstallationPath, circomCli, extractParentFromKey, getInstallationUrl, getLogInputSignalsPath, extractNameFromKey } from "../tools/circom"
 import path from "path"
 import { existsSync, readFileSync } from "fs"
 
@@ -57,7 +57,7 @@ class CircomElectronPluginClient extends ElectronBasePluginClient {
       // @ts-ignore
       if (process.platform === 'win32' && 'wasm' in options) {
         // @ts-ignore
-        await this.call('fs', 'rmdir', path.join(extractParentFromKey(filePath), '.bin', 'simple_js'))
+        await this.call('fs', 'rmdir', path.join(extractParentFromKey(filePath), '.bin', extractNameFromKey(filePath).replace('.circom', '_js')))
       }
     }
     filePath = path.join(wd, filePath)

apps/remixdesktop/src/tools/circom.ts

@@ -127,3 +127,10 @@ export const extractParentFromKey = (key: string):string => {
 
   return keyPath.join('/')
 }
+
+export const extractNameFromKey = (key: string): string => {
+  if (!key) return
+  const keyPath = key.split('/')
+
+  return keyPath[keyPath.length - 1]
+}

libs/remix-ws-templates/src/templates/hashchecker/scripts/groth16/groth16_zkproof.ts

@@ -18,7 +18,7 @@ const logger = {
     // @ts-ignore
     await remix.call('circuit-compiler', 'compile', 'circuits/calculate_hash.circom');
     // @ts-ignore
-    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash.wasm', { encoding: null });
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash_js/calculate_hash.wasm', { encoding: null });
     // @ts-ignore
     const wasm = new Uint8Array(wasmBuffer);
 

libs/remix-ws-templates/src/templates/hashchecker/scripts/plonk/plonk_zkproof.ts

@@ -15,7 +15,7 @@ const logger = {
     // @ts-ignore
     await remix.call('circuit-compiler', 'compile', 'circuits/calculate_hash.circom');
     // @ts-ignore
-    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash.wasm', { encoding: null });
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash_js/calculate_hash.wasm', { encoding: null });
     // @ts-ignore
     const wasm = new Uint8Array(wasmBuffer);
     const zkey_final = {

libs/remix-ws-templates/src/templates/rln/scripts/groth16/groth16_zkproof.ts

@@ -79,7 +79,7 @@ async function prove (signals, wasm, wtns, r1cs, zkey_final, vKey) {
     // @ts-ignore
     await remix.call('circuit-compiler', 'compile', 'circuits/rln.circom');
     // @ts-ignore
-    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln.wasm', { encoding: null });
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln_js/rln.wasm', { encoding: null });
     // @ts-ignore
     const wasm = new Uint8Array(wasmBuffer);
 

libs/remix-ws-templates/src/templates/rln/scripts/plonk/plonk_zkproof.ts

@@ -102,7 +102,7 @@ async function prove (signals, wasm, wtns, r1cs, zkey_final, vKey) {
     // @ts-ignore
     await remix.call('circuit-compiler', 'compile', 'circuits/rln.circom');
     // @ts-ignore
-    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln.wasm', { encoding: null });
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln_js/rln.wasm', { encoding: null });
     // @ts-ignore
     const wasm = new Uint8Array(wasmBuffer);
 

libs/remix-ws-templates/src/templates/semaphore/scripts/groth16/groth16_zkproof.ts

@@ -25,13 +25,13 @@ function hash(message: any): bigint {
 (async () => {
   try {
     // @ts-ignore
-    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore.r1cs', true);
+    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore.r1cs', { encoding: null });
     // @ts-ignore
     const r1cs = new Uint8Array(r1csBuffer);
     // @ts-ignore
     await remix.call('circuit-compiler', 'compile', 'circuits/semaphore.circom');
     // @ts-ignore
-    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore.wasm', true);
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore_js/semaphore.wasm', { encoding: null });
     // @ts-ignore
     const wasm = new Uint8Array(wasmBuffer);
 

libs/remix-ws-templates/src/templates/semaphore/scripts/plonk/plonk_zkproof.ts

@@ -25,13 +25,13 @@ function hash(message: any): bigint {
 (async () => {
   try {
     // @ts-ignore
-    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore.r1cs', true);
+    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore.r1cs', { encoding: null });
     // @ts-ignore
     const r1cs = new Uint8Array(r1csBuffer);
     // @ts-ignore
     await remix.call('circuit-compiler', 'compile', 'circuits/semaphore.circom');
     // @ts-ignore
-    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore.wasm', true);
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/semaphore_js/semaphore.wasm', { encoding: null });
     // @ts-ignore
     const wasm = new Uint8Array(wasmBuffer);