Merge branch 'master' into remove-unused-files

04d471ab · David Disu · GitHub · e125ba10 · 3bc9d9e1 · 04d471ab
Unverified Commit 04d471ab authored Jul 30, 2021 by David Disu Committed by GitHub Jul 30, 2021
24 changed files
--- a/apps/remix-ide-e2e/src/commands/verifyContracts.ts
+++ b/apps/remix-ide-e2e/src/commands/verifyContracts.ts
@@ -22,6 +22,9 @@ function verifyContracts (browser: NightwatchBrowser, compiledContractNames: str
      if (opts.version) {
        browser
          .click('*[data-id="compilation-details"]')
+          .waitForElementVisible('*[data-id="remixui_treeviewitem_metadata"]')
+          .pause(2000)
+          .click('*[data-id="remixui_treeviewitem_metadata"]')
          .waitForElementVisible('*[data-id="treeViewDivtreeViewItemcompiler"]')
          .pause(2000)
          .click('*[data-id="treeViewDivtreeViewItemcompiler"]')

--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -361,6 +361,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
    settings
  ])
+  const queryParams = new QueryParams()
+  const params = queryParams.get()
  const onAcceptMatomo = () => {
    _paq.push(['forgetUserOptOut'])
    // @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
@@ -368,12 +371,21 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
    settings.updateMatomoAnalyticsChoice(true)
    const el = document.getElementById('modal-dialog')
    el.parentElement.removeChild(el)
+    startWalkthroughService()
  }
  const onDeclineMatomo = () => {
    settings.updateMatomoAnalyticsChoice(false)
    _paq.push(['optUserOut'])
    const el = document.getElementById('modal-dialog')
    el.parentElement.removeChild(el)
+    startWalkthroughService()
+  }
+  const startWalkthroughService = () => {
+    const walkthroughService = new WalkthroughService(localStorage)
+    if (!params.code && !params.url && !params.minimizeterminal && !params.gist && !params.minimizesidepanel) {
+      walkthroughService.start()
+    }
  }
  // Ask to opt in to Matomo for remix, remix-alpha and remix-beta
@@ -407,6 +419,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
        fn: null
      }
    )
+  } else {
+    startWalkthroughService()
  }
  // CONTENT VIEWS & DEFAULT PLUGINS
@@ -469,9 +483,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
  await appManager.activatePlugin(['settings'])
  await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport'])
