Merge branch 'master' into remixd_terminal

apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts

@@ -96,6 +96,7 @@ module.exports = {
       .clickLaunchIcon('filePanel')
       .openFile('tests/compilationError_test.sol')
       .clickLaunchIcon('solidityUnitTesting')
+      .pause(2000)
       .click('*[data-id="testTabCheckAllTests"]')
       .clickElementAtPosition('.singleTestLabel', 3)
       .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')

apps/remix-ide/src/app/files/fileManager.js

@@ -726,9 +726,7 @@ class FileManager extends Plugin {
 
   syncEditor (path) {
     var currentFile = this._deps.config.get('currentFile')
-    console.log(currentFile, path)
     if (path !== currentFile) return
-
     var provider = this.fileProviderOf(currentFile)
     if (provider) {
       provider.get(currentFile, (error, content) => {

apps/remix-ide/src/remixEngine.js

@@ -12,6 +12,7 @@ export class RemixEngine extends Engine {
     if (name === 'LearnEth') return { queueTimeout: 60000 }
     if (name === 'dGitProvider') return { queueTimeout: 60000 * 4 }
     if (name === 'slither') return { queueTimeout: 60000 * 4 } // Requires when a solc version is installed
+    if (name === 'hardhat') return { queueTimeout: 60000 * 4 }
     return { queueTimeout: 10000 }
   }
 

libs/remix-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.15",
+  "version": "0.5.16",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "main": "index.js",
   "types": ".index.d.ts",
@@ -23,7 +23,7 @@
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
     "@remix-project/remix-astwalker": "^0.0.26",
-    "@remix-project/remix-lib": "^0.5.6",
+    "@remix-project/remix-lib": "^0.5.7",
     "async": "^2.6.2",
     "ethereumjs-util": "^7.0.10",
     "ethers": "^5.4.2",
@@ -51,5 +51,5 @@
     "typescript": "^3.7.5"
   },
   "typings": "index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-astwalker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "description": "Tool to walk through Solidity AST",
   "main": "index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/block": "^3.4.0",
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.6",
+    "@remix-project/remix-lib": "^0.5.7",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
     "ethereumjs-util": "^7.0.10",
@@ -53,5 +53,5 @@
     "tap-spec": "^5.0.0"
   },
   "typings": "index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-debug/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -23,7 +23,7 @@
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
     "@remix-project/remix-astwalker": "^0.0.26",
-    "@remix-project/remix-lib": "^0.5.6",
+    "@remix-project/remix-lib": "^0.5.7",
     "async": "^2.6.2",
     "commander": "^2.19.0",
     "deep-equal": "^1.0.1",
@@ -61,5 +61,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Library to various Remix tools",
   "contributors": [
     {
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-simulator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -18,7 +18,7 @@
     "@ethereumjs/common": "^2.2.0",
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.6",
+    "@remix-project/remix-lib": "^0.5.7",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -66,5 +66,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-solidity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Tool to load and run Solidity compiler",
   "main": "index.js",
   "types": "./index.d.ts",
@@ -18,7 +18,7 @@
     "@ethereumjs/block": "^3.4.0",
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.6",
+    "@remix-project/remix-lib": "^0.5.7",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
     "ethereumjs-util": "^7.0.10",
@@ -61,5 +61,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
   "typings": "index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -39,9 +39,9 @@
     "@ethereumjs/common": "^2.2.0",
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.6",
-    "@remix-project/remix-simulator": "^0.2.6",
-    "@remix-project/remix-solidity": "^0.4.6",
+    "@remix-project/remix-lib": "^0.5.7",
+    "@remix-project/remix-simulator": "^0.2.7",
+    "@remix-project/remix-solidity": "^0.4.7",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
     "axios": ">=0.21.1",
@@ -77,5 +77,5 @@
     "typescript": "^3.3.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remix-ui/renderer/src/lib/renderer.css

@@ -27,6 +27,7 @@
 .remixui_sol.success .close,
 .remixui_sol.error .close,
 .remixui_sol.warning .close {
+    visibility: hidden;
     white-space: pre-line;
     font-weight: bold;
     position: absolute;

libs/remix-ui/renderer/src/lib/renderer.tsx

@@ -102,7 +102,7 @@ export const Renderer = ({ message, opt = {}, plugin }: RendererProps) => {
     <>
       {
         messageText && !close && (
-          <div className={`sol ${editorOptions.type} ${classList}`} data-id={editorOptions.errFile} onClick={() => handleErrorClick(editorOptions)}>
+          <div className={`remixui_sol ${editorOptions.type} ${classList}`} data-id={editorOptions.errFile} onClick={() => handleErrorClick(editorOptions)}>
             { editorOptions.useSpan ? <span> { messageText } </span> : <pre><span>{ messageText }</span></pre> }
             <div className="close" data-id="renderer" onClick={handleClose}>
               <i className="fas fa-times"></i>

libs/remix-url-resolver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Solidity import url resolver engine",
   "main": "index.js",
   "types": "./index.d.ts",
@@ -42,5 +42,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "index.d.ts",
-  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
+  "gitHead": "4705cbc4d1761f75267992552da9db6cff2f3ed5"
 }

libs/remixd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
   "main": "index.js",
   "types": "./index.d.ts",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.18.0-dev",
+  "version": "0.19.0-dev",
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "keywords": [
@@ -136,13 +136,13 @@
     "@ethereumjs/common": "^2.4.0",
     "@ethereumjs/tx": "^3.3.0",
     "@ethereumjs/vm": "^5.5.0",
-    "@remixproject/engine": "^0.3.20-alpha.2",
-    "@remixproject/engine-web": "^0.3.20-alpha.2",
-    "@remixproject/plugin": "^0.3.20-alpha.2",
-    "@remixproject/plugin-api": "^0.3.20-alpha.2",
-    "@remixproject/plugin-utils": "^0.3.20-alpha.2",
-    "@remixproject/plugin-webview": "^0.3.20-alpha.2",
-    "@remixproject/plugin-ws": "^0.3.20-alpha.2",
+    "@remixproject/engine": "^0.3.20",
+    "@remixproject/engine-web": "^0.3.20",
+    "@remixproject/plugin": "^0.3.20",
+    "@remixproject/plugin-api": "^0.3.20",
+    "@remixproject/plugin-utils": "^0.3.20",
+    "@remixproject/plugin-webview": "^0.3.20",
+    "@remixproject/plugin-ws": "^0.3.20",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "axios": ">=0.21.1",