Merge branch 'master' into ai_tracking

ethereum · Jun 28, 2024 · 01879e0 · 01879e0
2 parents 77080f4 + cc86ee6
commit 01879e0
Show file tree

Hide file tree

Showing 141 changed files with 2,947 additions and 415,202 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -364,6 +364,7 @@ jobs:
       - run: yarn install --cwd ./apps/remix-ide-e2e --modules-folder ../../node_modules || yarn install --cwd ./apps/remix-ide-e2e --modules-folder ../../node_modules
       - run: mkdir node_modules/hardhat && wget https://unpkg.com/hardhat/console.sol -O node_modules/hardhat/console.sol
       - run: ls -la ./dist/apps/remix-ide/assets/js
+      - run: sudo apt update && sudo apt install python3-pip -y
       - when:
           condition:
               equal: [ "chrome", << parameters.browser >> ]

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows, Linux or MacOS]
+ - Browser [e.g. chrome, firefox]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
@@ -32,7 +32,6 @@
 
 ![Remix screenshot](https://github.com/ethereum/remix-project/raw/master/apps/remix-ide/remix-screenshot-400h.png)
 
-**VSCode extension**, see: [Ethereum-Remix](https://marketplace.visualstudio.com/items?itemName=RemixProject.ethereum-remix)
 
 ## Remix libraries 
 Remix libraries are essential for Remix IDE's native plugins. Read more about libraries [here](libs/README.md)

diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
@@ -10,6 +10,8 @@ import * as compilerV215 from 'circom_wasm/v2.1.5'
 import { extractNameFromKey, extractParentFromKey } from '@remix-ui/helper'
 import { CompilationConfig, CompilerReport, PrimeValue, ResolverOutput } from '../types'
 
+// @ts-ignore
+const _paq = (window._paq = window._paq || [])
 export class CircomPluginClient extends PluginClient {
   public internalEvents: EventManager
   private _compilationConfig: CompilationConfig = {
@@ -119,6 +121,7 @@ export class CircomPluginClient extends PluginClient {
         } else {
           // @ts-ignore
           await this.call('editor', 'clearErrorMarkers', [path])
+          this.emit('statusChanged', { key: 'none' })
         }
       }
 
@@ -130,6 +133,7 @@ export class CircomPluginClient extends PluginClient {
 
   async compile(path: string, compilationConfig?: CompilationConfig): Promise<void> {
     this.internalEvents.emit('circuit_compiling_start')
+    this.emit('statusChanged', { key: 'loading', title: 'Compiling...', type: 'info' })
     // @ts-ignore
     this.call('terminal', 'log', { type: 'log', value: 'Compiling ' + path })
     const [parseErrors, filePathToId] = await this.parse(path)
@@ -145,6 +149,7 @@ export class CircomPluginClient extends PluginClient {
       }
     } else {
       this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
+      this.emit('statusChanged', { key: 'succeed', title: 'circuit compiled successfully', type: 'success' })
     }
     if (compilationConfig) {
       const { prime, version } = compilationConfig
@@ -159,6 +164,7 @@ export class CircomPluginClient extends PluginClient {
       const circuitErrors = circuitApi.report()
 
       this.logCompilerReport(circuitErrors)
+      _paq.push(['trackEvent', 'circuit-compiler', 'compile', 'Compilation failed'])
       throw new Error(circuitErrors)
     } else {
       this.lastCompiledFile = path
@@ -178,6 +184,7 @@ export class CircomPluginClient extends PluginClient {
       } else {
         this.internalEvents.emit('circuit_compiling_done', [])
       }
+      _paq.push(['trackEvent', 'circuit-compiler', 'compile', 'Compilation successful'])
       circuitApi.log().map(log => {
         log && this.call('terminal', 'log', { type: 'log', value: log })
       })
@@ -188,6 +195,7 @@ export class CircomPluginClient extends PluginClient {
 
   async generateR1cs (path: string, compilationConfig?: CompilationConfig): Promise<void> {
     this.internalEvents.emit('circuit_generating_r1cs_start')
+    this.emit('statusChanged', { key: 'loading', title: 'Generating...', type: 'info' })
     // @ts-ignore
     this.call('terminal', 'log', { type: 'log', value: 'Generating R1CS for ' + path })
     const [parseErrors, filePathToId] = await this.parse(path)
@@ -203,6 +211,7 @@ export class CircomPluginClient extends PluginClient {
       }
     } else {
       this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
+      this.emit('statusChanged', { key: 'succeed', title: 'r1cs generated successfully', type: 'success' })
     }
     if (compilationConfig) {
       const { prime, version } = compilationConfig
@@ -217,6 +226,7 @@ export class CircomPluginClient extends PluginClient {
       const r1csErrors = r1csApi.report()
 
       this.logCompilerReport(r1csErrors)
+      _paq.push(['trackEvent', 'circuit-compiler', 'generateR1cs', 'R1CS Generation failed'])
       throw new Error(r1csErrors)
     } else {
       this.internalEvents.emit('circuit_generating_r1cs_done')
@@ -225,6 +235,7 @@ export class CircomPluginClient extends PluginClient {
 
       // @ts-ignore
       await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)
+      _paq.push(['trackEvent', 'circuit-compiler', 'generateR1cs', 'R1CS Generation successful'])
       r1csApi.log().map(log => {
         log && this.call('terminal', 'log', { type: 'log', value: log })
       })
@@ -235,6 +246,7 @@ export class CircomPluginClient extends PluginClient {
 
   async computeWitness (input: string): Promise<void> {
     this.internalEvents.emit('circuit_computing_witness_start')
+    this.emit('statusChanged', { key: 'loading', title: 'Computing...', type: 'info' })
     const wasmPath = this.lastCompiledCircuitPath
 
     if (!wasmPath) throw new Error('No wasm file found')
@@ -244,7 +256,9 @@ export class CircomPluginClient extends PluginClient {
     const witness = this.compiler ? await this.compiler.generate_witness(dataRead, input) : await generate_witness(dataRead, input)
     // @ts-ignore
     await this.call('fileManager', 'writeFile', wasmPath.replace('.wasm', '.wtn'), witness, true)
+    _paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'Witness computing successful'])
     this.internalEvents.emit('circuit_computing_witness_done')
+    this.emit('statusChanged', { key: 'succeed', title: 'witness computed successfully', type: 'success' })
   }
 
   async resolveDependencies(filePath: string, fileContent: string, output?: Record<string, string>, depPath: string = '', blackPath: string[] = []): Promise<Record<string, string>> {
@@ -403,7 +417,13 @@ 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' })
+    if (report[0].type === 'Error') {
+      this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
+      this.emit('statusChanged', { key: report.length, title: `You have ${report.length} problem${report.length === 1 ? '' : 's'}`, type: 'error' })
+    }
+    if (report[0].type === 'Warning') {
+      this.call('terminal', 'log', { type: 'log', value: 'previous warnings were found' })
+      this.emit('statusChanged', { key: report.length, title: `You have ${report.length} problem${report.length === 1 ? '' : 's'}`, type: 'warning' })
+    }
   }
 }
diff --git a/apps/remix-ide-e2e/nightwatch-chrome.ts b/apps/remix-ide-e2e/nightwatch-chrome.ts
@@ -21,7 +21,7 @@ module.exports = {
     'default': {
       globals: {
         waitForConditionTimeout: 10000,
-        asyncHookTimeout: 100000
+        asyncHookTimeout: 10000000
       },
       screenshots: {
         enabled: true,

diff --git a/apps/remix-ide-e2e/nightwatch-firefox.ts b/apps/remix-ide-e2e/nightwatch-firefox.ts
@@ -18,7 +18,7 @@ module.exports = {
     'default': {
       globals: {
         waitForConditionTimeout: 10000,
-        asyncHookTimeout: 100000
+        asyncHookTimeout: 10000000
       },
       screenshots: {
         enabled: true,

diff --git a/apps/remix-ide-e2e/src/commands/addFileSnekmate.ts b/apps/remix-ide-e2e/src/commands/addFileSnekmate.ts
@@ -60,7 +60,7 @@ function addFileSnekmate(browser: NightwatchBrowser, name: string, content: Nigh
           })
           .setEditorValue(content.content)
           .getEditorValue((result) => {
-            if(result != content.content) {
+            if (result != content.content) {
               browser.setEditorValue(content.content)
             }
           })

diff --git a/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts b/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
@@ -117,69 +117,68 @@ module.exports = {
 
   'Should add deep tree with buttons #group3': function (browser: NightwatchBrowser) {
     browser
-    .waitForElementVisible('div[data-id="remixIdeSidePanel"]')
-    .clickLaunchIcon('filePanel')
-    .waitForElementVisible('*[data-id="filePanelFileExplorerTree"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep1')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep2')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1/deep2"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep3')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1/deep2/deep3"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFile"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFile"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep4.sol')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1/deep2/deep3/deep4.sol"]')
+      .waitForElementVisible('div[data-id="remixIdeSidePanel"]')
+      .clickLaunchIcon('filePanel')
+      .waitForElementVisible('*[data-id="filePanelFileExplorerTree"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep1')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep2')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1/deep2"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep3')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1/deep2/deep3"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFile"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFile"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep4.sol')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep1/deep2/deep3/deep4.sol"]')
     // click on root to focus
-    .click('li[data-id="treeViewLitreeViewItemREADME.txt"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep5')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep5"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep6')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep5/deep6"]')
+      .click('li[data-id="treeViewLitreeViewItemREADME.txt"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep5')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep5"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep6')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemdeep5/deep6"]')
     // focus on contracts
-    .click('li[data-id="treeViewLitreeViewItemcontracts"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep7')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/deep7"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep8')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/deep7/deep8"]')
-    .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFile"]')
-    .click('[data-id="fileExplorerNewFilecreateNewFile"]')
-    .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep9.sol')
-    .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
-    .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/deep7/deep8/deep9.sol"]')
-    .end()
+      .click('li[data-id="treeViewLitreeViewItemcontracts"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep7')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/deep7"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFolder"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep8')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/deep7/deep8"]')
+      .waitForElementVisible('[data-id="fileExplorerNewFilecreateNewFile"]')
+      .click('[data-id="fileExplorerNewFilecreateNewFile"]')
+      .waitForElementVisible('*[data-id$="fileExplorerTreeItemInput"]')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', 'deep9.sol')
+      .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/deep7/deep8/deep9.sol"]')
+      .end()
   }
 
-
 }