-  const queryParams = new QueryParams()
-  const params = queryParams.get()
  // Set workspace after initial activation
  if (Array.isArray(workspace)) {
    appManager.activatePlugin(workspace).then(async () => {
@@ -505,9 +516,4 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
  if (params.embed) framingService.embed()
  framingService.start(params)
-  const walkthroughService = new WalkthroughService(localStorage)
-  if (!params.code) {
-    walkthroughService.start()
-  }
 }
--- a/apps/remix-ide/src/app/tabs/analysis-tab.js
+++ b/apps/remix-ide/src/app/tabs/analysis-tab.js
@@ -50,9 +50,7 @@ class AnalysisTab extends ViewPlugin {
  renderComponent () {
    ReactDOM.render(
      <RemixUiStaticAnalyser
-        analysisRunner={this.runner}
        registry={this.registry}
-        staticanalysis={this.staticanalysis}
        analysisModule={this}
        event={this.event}
      />,

--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -216,7 +216,7 @@ export class LandingPage extends ViewPlugin {
    const invertNum = (themeQuality === 'dark') ? 1 : 0
    if (this.solEnv.getElementsByTagName('img')[0]) this.solEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.debuggerEnv.getElementsByTagName('img')[0]) this.debuggerEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
+    if (this.optimismEnv.getElementsByTagName('img')[0]) this.optimismEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
    if (this.solhintEnv.getElementsByTagName('img')[0]) this.solhintEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
    if (this.learnEthEnv.getElementsByTagName('img')[0]) this.learnEthEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
    if (this.sourcifyEnv.getElementsByTagName('img')[0]) this.sourcifyEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
@@ -277,10 +277,10 @@ export class LandingPage extends ViewPlugin {
      this.verticalIcons.select('solidity')
      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solidity'])
    }
-    const startDebugger = async () => {
+    const startOptimism = async () => {
-      await this.appManager.activatePlugin('debugger')
+      await this.appManager.activatePlugin('optimism-compiler')
-      this.verticalIcons.select('debugger')
+      this.verticalIcons.select('optimism-compiler')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'debugger'])
+      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'optimism-compiler'])
    }
    const startSolhint = async () => {
      await this.appManager.activatePlugin(['solidity', 'solhint'])
@@ -385,8 +385,8 @@ export class LandingPage extends ViewPlugin {
    // main
    this.solEnv = createLargeButton('assets/img/solidityLogo.webp', 'solidityLogo', 'Solidity', startSolidity)
    // Featured
-    this.debuggerEnv = createLargeButton('assets/img/debuggerLogo.webp', 'debuggerLogo', 'Debugger', startDebugger)
+    this.optimismEnv = createLargeButton('assets/img/optimismLogo.webp', 'optimismLogo', 'Optimism', startOptimism)
-    this.solhintEnv = createLargeButton('assets/img/solhintLogo.png', 'solhintLogo', 'solhint linter', startSolhint)
+    this.solhintEnv = createLargeButton('assets/img/solhintLogo.png', 'solhintLogo', 'Solhint linter', startSolhint)
    this.learnEthEnv = createLargeButton('assets/img/learnEthLogo.webp', 'learnEthLogo', 'LearnEth', startLearnEth)
    this.sourcifyEnv = createLargeButton('assets/img/sourcifyLogo.webp', 'sourcifyLogo', 'Sourcify', startSourceVerify)
    this.moreEnv = createLargeButton('assets/img/moreLogo.webp', 'moreLogo', 'More', startPluginManager)
@@ -395,7 +395,7 @@ export class LandingPage extends ViewPlugin {
    const themeQuality = globalRegistry.get('themeModule').api.currentTheme().quality
    const invertNum = (themeQuality === 'dark') ? 1 : 0
    this.solEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.debuggerEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
+    this.optimismEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
    this.solhintEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
    this.learnEthEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
    this.sourcifyEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
@@ -505,10 +505,10 @@ export class LandingPage extends ViewPlugin {
                    <h4>Featured Plugins</h4>
                    <div class="d-flex flex-row pt-2">
                      ${this.solEnv}
+                      ${this.optimismEnv}
                      ${this.learnEthEnv}
                      ${this.solhintEnv}
-                      ${this.sourcifyEnv}
+                      ${this.sourcifyEnv}                      
-                      ${this.debuggerEnv}
                      ${this.moreEnv}
                    </div>
                  </div>

--- a/apps/remix-ide/src/assets/img/optimismLogo.webp
+++ b/apps/remix-ide/src/assets/img/optimismLogo.webp
--- a/apps/remix-ide/src/assets/js/editor/darkTheme.js
+++ b/apps/remix-ide/src/assets/js/editor/darkTheme.js
@@ -109,7 +109,7 @@ ace.define("ace/theme/remixDark",["require","exports","module","ace/lib/dom"], f
  }\
  .ace-remixDark .ace_type {\
  color:#75ceef;\
-  }]\
+  }\
  .ace-remixDark .ace_visibility (\
    color:#f7d777;\
  )\

--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
 {
  "name": "@remix-project/remix-analyzer",
-  "version": "0.5.12",
+  "version": "0.5.13",
  "description": "Tool to perform static analysis on Solidity smart contracts",
  "main": "index.js",
  "types": ".index.d.ts",
@@ -23,7 +23,7 @@
    "@ethereumjs/tx": "^3.2.1",
    "@ethereumjs/vm": "^5.4.1",
    "@remix-project/remix-astwalker": "^0.0.26",
-    "@remix-project/remix-lib": "^0.5.3",
+    "@remix-project/remix-lib": "^0.5.4",
    "async": "^2.6.2",
    "ethereumjs-util": "^7.0.10",
    "ethers": "^5.1.4",
@@ -51,5 +51,5 @@
    "typescript": "^3.7.5"
  },
  "typings": "index.d.ts",
-  "gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-astwalker/package.json
+++ b/libs/remix-astwalker/package.json
 {
  "name": "@remix-project/remix-astwalker",
-  "version": "0.0.33",
+  "version": "0.0.34",
  "description": "Tool to walk through Solidity AST",
  "main": "index.js",
  "scripts": {
@@ -37,7 +37,7 @@
    "@ethereumjs/block": "^3.3.0",
    "@ethereumjs/tx": "^3.2.1",
    "@ethereumjs/vm": "^5.4.1",
-    "@remix-project/remix-lib": "^0.5.3",
+    "@remix-project/remix-lib": "^0.5.4",
    "@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": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-debug/package.json
+++ b/libs/remix-debug/package.json
 {
  "name": "@remix-project/remix-debug",
-  "version": "0.5.3",
+  "version": "0.5.4",
  "description": "Tool to debug Ethereum transactions",
  "contributors": [
    {
@@ -23,7 +23,7 @@
    "@ethereumjs/tx": "^3.2.1",
    "@ethereumjs/vm": "^5.4.1",
    "@remix-project/remix-astwalker": "^0.0.26",
-    "@remix-project/remix-lib": "^0.5.3",
+    "@remix-project/remix-lib": "^0.5.4",
    "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": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
 {
  "name": "@remix-project/remix-lib",
-  "version": "0.5.3",
+  "version": "0.5.4",
  "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": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
 {
  "name": "@remix-project/remix-simulator",
-  "version": "0.2.3",
+  "version": "0.2.4",
  "description": "Ethereum IDE and tools for the web",
  "contributors": [
    {
@@ -18,7 +18,7 @@
    "@ethereumjs/common": "^2.2.0",
    "@ethereumjs/tx": "^3.2.1",
    "@ethereumjs/vm": "^5.4.1",
-    "@remix-project/remix-lib": "^0.5.3",
+    "@remix-project/remix-lib": "^0.5.4",
    "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": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
 {
  "name": "@remix-project/remix-solidity",
-  "version": "0.4.3",
+  "version": "0.4.4",
  "description": "Tool to load and run Solidity compiler",
  "main": "index.js",
  "types": "./index.d.ts",
@@ -18,7 +18,7 @@
    "@ethereumjs/block": "^3.3.0",
    "@ethereumjs/tx": "^3.2.1",
    "@ethereumjs/vm": "^5.4.1",
-    "@remix-project/remix-lib": "^0.5.3",
+    "@remix-project/remix-lib": "^0.5.4",
    "async": "^2.6.2",
    "eslint-scope": "^5.0.0",
    "ethereumjs-util": "^7.0.10",
@@ -59,5 +59,5 @@
  },
  "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
  "typings": "index.d.ts",
-  "gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
 {
  "name": "@remix-project/remix-tests",
-  "version": "0.2.3",
+  "version": "0.2.4",
  "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.2.1",
    "@ethereumjs/vm": "^5.4.1",
-    "@remix-project/remix-lib": "^0.5.3",
+    "@remix-project/remix-lib": "^0.5.4",
-    "@remix-project/remix-simulator": "^0.2.3",
+    "@remix-project/remix-simulator": "^0.2.4",
-    "@remix-project/remix-solidity": "^0.4.3",
+    "@remix-project/remix-solidity": "^0.4.4",
    "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": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
@@ -16,6 +16,24 @@ export const ModalDialog = (props: ModalDialogProps) => {
    modal.current.focus()
  }, [props.hide])
+  useEffect(() => {
+    function handleBlur (e) {
+      if (!e.currentTarget.contains(e.relatedTarget)) {
+        e.stopPropagation()
+        if (document.activeElement !== this) {
+          handleHide()
+        }
+      }
+    }
+    if (modal.current) {
+      modal.current.addEventListener('blur', handleBlur)
+      return () => {
+        modal.current.removeEventListener('blur', handleBlur)
+      }
+    }
+  }, [modal.current])
  const modalKeyEvent = (keyCode) => {
    if (keyCode === 27) { // Esc
      if (props.cancelFn) props.cancelFn()
@@ -40,13 +58,6 @@ export const ModalDialog = (props: ModalDialogProps) => {
    handleHide()
  }
-  const handleBlur = (e) => {
-    if (!e.currentTarget.contains(e.relatedTarget)) {
-      e.stopPropagation()
-      handleHide()
-    }
-  }
  return (
    <div
      data-id={`${props.id}ModalDialogContainer-react`}
@@ -58,7 +69,6 @@ export const ModalDialog = (props: ModalDialogProps) => {
    >
      <div className="modal-dialog" role="document">
        <div
-          onBlur={handleBlur}
          ref={modal}
          tabIndex={-1}
          className={'modal-content remixModalContent ' + (props.modalClass ? props.modalClass : '')}

--- a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
+++ b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
 import IpfsClient from 'ipfs-mini'
 const ipfsNodes = [
-  new IpfsClient({ host: 'ipfs.komputing.org', port: 443, protocol: 'https' }),
+  new IpfsClient({ host: 'ipfs.remixproject.org', port: 443, protocol: 'https' }),
  new IpfsClient({ host: 'ipfs.infura.io', port: 5001, protocol: 'https' }),
  new IpfsClient({ host: '127.0.0.1', port: 5001, protocol: 'http' })
 ]

--- a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
@@ -44,7 +44,7 @@ export const listenToEvents = (editor, compileTabLogic) => (dispatch: React.Disp
  })
  compileTabLogic.compiler.event.register('loadingCompiler', () => {
-    dispatch(setCompilerMode('compilationDuration'))
+    dispatch(setCompilerMode('loadingCompiler'))
  })
  compileTabLogic.compiler.event.register('compilerLoaded', () => {

--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -8,6 +8,14 @@ import { resetEditorMode, listenToEvents } from './actions/compiler'
 import './css/style.css'
+declare global {
+  interface Window {
+    _paq: any
+  }
+}
+const _paq = window._paq = window._paq || [] //eslint-disable-line
 export const CompilerContainer = (props: CompilerContainerProps) => {
  const { editor, config, queryParams, compileTabLogic, tooltip, modal, compiledFileName, setHardHatCompilation, updateCurrentVersion, isHardHatProject, configurationSettings  } = props // eslint-disable-line
  const [state, setState] = useState({
@@ -27,8 +35,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
    language: '',
    evmVersion: ''
  })
+  const [disableCompileButton, setDisableCompileButton] = useState<boolean>(false)
  const compileIcon = useRef(null)
-  const warningIcon = useRef(null)
  const promptMessageInput = useRef(null)
  const [hhCompilation, sethhCompilation] = useState(false)
  const [compilerContainer, dispatch] = useReducer(compilerReducer, compilerInitialState)
@@ -75,6 +83,9 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
  }, [compileTabLogic])
  useEffect(() => {
+    const isDisabled = !compiledFileName || (compiledFileName && !isSolFileSelected(compiledFileName))
+    setDisableCompileButton(isDisabled)
    setState(prevState => {
      return { ...prevState, compiledFileName }
    })
@@ -235,14 +246,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
  }
  const compilationDuration = (speed: number) => {
-    if (!warningIcon.current) return
    if (speed > 1000) {
-      const msg = `Last compilation took ${speed}ms. We suggest to turn off autocompilation.`
+      console.log(`Last compilation took ${speed}ms. We suggest to turn off autocompilation.`)
-      warningIcon.current.setAttribute('title', msg)
-      warningIcon.current.style.visibility = 'visible'
-    } else {
-      warningIcon.current.style.visibility = 'hidden'
    }
  }
@@ -256,8 +261,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
    if (!compileIcon.current) return
    compileIcon.current.setAttribute('title', 'compiler is loading, please wait a few moments.')
    compileIcon.current.classList.add('remixui_spinningIcon')
-    warningIcon.current.style.visibility = 'hidden'
    _updateLanguageSelector()
+    setDisableCompileButton(true)
  }
  const compilerLoaded = () => {
@@ -265,6 +270,9 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
    compileIcon.current.setAttribute('title', '')
    compileIcon.current.classList.remove('remixui_spinningIcon')
    if (state.autoCompile) compile()
+    const isDisabled = !compiledFileName || (compiledFileName && !isSolFileSelected(compiledFileName))
+    setDisableCompileButton(isDisabled)
  }
  const compilationFinished = () => {
@@ -272,6 +280,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
    compileIcon.current.setAttribute('title', 'idle')
    compileIcon.current.classList.remove('remixui_spinningIcon')
    compileIcon.current.classList.remove('remixui_bouncingIcon')
+    _paq.push(['trackEvent', 'compiler', 'compiled_with_version', _retrieveVersion()])
  }
  const scheduleCompilation = () => {
@@ -292,7 +301,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
    if (!isSolFileSelected()) return
    _setCompilerVersionFromPragma(currentFile)
-    compileTabLogic.runCompiler()
+    compileTabLogic.runCompiler(hhCompilation)
  }
  const _retrieveVersion = (version?) => {
@@ -440,6 +449,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
  const handleNightliesChange = (e) => {
    const checked = e.target.checked
+    if (!checked) handleLoadVersion(state.defaultVersion)
    config.set('includeNightlies', checked)
    setState(prevState => {
      return { ...prevState, includeNightlies: checked }
@@ -522,6 +532,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
            <label className="remixui_compilerLabel form-check-label" htmlFor="evmVersionSelector">EVM Version</label>
            <select value={state.evmVersion} onChange={(e) => handleEvmVersionChange(e.target.value)} className="custom-select" id="evmVersionSelector">
              <option data-id={state.evmVersion === 'default' ? 'selected' : ''} value="default">compiler default</option>
+              <option data-id={state.evmVersion === 'berlin' ? 'selected' : ''} value="berlin">berlin</option>
              <option data-id={state.evmVersion === 'muirGlacier' ? 'selected' : ''} value="muirGlacier">muirGlacier</option>
              <option data-id={state.evmVersion === 'istanbul' ? 'selected' : ''} value="istanbul">istanbul</option>
              <option data-id={state.evmVersion === 'petersburg' ? 'selected' : ''} value="petersburg">petersburg</option>
@@ -566,11 +577,10 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
              <label className="form-check-label custom-control-label" htmlFor="enableHardhat">Enable Hardhat Compilation</label>
            </div>
          }
-          <button id="compileBtn" data-id="compilerContainerCompileBtn" className="btn btn-primary btn-block remixui_disabled mt-3" title="Compile" onClick={compile} disabled={!state.compiledFileName || (state.compiledFileName && !isSolFileSelected(state.compiledFileName))}>
+          <button id="compileBtn" data-id="compilerContainerCompileBtn" className="btn btn-primary btn-block remixui_disabled mt-3" title="Compile" onClick={compile} disabled={disableCompileButton}>
            <span>
-              <i ref={warningIcon} title="Compilation Slow" style={{ visibility: 'hidden' }} className="remixui_warnCompilationSlow fas fa-exclamation-triangle" aria-hidden="true"></i>
+              { <i ref={compileIcon} className="fas fa-sync remixui_icon" aria-hidden="true"></i> }
-              { warningIcon.current && warningIcon.current.style.visibility === 'hidden' && <i ref={compileIcon} className="fas fa-sync remixui_icon" aria-hidden="true"></i> }
+              Compile { typeof state.compiledFileName === 'string' ? helper.extractNameFromKey(state.compiledFileName) || '<no file selected>' : '<no file selected>' }
-              Compile { state.compiledFileName || '<no file selected>' }
            </span>
          </button>
        </header>

--- a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
@@ -162,17 +162,25 @@ export const ContractSelection = (props: ContractSelectionProps) => {
    }
    const contractProperties = contractsDetails[selectedContract] || {}
    const log = <div className="remixui_detailsJSON">
-      {
+      <TreeView>
-        Object.keys(contractProperties).map((propertyName, index) => {
+        {
-          const copyDetails = <span className="remixui_copyDetails"><CopyToClipboard content={contractProperties[propertyName]} direction='top' /></span>
+          Object.keys(contractProperties).map((propertyName, index) => {
-          const questionMark = <span className="remixui_questionMark"><i title={ help[propertyName] } className="fas fa-question-circle" aria-hidden="true"></i></span>
+            const copyDetails = <span className="remixui_copyDetails"><CopyToClipboard content={contractProperties[propertyName]} direction='top' /></span>
+            const questionMark = <span className="remixui_questionMark"><i title={ help[propertyName] } className="fas fa-question-circle" aria-hidden="true"></i></span>
-          return (<div className="remixui_log" key={index}>
-            <div className="remixui_key">{ propertyName } { copyDetails } { questionMark }</div>
+            return (
-            { insertValue(contractProperties, propertyName) }
+              <div className="remixui_log" key={index}>
-          </div>)
+                <TreeViewItem
-        })
+                  label={
-      }
+                    <div data-id={`remixui_treeviewitem_${propertyName}`} className="remixui_key">{ propertyName } { copyDetails } { questionMark }</div>
+                  }>
+                  { insertValue(contractProperties, propertyName) }
+                </TreeViewItem>
+              </div>
+            )
+          })
+        }
+      </TreeView>
    </div>
    modal(selectedContract, log, 'Close', null)

--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -65,7 +65,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
  useEffect(() => {
    compilation(props.analysisModule, dispatch)
-  }, [])
+  }, [props])
  useEffect(() => {
    setWarningState({})
@@ -89,9 +89,13 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
      dispatch({ type: '', payload: {} })
      // Show 'Enable Slither Analysis' checkbox
      if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither('visible')
+      else {
+        setShowSlither('hidden')
+        setSlitherEnabled(false)
+      }
    })
    return () => { }
-  }, [props.analysisModule])
+  }, [props])
  const message = (name, warning, more, fileName, locationString) : string => {
    return (`
@@ -245,8 +249,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                  showWarnings(warningMessage, 'warningModuleName')
                  props.event.trigger('staticAnaysisWarning', [warningCount])
                }
-              }).catch((error) => {
+              }).catch(() => {
-                console.log('Error found:', error) // This should be removed once testing done
                props.analysisModule.call('terminal', 'log', { type: 'error', value: '[Slither Analysis]: Error occured! See remixd console for details.' })
                showWarnings(warningMessage, 'warningModuleName')
              })

--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
 {
  "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.24",
+  "version": "0.0.25",
  "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": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
+  "gitHead": "664824605fa84648c79770631da371d4f81e0052"
 }
\ No newline at end of file
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
 {
  "name": "@remix-project/remixd",
-  "version": "0.4.2",
+  "version": "0.5.0",
  "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",

--- a/libs/remixd/src/services/slitherClient.ts
+++ b/libs/remixd/src/services/slitherClient.ts
@@ -120,9 +120,9 @@ export class SlitherClient extends PluginClient {
        allowPaths = allowPathString
        remaps = remapString.trim()
      }
-      const allowPathsOption: string = allowPaths ? `--allow-paths ${allowPaths}` : ''
+      const allowPathsOption: string = allowPaths ? `--allow-paths ${allowPaths} ` : ''
-      const optimizeOption: string = optimize ? ' --optimize ' : ''
+      const optimizeOption: string = optimize ? '--optimize ' : ''
-      const evmOption: string = evmVersion ? ` --evm-version ${evmVersion}` : ''
+      const evmOption: string = evmVersion ? `--evm-version ${evmVersion}` : ''
      const solcArgs: string = optimizeOption || evmOption || allowPathsOption ? `--solc-args '${allowPathsOption}${optimizeOption}${evmOption}'` : ''
      const solcRemaps = remaps ? `--solc-remaps "${remaps}"` : ''

--- a/package-lock.json
+++ b/package-lock.json
 {
  "name": "remix-project",
-  "version": "0.15.0-dev",
+  "version": "0.16.0-dev",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -11244,17 +11244,6 @@
            }
          }
        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
        "glob-parent": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
@@ -12067,16 +12056,6 @@
            "to-regex-range": "^2.1.0"
          }
        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
        "glob-parent": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -17556,6 +17535,16 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
+    "fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      }
+    },
    "fstream": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -30111,17 +30100,6 @@
            }
          }
        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
        "glob-parent": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
--- a/package.json
+++ b/package.json
 {
  "name": "remix-project",
-  "version": "0.15.0-dev",
+  "version": "0.16.0-dev",
  "license": "MIT",
  "description": "Ethereum Remix Monorepo",
  "keywords": [