Merge branch 'master' into intl

apps/remix-ide-e2e/src/tests/remixd.test.ts

@@ -158,7 +158,7 @@ module.exports = {
         writeFileSync('./apps/remix-ide/contracts/hardhat/artifacts/contracts/Lock.sol/Lock.dbg.json', JSON.stringify(hardhat_compilation_Lock_dbg))
         done()
       })
-      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from hardhat').before(60000)
+      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from Hardhat').before(60000)
 
     browser.clickLaunchIcon('filePanel')
       .openFile('contracts')
@@ -186,7 +186,7 @@ module.exports = {
         console.log('working directory', process.cwd())
         connectRemixd(browser, done)
       })
-      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from hardhat').before(60000)
+      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from Hardhat').before(60000)
 
     browser.clickLaunchIcon('filePanel')
       .openFile('contracts')
@@ -210,7 +210,7 @@ module.exports = {
         writeFileSync('./apps/remix-ide/contracts/foundry/out/Counter.sol/Counter.json', JSON.stringify(foundryCompilation))
         done()
       })
-      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from foundry').before(60000)
+      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from Foundry').before(60000)
 
     let contractAaddress
     browser.clickLaunchIcon('filePanel')
@@ -245,7 +245,7 @@ module.exports = {
         writeFileSync('./apps/remix-ide/contracts/truffle/build/contracts/Migrations.json', JSON.stringify(truffle_compilation))
         done()
       })
-      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from truffle').before(60000)
+      .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from Truffle').before(60000)
 
     browser.clickLaunchIcon('filePanel')
       .openFile('contracts')

apps/remix-ide/src/app/files/foundry-handle.js

@@ -15,4 +15,12 @@ export class FoundryHandle extends WebsocketPlugin {
   constructor () {
     super(profile)
   }
+
+  callPluginMethod(key, payload = []) {
+    if (this.socket.readyState !== this.socket.OPEN) {
+      console.log(`${this.profile.name} connection is not opened.`)
+      return false
+    }
+    return super.callPluginMethod(key, payload)
+  }
 }

apps/remix-ide/src/app/files/git-handle.js

@@ -15,4 +15,12 @@ export class GitHandle extends WebsocketPlugin {
   constructor () {
     super(profile)
   }
+
+  callPluginMethod(key, payload = []) {
+    if (this.socket.readyState !== this.socket.OPEN) {
+      console.log(`${this.profile.name} connection is not opened.`)
+      return false
+    }
+    return super.callPluginMethod(key, payload)
+  }
 }

apps/remix-ide/src/app/files/hardhat-handle.js

@@ -15,4 +15,12 @@ export class HardhatHandle extends WebsocketPlugin {
   constructor () {
     super(profile)
   }
+
+  callPluginMethod(key, payload = []) {
+    if (this.socket.readyState !== this.socket.OPEN) {
+      console.log(`${this.profile.name} connection is not opened.`)
+      return false
+    }
+    return super.callPluginMethod(key, payload)
+  }
 }

apps/remix-ide/src/app/files/slither-handle.js

@@ -16,4 +16,12 @@ export class SlitherHandle extends WebsocketPlugin {
   constructor () {
     super(profile)
   }
+
+  callPluginMethod(key, payload = []) {
+    if (this.socket.readyState !== this.socket.OPEN) {
+      console.log(`${this.profile.name} connection is not opened.`)
+      return false
+    }
+    return super.callPluginMethod(key, payload)
+  }
 }

apps/remix-ide/src/app/files/truffle-handle.js

@@ -15,4 +15,13 @@ export class TruffleHandle extends WebsocketPlugin {
   constructor () {
     super(profile)
   }
+
+  callPluginMethod(key, payload = []) {
+    if (this.socket.readyState !== this.socket.OPEN) {
+      console.log(`${this.profile.name} connection is not opened.`)
+      return false
+    }
+    return super.callPluginMethod(key, payload)
+  }
+
 }

apps/remix-ide/src/app/plugins/remixd-handle.tsx

