fix conflicts

Author: glitch-txs

.circleci/config.yml

@@ -175,10 +175,83 @@ jobs:
           key: remixdesktop-windows-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
           paths:
             - apps/remixdesktop/node_modules
+      - persist_to_workspace:
+            root: apps/remixdesktop
+            paths:
+              - "release"
+  # see https://docs.digicert.com/en/software-trust-manager/ci-cd-integrations/script-integrations/github-integration-ksp.html    
+  sign-remixdesktop-windows:
+    executor: win/default # executor type
+    working_directory: ~/remix-project
+    steps:
+      - checkout
+      - attach_workspace:
+         at: .
+      - run:
+          name: "Certificate-Setup"
+          shell: powershell.exe
+          command: |
+            cd C:\
+            New-Item C:\CERT_FILE.p12.b64
+            Set-Content -Path C:\CERT_FILE.p12.b64 -Value $env:SM_CLIENT_CERT_FILE_B64
+            certutil -decode CERT_FILE.p12.b64 Certificate_pkcs12.p12
+            cat Certificate_pkcs12.p12
+      - restore_cache:
+          name: Restore smtools-windows-x64.msi
+          keys:
+            - dl-smtools-windows-x64.msi
+      - run:
+          name: "Client-Tool-Download"
+          shell: powershell.exe 
+          command: |
+            cd C:\
+            if (Test-Path 'c:\smtools-windows-x64.msi') {              
+              echo 'File exists, skipping download...'
+            } else {
+              echo 'Downloading smtools-windows-x64.msi ...'
+              curl.exe -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:$env:SM_API_KEY" -o smtools-windows-x64.msi
+            }
+      - save_cache:
+          key: dl-smtools-windows-x64.msi
+          paths:
+            - c:\smtools-windows-x64.msi
+      - run:
+          name: "Client-Tool-Setup"
+          shell: powershell.exe 
+          command: |
+            cd C:\
+            msiexec.exe /i smtools-windows-x64.msi /quiet /qn | Wait-Process
+            & $env:SSM\smksp_cert_sync.exe
+            & $env:SSM\smctl.exe healthcheck
+      - run:
+          name: "Find Signtool"
+          shell: powershell.exe
+          command: |
+            Get-ChildItem -Path 'C:\Program Files (x86)\Windows Kits\10\App Certification Kit' -Filter signtool.exe -Recurse
+      - run:
+          name: "Signtool-Signing"
+          shell: powershell.exe
+          command: |
+            & $env:Signtool sign /sha1 $env:SM_CODE_SIGNING_CERT_SHA1_HASH /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 $env:RemixSetupExe
+      - run:
+          name: "Signtool-Verification"
+          shell: powershell.exe
+          command: |
+            $verify_output = $(& $env:Signtool verify /v /pa $env:RemixSetupExe)
+            echo ${verify_output}
+            if (!$verify_output.Contains("Number of files successfully Verified: 1")) {
+              echo 'Verification failed'
+              exit 1
+            }
       - store_artifacts:
-          path: apps/remixdesktop/release/
+          path: ~/remix-project/release/
           destination: remixdesktop-windows
-          
+    environment:
+      SM_CLIENT_CERT_FILE: 'C:\Certificate_pkcs12.p12'
+      Signtool: 'C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe'
+      SSM: 'C:\Program Files\DigiCert\DigiCert One Signing Manager Tools'
+      RemixSetupExe: 'C:\Users\circleci\remix-project\release\Remix IDE.exe'
+        
   build-remixdesktop-mac:
     macos:
       xcode: 14.2.0
@@ -452,6 +525,9 @@ workflows:
       - build-remixdesktop-windows:
           requires:
             - build-desktop
+      - sign-remixdesktop-windows:
+          requires:
+            - build-remixdesktop-windows
       - build-remixdesktop-linux:
           requires:
             - build-desktop

.github/workflows/pr-reminder.yml

@@ -14,4 +14,4 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        freeze-date: '2024-01-15T18:00:00Z'
+        freeze-date: '2024-01-29T18:00:00Z'

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

@@ -29,8 +29,6 @@ function App() {
         if (filePath.endsWith('.circom')) {
           dispatch({ type: 'SET_FILE_PATH', payload: filePath })
           plugin.parse(filePath)
-        } else {
-          dispatch({ type: 'SET_FILE_PATH', payload: '' })
         }
       })
       // @ts-ignore
