Merge branch 'master' into gnosAA

Author: Aniket-Engg

.circleci/config.yml

@@ -5,7 +5,7 @@ parameters:
     type: boolean
     default: false
 orbs:
-  browser-tools: circleci/browser-tools@1.4.4
+  browser-tools: circleci/browser-tools@1.5.2
   win: circleci/windows@5.0
   node: circleci/node@7.0.0
 jobs:
@@ -629,7 +629,7 @@ jobs:
 
   remix-ide-browser:
     docker:
-      - image: cimg/node:20.17.0-browsers
+      - image: cimg/node:20.18.3-browsers
     resource_class:
       xlarge
     working_directory: ~/remix-project

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

@@ -117,7 +117,7 @@ export const generateProof = async (plugin: CircomPluginClient, appState: AppSta
     const r1csBuffer = await plugin.call('fileManager', 'readFile', r1csPath, { encoding: null })
     // @ts-ignore
     const r1cs = new Uint8Array(r1csBuffer)
-    const wtnsPath = isElectron() ? extractParentFromKey(appState.filePath) + "/.bin/" + fileName.replace('.circom', '_js') + "/" + fileName.replace('.circom', '.wtn') : r1csPath.replace('.r1cs', '.wtn')
+    const wtnsPath = extractParentFromKey(appState.filePath) + "/.bin/" + fileName.replace('.circom', '_js') + "/" + fileName.replace('.circom', '.wtn')
     // @ts-ignore
     const wtnsBuffer = await plugin.call('fileManager', 'readFile', wtnsPath, { encoding: null })
     // @ts-ignore

apps/circuit-compiler/src/app/components/actions.tsx

@@ -1,17 +1,17 @@
 import { useContext } from 'react'
-import { CustomTooltip, RenderIf } from '@remix-ui/helper'
+import { CompileBtn, CustomTooltip, RenderIf } from '@remix-ui/helper'
 import { FormattedMessage } from 'react-intl'
 import { CircuitAppContext } from '../contexts'
-import { CompileOptions } from './options'
+import { CompileOptions, CompilerReport } from '@remix-ui/helper'
 import { VersionList } from './versions'
 import { Toggler } from './toggler'
 import { Configurations } from './configurations'
-import { CircuitActions } from './actions'
 import { WitnessSection } from './witness'
-import { CompilerFeedback } from './feedback'
-import { CompilerReport, PrimeValue } from '../types'
+import { CompilerFeedback } from '@remix-ui/helper'
+import { PrimeValue } from '../types'
 import { SetupExports } from './setupExports'
 import { GenerateProof } from './generateProof'
+import { compileCircuit } from '../actions'
 
 export function Container () {
   const circuitApp = useContext(CircuitAppContext)
@@ -34,15 +34,19 @@ export function Container () {
     circuitApp.dispatch({ type: 'SET_COMPILER_VERSION', payload: version })
   }
 
-  const handleOpenErrorLocation = async (location: string, startRange: string) => {
-    if (location) {
-      const fullPathLocation = await circuitApp.plugin.resolveReportPath(location)
+  const handleOpenErrorLocation = async (report: CompilerReport) => {
+    if (report.labels.length > 0) {
+      const location = circuitApp.appState.filePathToId[report.labels[0].file_id]
+      const startRange = report.labels[0].range.start
+      if (location) {
+        const fullPathLocation = await circuitApp.plugin.resolveReportPath(location)
 
-      await circuitApp.plugin.call('fileManager', 'open', fullPathLocation)
-      // @ts-ignore
-      const startPosition: { lineNumber: number; column: number } = await circuitApp.plugin.call('editor', 'getPositionAt', startRange)
-      // @ts-ignore
-      await circuitApp.plugin.call('editor', 'gotoLine', startPosition.lineNumber - 1, startPosition.column)
+        await circuitApp.plugin.call('fileManager', 'open', fullPathLocation)
+        // @ts-ignore
+        const startPosition: { lineNumber: number; column: number } = await circuitApp.plugin.call('editor', 'getPositionAt', startRange)
+        // @ts-ignore
+        await circuitApp.plugin.call('editor', 'gotoLine', startPosition.lineNumber - 1, startPosition.column)
+      }
     }
   }
 
@@ -102,6 +106,10 @@ export function Container () {
     }
   }
 
+  const handleCompileClick = () => {
+    compileCircuit(circuitApp.plugin, circuitApp.appState)
+  }
+
   return (
     <section>
       <article>
@@ -123,7 +131,9 @@ export function Container () {
             <Toggler title='circuit.advancedConfigurations' dataId=''>
               <Configurations setPrimeValue={handlePrimeChange} primeValue={circuitApp.appState.primeValue} versionValue={circuitApp.appState.version} />
             </Toggler>
-            <CircuitActions />
+            <div className="pb-2">
+              <CompileBtn id='circuit' plugin={circuitApp.plugin} appState={circuitApp.appState} compileAction={handleCompileClick} />
+            </div>
             <RenderIf condition={circuitApp.appState.status !== 'compiling'}>
               <CompilerFeedback feedback={circuitApp.appState.compilerFeedback} filePathToId={circuitApp.appState.filePathToId} openErrorLocation={handleOpenErrorLocation} hideWarnings={circuitApp.appState.hideWarnings} askGPT={askGPT} />
             </RenderIf>

apps/circuit-compiler/src/app/components/compileBtn.tsx

@@ -7,8 +7,8 @@ import * as compilerV218 from 'circom_wasm/v2.1.8'
 import * as compilerV217 from 'circom_wasm/v2.1.7'
 import * as compilerV216 from 'circom_wasm/v2.1.6'
 import * as compilerV215 from 'circom_wasm/v2.1.5'
-import { extractNameFromKey, extractParentFromKey } from '@remix-ui/helper'
-import { CompilationConfig, CompilerReport, PrimeValue } from '../types'
+import { extractNameFromKey, extractParentFromKey, CompilerReport } from '@remix-ui/helper'
+import { CompilationConfig, PrimeValue } from '../types'
 import isElectron from 'is-electron'
 
 export class CircomPluginClient extends PluginClient {

apps/circuit-compiler/src/app/components/container.tsx

@@ -1,6 +1,7 @@
 import { compiler_list } from 'circom_wasm'
 import { Dispatch } from 'react'
 import type { CircomPluginClient } from '../services/circomPluginClient'
+import { CompilerReport } from '@remix-ui/helper'
 
 export type CompilerStatus = "compiling" | "computing" | "idle" | "errored" | "warning" | "exporting" | "proving"
 
@@ -87,34 +88,6 @@ export type CompilationConfig = {
 
 export type PrimeValue = "bn128" | "bls12381" | "goldilocks" | "grumpkin" | "pallas" | "vesta"
 
-export type CompilerFeedbackProps = {
-  feedback: string | CompilerReport[],
-  filePathToId: Record<string, string>,
-  openErrorLocation: (location: string, startRange: string) => void,
-  hideWarnings: boolean,
-  askGPT: (report: CompilerReport) => void
-}
-
-export type CompilerReport = {
-  type: "Error" | "Bug" | "Help" | "Note" | "Warning" | "Unknown",
-  message: string,
-  labels: {
-    style: "Primary" | "Secondary" | "Unknown",
-    file_id: string,
-    range: {
-      start: string,
-      end: string
-    },
-    message: string
-  }[],
-  notes: string[]
-}
-
-export type FeedbackAlertProps = {
-  message: string,
-  askGPT: () => void
-}
-
 export type ConfigurationsProps = {
   setPrimeValue: (prime: PrimeValue) => void,
   primeValue: PrimeValue,

apps/circuit-compiler/src/app/components/options.tsx

@@ -170,7 +170,6 @@ const Model: ModelType = {
           (<any>window)._paq.push(['trackEvent', 'learneth', 'test_step', success])
         }
       } catch (err) {
-        console.log('TESTING ERROR', err)
         yield put({
           type: 'remixide/save',
           payload: { errors: [String(err)]},

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

@@ -0,0 +1,8 @@
+export const DEFAULT_TOML_CONFIG = `[package]
+name = "test"
+authors = [""]
+compiler_version = ">=0.18.0"
+type = "bin"
+
+[dependencies]
+`