@@ -44,8 +44,10 @@ export class RemixdHandle extends WebsocketPlugin {
 
   async deactivate() {
     for (const plugin of this.dependentPlugins) {
+      if (await this.appManager.isActive(plugin)) {
         await this.appManager.deactivatePlugin(plugin)
       }
+    }
     if (super.socket) super.deactivate()
     // this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
     this.localhostProvider.close((error) => {
@@ -60,9 +62,21 @@ export class RemixdHandle extends WebsocketPlugin {
 
   async canceled() {
     for (const plugin of this.dependentPlugins) {
+      if (await this.appManager.isActive(plugin)) {
         await this.appManager.deactivatePlugin(plugin)
       }
+    }
+
     await this.appManager.deactivatePlugin('remixd')
+
+  }
+
+  async callPluginMethod(key: string, payload?: any[]) {
+    if (this.socket.readyState !== this.socket.OPEN) {
+      console.log(`${this.profile.name} connection is not opened.`)
+      return false
+    }
+    return super.callPluginMethod(key, payload)
   }
 
   /**

libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx

@@ -254,7 +254,6 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
         }>
           <button className="btn d-flex py-0" onClick={_ => props.syncContracts()}>
             <i style={{ cursor: 'pointer' }} className="fa fa-refresh mr-2 mt-2" aria-hidden="true"></i>
-            <label data-id="" className="mt-2">HardHat</label>
           </button>
         </OverlayTrigger>
       </div>

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

@@ -5,6 +5,7 @@ import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint
 import { OverlayTrigger, Tooltip } from 'react-bootstrap' // eslint-disable-line
 import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'
 import './remix-ui-tabs.css'
+const _paq = window._paq = window._paq || []
 
 /* eslint-disable-next-line */
 export interface TabsUIProps {
@@ -152,8 +153,10 @@ export const TabsUI = (props: TabsUIProps) => {
               const content = await props.plugin.call('fileManager', "readFile", path)
               if (tabsState.currentExt === 'js' || tabsState.currentExt === 'ts') {
                 await props.plugin.call('scriptRunner', 'execute', content)
+                _paq.push(['trackEvent', 'editor', 'clickRunFromEditor', tabsState.currentExt])
               } else if (tabsState.currentExt === 'sol' || tabsState.currentExt === 'yul') {
                 await props.plugin.call('solidity', 'compile', path)
+                _paq.push(['trackEvent', 'editor', 'clickRunFromEditor', tabsState.currentExt])
               }
             }}
           >

libs/remixd/src/services/foundryClient.ts

@@ -36,7 +36,7 @@ export class FoundryClient extends PluginClient {
   compile (configPath: string) {
     return new Promise((resolve, reject) => {
       if (this.readOnly) {
-        const errMsg = '[Hardhat Compilation]: Cannot compile in read-only mode'
+        const errMsg = '[Foundry Compilation]: Cannot compile in read-only mode'
         return reject(new Error(errMsg))
       }
       const cmd = `forge build`
@@ -79,7 +79,7 @@ export class FoundryClient extends PluginClient {
     }
     if (!this.warnlog) {
       // @ts-ignore
-      this.call('terminal', 'log', 'receiving compilation result from foundry')
+      this.call('terminal', 'log', 'receiving compilation result from Foundry')
       this.warnlog = true
     }
   }
@@ -145,9 +145,9 @@ export class FoundryClient extends PluginClient {
   }
 
   async sync () {
-    console.log('syncing from foundry')
+    console.log('syncing from Foundry')
     this.processArtifact()
     // @ts-ignore
-    this.call('terminal', 'log', 'synced with foundry')
+    this.call('terminal', 'log', 'synced with Foundry')
   }
 }

libs/remixd/src/services/hardhatClient.ts

@@ -68,7 +68,6 @@ export class HardhatClient extends PluginClient {
       const contractFilePath = join(this.buildPath, file)
       const stat = await fs.stat(contractFilePath)
       if (!stat.isDirectory()) continue
-      console.log('pp ', contractFilePath)
       const files = await fs.readdir(contractFilePath)
       const compilationResult = {
         input: {},
@@ -89,7 +88,7 @@ export class HardhatClient extends PluginClient {
           compilationResult.target = jsonStd.sourceName
 
           // this is the full compilation result
-          console.log('processing hardhat artifact', file)
+          console.log('Processing Hardhat artifact for file: ', file)
           const path = join(contractFilePath, jsonDbg.buildInfo)
           const content = await fs.readFile(path, { encoding: 'utf-8' })
           
@@ -102,7 +101,7 @@ export class HardhatClient extends PluginClient {
     }
     if (!this.warnLog) {
       // @ts-ignore
-      this.call('terminal', 'log', 'receiving compilation result from hardhat')
+      this.call('terminal', 'log', 'receiving compilation result from Hardhat')
       this.warnLog = true
     }
   }
@@ -121,10 +120,10 @@ export class HardhatClient extends PluginClient {
   }
 
   async sync () {
-    console.log('syncing from hardhat')
+    console.log('syncing from Hardhat')
     this.processArtifact()
     // @ts-ignore
-    this.call('terminal', 'log', 'synced with hardhat')
+    this.call('terminal', 'log', 'synced with Hardhat')
   }
 
   async feedContractArtifactFile (artifactContent, compilationResultPart) {

libs/remixd/src/services/truffleClient.ts

@@ -82,7 +82,7 @@ export class TruffleClient extends PluginClient {
     }
     if (!this.warnLog) {
       // @ts-ignore
-      this.call('terminal', 'log', 'receiving compilation result from truffle')
+      this.call('terminal', 'log', 'receiving compilation result from Truffle')
       this.warnLog = true
     }
   }
@@ -137,9 +137,9 @@ export class TruffleClient extends PluginClient {
   }
 
   async sync () {
-    console.log('syncing from truffle')
+    console.log('syncing from Truffle')
     this.processArtifact()
     // @ts-ignore
-    this.call('terminal', 'log', 'synced with truffle')
+    this.call('terminal', 'log', 'synced with Truffle')
   }
 }