@@ -102,6 +100,9 @@ function App() {
       (async () => {
         if (appState.autoCompile) await compileCircuit(plugin, appState)
       })()
+      dispatch({ type: 'SET_SIGNAL_INPUTS', payload: [] })
+      dispatch({ type: 'SET_COMPILER_STATUS', payload: 'idle' })
+      dispatch({ type: 'SET_COMPILER_FEEDBACK', payload: null })
     }
   }, [appState.filePath])
 

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

@@ -10,7 +10,7 @@ import { CircuitActions } from './actions'
 import { WitnessToggler } from './witnessToggler'
 import { WitnessSection } from './witness'
 import { CompilerFeedback } from './feedback'
-import { PrimeValue } from '../types'
+import { CompilerReport, PrimeValue } from '../types'
 
 export function Container () {
   const circuitApp = useContext(CircuitAppContext)
@@ -58,6 +58,43 @@ export function Container () {
     circuitApp.dispatch({ type: 'SET_HIDE_WARNINGS', payload: value })
   }
 
+  const askGPT = async (report: CompilerReport) => {
+    if (report.labels.length > 0) {
+      const location = circuitApp.appState.filePathToId[report.labels[0].file_id]
+      const error = report.labels[0].message
+
+      if (location) {
+        const fullPathLocation = await circuitApp.plugin.resolveReportPath(location)
+        const content = await circuitApp.plugin.call('fileManager', 'readFile', fullPathLocation)
+        const message = `
+          circom code: ${content}
+          error message: ${error}
+          full circom error: ${JSON.stringify(report, null, 2)}
+          explain why the error occurred and how to fix it.
+          `
+        // @ts-ignore
+        await circuitApp.plugin.call('openaigpt', 'message', message)
+      } else {
+        const message = `
+          error message: ${error}
+          full circom error: ${JSON.stringify(report, null, 2)}
+          explain why the error occurred and how to fix it.
+          `
+        // @ts-ignore
+        await circuitApp.plugin.call('openaigpt', 'message', message)
+      }
+    } else {
+      const error = report.message
+      const message = `
+      error message: ${error}
+      full circom error: ${JSON.stringify(report, null, 2)}
+      explain why the error occurred and how to fix it.
+      `
+      // @ts-ignore
+      await circuitApp.plugin.call('openaigpt', 'message', message)
+    }
+  }
+
   return (
     <section>
       <article>
@@ -86,7 +123,7 @@ export function Container () {
               </WitnessToggler>
             </RenderIf>
             <RenderIf condition={(circuitApp.appState.status !== 'compiling') && (circuitApp.appState.status !== 'computing') && (circuitApp.appState.status !== 'generating')}>
-              <CompilerFeedback feedback={circuitApp.appState.feedback} filePathToId={circuitApp.appState.filePathToId} openErrorLocation={handleOpenErrorLocation} hideWarnings={circuitApp.appState.hideWarnings} />
+              <CompilerFeedback feedback={circuitApp.appState.feedback} filePathToId={circuitApp.appState.filePathToId} openErrorLocation={handleOpenErrorLocation} hideWarnings={circuitApp.appState.hideWarnings} askGPT={askGPT} />
             </RenderIf>
           </div>
         </div>

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

@@ -4,7 +4,7 @@ import { RenderIf } from '@remix-ui/helper'
 import {CopyToClipboard} from '@remix-ui/clipboard'
 import { FeedbackAlert } from './feedbackAlert'
 
-export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openErrorLocation }: CompilerFeedbackProps) {
+export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openErrorLocation, askGPT }: CompilerFeedbackProps) {
   const [ showException, setShowException ] = useState<boolean>(true)
 
   const handleCloseException = () => {
@@ -17,6 +17,10 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
     }
   }
 
+  const handleAskGPT = (report: CompilerReport) => {
+    askGPT(report)
+  }
+
   return (
     <div>
       <div className="circuit_errors_box py-4">
@@ -40,12 +44,18 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
                 <div key={index} onClick={() => handleOpenError(response)}>
                   <RenderIf condition={response.type === 'Error'}>
                     <div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-danger`} data-id="circuit_feedback">
-                      <FeedbackAlert message={response.message} location={ response.labels[0] ? response.labels[0].message + ` ${filePathToId[response.labels[0].file_id]}:${response.labels[0].range.start}:${response.labels[0].range.end}` : null} />
+                      <FeedbackAlert
+                        message={response.message}
+                        location={ response.labels[0] ? response.labels[0].message + ` ${filePathToId[response.labels[0].file_id]}:${response.labels[0].range.start}:${response.labels[0].range.end}` : null}
+                        askGPT={ () => handleAskGPT(response) } />
                     </div>
                   </RenderIf>
                   <RenderIf condition={(response.type === 'Warning') && !hideWarnings}>
                     <div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-warning`} data-id="circuit_feedback">
-                      <FeedbackAlert message={response.message} location={null} />
+                      <FeedbackAlert
+                        message={response.message}
+                        location={null}
+                        askGPT={() => { handleAskGPT(response) }} />
                     </div>
                   </RenderIf>
                 </div>

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

@@ -3,7 +3,7 @@ import { FeedbackAlertProps } from '../types'
 import { RenderIf } from '@remix-ui/helper'
 import {CopyToClipboard} from '@remix-ui/clipboard'
 
-export function FeedbackAlert ({ message, location }: FeedbackAlertProps) {
+export function FeedbackAlert ({ message, location, askGPT }: FeedbackAlertProps) {
   const [ showAlert, setShowAlert] = useState<boolean>(true)
 
   const handleCloseAlert = () => {
@@ -24,6 +24,7 @@ export function FeedbackAlert ({ message, location }: FeedbackAlertProps) {
           <span className="ml-3 pt-1 py-1" >
             <CopyToClipboard content={message} className="p-0 m-0 far fa-copy error" direction={'top'} />
           </span>
+          <span className="border border-success text-success btn-sm" onClick={askGPT}>ASK GPT</span>
         </div>
       </>
     </RenderIf>

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

@@ -4,6 +4,7 @@ import { CompilerStatus } from "../types";
 import { computeWitness } from "../actions";
 import { useState } from "react";
 import type { CircomPluginClient } from "../services/circomPluginClient";
+import * as remixLib from '@remix-project/remix-lib'
 
 export function WitnessSection ({ plugin, signalInputs, status }: {plugin: CircomPluginClient, signalInputs: string[], status: CompilerStatus}) {
   const [witnessValues, setWitnessValues] = useState<Record<string, string>>({})
@@ -12,13 +13,13 @@ export function WitnessSection ({ plugin, signalInputs, status }: {plugin: Circo
     let value = e.target.value
 
     try {
-      value = JSON.parse(value)
+      value = remixLib.execution.txFormat.parseFunctionParams(value)
     } catch (e) {
       // do nothing
     }
     setWitnessValues({
       ...witnessValues,
-      [e.target.name]: value
+      [e.target.name]: value[0]
     })
   }
 

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

@@ -21,7 +21,7 @@ export class CircomPluginClient extends PluginClient {
 
   constructor() {
     super()
-    this.methods = ['init', 'parse', 'compile', 'generateR1cs']
+    this.methods = ['init', 'parse', 'compile', 'generateR1cs', 'resolveDependencies']
     createClient(this)
     this.internalEvents = new EventManager()
     this.onload()
@@ -123,14 +123,18 @@ export class CircomPluginClient extends PluginClient {
 
   async compile(path: string, compilationConfig?: CompilationConfig): Promise<void> {
     this.internalEvents.emit('circuit_compiling_start')
+    // @ts-ignore
+    this.call('terminal', 'log', { type: 'log', value: 'Compiling ' + path })
     const [parseErrors, filePathToId] = await this.parse(path)
 
     if (parseErrors && (parseErrors.length > 0)) {
       if (parseErrors[0].type === 'Error') {
         this.internalEvents.emit('circuit_parsing_errored', parseErrors, filePathToId)
+        this.logCompilerReport(parseErrors)
         return
       } else if (parseErrors[0].type === 'Warning') {
         this.internalEvents.emit('circuit_parsing_warning', parseErrors, filePathToId)
+        this.logCompilerReport(parseErrors)
       }
     } else {
       this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
@@ -147,6 +151,7 @@ export class CircomPluginClient extends PluginClient {
     if (circuitProgram.length < 1) {
       const circuitErrors = circuitApi.report()
 
+      this.logCompilerReport(circuitErrors)
       throw new Error(circuitErrors)
     } else {
       this.lastCompiledFile = path
@@ -166,19 +171,28 @@ export class CircomPluginClient extends PluginClient {
       } else {
         this.internalEvents.emit('circuit_compiling_done', [])
       }
+      circuitApi.log().map(log => {
+        log && this.call('terminal', 'log', { type: 'log', value: log })  
+      })
+      // @ts-ignore
+      this.call('terminal', 'log', { type: 'typewritersuccess', value: 'Everything went okay, circom safe' })
     }
   }
 
   async generateR1cs (path: string, compilationConfig?: CompilationConfig): Promise<void> {
     this.internalEvents.emit('circuit_generating_r1cs_start')
+    // @ts-ignore
+    this.call('terminal', 'log', { type: 'log', value: 'Generating R1CS for ' + path })
     const [parseErrors, filePathToId] = await this.parse(path)
 
     if (parseErrors && (parseErrors.length > 0)) {
       if (parseErrors[0].type === 'Error') {
         this.internalEvents.emit('circuit_parsing_errored', parseErrors)
+        this.logCompilerReport(parseErrors)
         return
       } else if (parseErrors[0].type === 'Warning') {
         this.internalEvents.emit('circuit_parsing_warning', parseErrors)
+        this.logCompilerReport(parseErrors)
       }
     } else {
       this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
@@ -195,6 +209,7 @@ export class CircomPluginClient extends PluginClient {
     if (r1csProgram.length < 1) {
       const r1csErrors = r1csApi.report()
 
+      this.logCompilerReport(r1csErrors)
       throw new Error(r1csErrors)
     } else {
       this.internalEvents.emit('circuit_generating_r1cs_done')
@@ -203,6 +218,11 @@ export class CircomPluginClient extends PluginClient {
 
       // @ts-ignore
       await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)
+      r1csApi.log().map(log => {
+        log && this.call('terminal', 'log', { type: 'log', value: log })  
+      })
+      // @ts-ignore
+      this.call('terminal', 'log', { type: 'typewritersuccess', value: 'Everything went okay, circom safe' })
     }
   }
 
@@ -373,4 +393,10 @@ export class CircomPluginClient extends PluginClient {
       }
     }
   }
+
+  async logCompilerReport (report: CompilerReport[]): Promise<void> {
+    this.call('terminal', 'log', { type: 'log', value: JSON.stringify(report, null, 2) })
+    if (report[0].type === 'Error') this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
+    if (report[0].type === 'Warning') this.call('terminal', 'log', { type: 'log', value: 'previous warnings were found' })
+  }
 }

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

@@ -1,6 +1,6 @@
 import { compiler_list } from 'circom_wasm'
 import {Dispatch} from 'react'
-import { CircomPluginClient } from '../services/circomPluginClient'
+import type { CircomPluginClient } from '../services/circomPluginClient'
 
 export type CompilerStatus = "compiling" | "generating" | "computing" | "idle" | "errored" | "warning"
 export interface ICircuitAppContext {
@@ -51,7 +51,8 @@ export type CompilerFeedbackProps = {
   feedback: string | CompilerReport[],
   filePathToId: Record<string, string>,
   openErrorLocation: (location: string, startRange: string) => void,
-  hideWarnings: boolean
+  hideWarnings: boolean,
+  askGPT: (report: CompilerReport) => void
 }
 
 export type CompilerReport = {
@@ -71,7 +72,8 @@ export type CompilerReport = {
 
 export type FeedbackAlertProps = {
   message: string,
-  location: string
+  location: string,
+  askGPT: () => void
 }
 
 export type ConfigurationsProps = {

apps/circuit-compiler/src/index.html

@@ -12,6 +12,9 @@
 		crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css">
   </head>
   <body>
+    <script>
+      var global = window
+    </script>
     <div id="root"></div>
     <script src="snarkjs.min.js">   </script>
     <script src="https://kit.fontawesome.com/41dd021e94.js" crossorigin="anonymous"></script>