added Berlin, fixed config file logic

apps/remix-ide/src/app/tabs/compile-tab.js

@@ -56,6 +56,10 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     this.renderComponent()
   }
 
+  onFileRemoved () {
+    this.renderComponent()
+  }
+
   onNoFileSelected () {
     this.renderComponent()
   }

apps/solidity-compiler/src/app/compiler-api.ts

@@ -19,6 +19,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
   onCurrentFileChanged: (fileName: string) => void
   // onResetResults: () => void
   onSetWorkspace: (isLocalhost: boolean, workspaceName: string) => void
+  onFileRemoved: (path: string) => void
   onNoFileSelected: () => void
   onCompilationFinished: (compilationDetails: { contractMap: { file: string } | Record<string, any>, contractsDetails: Record<string, any> }) => void
   onSessionSwitched: () => void
@@ -240,6 +241,10 @@ export const CompilerApiMixin = (Base) => class extends Base {
       if (this.onSetWorkspace) this.onSetWorkspace(workspace.isLocalhost, workspace.name)
     })
 
+    this.on('fileManager', 'fileRemoved', (path) => {
+      if (this.onFileRemoved) this.onFileRemoved(path)
+    })
+
     this.on('remixd', 'rootFolderChanged', () => {
       this.resetResults()
       if (this.onSetWorkspace) this.onSetWorkspace(true, 'localhost')

libs/remix-lib/src/types/ICompilerApi.ts

@@ -25,6 +25,7 @@ export interface ICompilerApi {
     onCurrentFileChanged: (fileName: string) => void
     // onResetResults: () => void,
     onSetWorkspace: (isLocalhost: boolean, workspaceName: string) => void
+    onFileRemoved: (path: string) => void
     onNoFileSelected: () => void
     onCompilationFinished: (contractsDetails: any, contractMap: any) => void
     onSessionSwitched: () => void

libs/remix-ui/editor/src/lib/remix-plugin-types.ts

@@ -226,7 +226,7 @@ declare interface CondensedCompilationInput {
     optimize: boolean
     /** e.g: 0.6.8+commit.0bbfe453 */
     version: string
-    evmVersion?: 'istanbul' | 'petersburg' | 'constantinople' | 'byzantium' | 'spuriousDragon' | 'tangerineWhistle' | 'homestead'
+    evmVersion?: 'berlin' | 'istanbul' | 'petersburg' | 'constantinople' | 'byzantium' | 'spuriousDragon' | 'tangerineWhistle' | 'homestead'
 }
 
 declare interface ContentImport {

libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx

@@ -22,11 +22,23 @@ declare global {
 const _paq = window._paq = window._paq || [] //eslint-disable-line
 
 export const CompilerContainer = (props: CompilerContainerProps) => {
-  const { api, compileTabLogic, tooltip, modal, compiledFileName, updateCurrentVersion, configurationSettings, isHardhatProject, isTruffleProject, workspaceName } = props // eslint-disable-line
+  const {
+    api,
+    compileTabLogic,
+    tooltip,
+    modal,
+    compiledFileName,
+    updateCurrentVersion,
+    configurationSettings,
+    isHardhatProject,
+    isTruffleProject,
+    workspaceName,
+    configFilePath,
+    setConfigFilePath,
+  } = props // eslint-disable-line
   const [state, setState] = useState({
     hideWarnings: false,
     autoCompile: false,
-    configFilePath: "compiler_config.json",
     useFileConfiguration: false,
     matomoAutocompileOnce: true,
     optimize: false,
@@ -40,7 +52,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     compiledFileName: '',
     includeNightlies: false,
     language: 'Solidity',
-    evmVersion: ''
+    evmVersion: '',
+    createFileOnce: true
   })
   const [showFilePathInput, setShowFilePathInput] = useState<boolean>(false)
   const [toggleExpander, setToggleExpander] = useState<boolean>(false)
@@ -53,17 +66,27 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   const [compilerContainer, dispatch] = useReducer(compilerReducer, compilerInitialState)
 
   useEffect(() => {
-    api.setAppParameter('configFilePath', "/compiler_config.json")
-    api.fileExists("/compiler_config.json").then((exists) => {
-      if (!exists) createNewConfigFile()
-      else {
-        // what to do? discuss
-      }
+    api.setAppParameter('configFilePath', "compiler_config.json")
+
+    if (state.useFileConfiguration) {
+      api.fileExists("compiler_config.json").then((exists) => {
+        if (!exists || state.useFileConfiguration ) createNewConfigFile()
       })
-    api.setAppParameter('configFilePath', "/compiler_config.json")
+    }
+
+    api.setAppParameter('configFilePath', "compiler_config.json")
     setShowFilePathInput(false)
   }, [workspaceName])
 
+  useEffect(() => {
+    
+    if (state.useFileConfiguration)
+      api.fileExists("compiler_config.json").then((exists) => {
+        if (!exists || state.useFileConfiguration ) createNewConfigFile()
+      })
+  }, [state.useFileConfiguration])
+
+
   useEffect(() => {
     const listener = (event) => {
       if (configFilePathInput.current !== event.target) {
@@ -106,8 +129,10 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
         const hideWarnings = await api.getAppParameter('hideWarnings') as boolean || false
         const includeNightlies = await api.getAppParameter('includeNightlies') as boolean || false
         const useFileConfiguration = await api.getAppParameter('useFileConfiguration') as boolean || false
-        let configFilePath = await api.getAppParameter('configFilePath')
-        if (!configFilePath || configFilePath == '') configFilePath = "/compiler_config.json"
+        let configFilePathSaved = await api.getAppParameter('configFilePath')
+        if (!configFilePathSaved || configFilePathSaved == '') configFilePathSaved = "compiler_config.json"
+
+        setConfigFilePath(configFilePathSaved)
 
         setState(prevState => {
           const params = api.getCompilerParameters()
@@ -122,7 +147,6 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
             autoCompile: autocompile,
             includeNightlies: includeNightlies,
             useFileConfiguration: useFileConfiguration,
-            configFilePath: configFilePath,
             optimize: optimize,
             runs: runs,
             evmVersion: (evmVersion !== null) && (evmVersion !== 'null') && (evmVersion !== undefined) && (evmVersion !== 'undefined') ? evmVersion : 'default',
@@ -181,7 +205,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
 
   useEffect(() => {
     compileTabLogic.setUseFileConfiguration(state.useFileConfiguration)
-    if (state.useFileConfiguration) compileTabLogic.setConfigFilePath(state.configFilePath)
+    if (state.useFileConfiguration) compileTabLogic.setConfigFilePath(configFilePath)
   }, [state.useFileConfiguration])
 
   useEffect(() => {
@@ -191,6 +215,16 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   }, [configurationSettings])
 
   const toggleConfigType = () => {
+    if (state.useFileConfiguration)
+      if (state.createFileOnce) {
+        api.fileExists("compiler_config.json").then((exists) => {
+          if (!exists || state.useFileConfiguration ) createNewConfigFile()
+        })
+        setState(prevState => {
+          return { ...prevState, createFileOnce: false }
+        })
+      }
+    
     setState(prevState => {
       api.setAppParameter('useFileConfiguration', !state.useFileConfiguration)
       return { ...prevState, useFileConfiguration: !state.useFileConfiguration }
@@ -198,18 +232,16 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   }
 
   const openFile = async () => {
-    api.open(state.configFilePath)
+    api.open(configFilePath)
   }
 
   const createNewConfigFile = async () => {
-    let filePath = configFilePathInput.current && configFilePathInput.current.value !== '' ? configFilePathInput.current.value : state.configFilePath
+    let filePath = configFilePathInput.current && configFilePathInput.current.value !== '' ? configFilePathInput.current.value : configFilePath
     if (!filePath.endsWith('.json')) filePath = filePath + '.json'
 
     await api.writeFile(filePath, configFileContent)
     api.setAppParameter('configFilePath', filePath)
-    setState(prevState => {
-      return { ...prevState, configFilePath: filePath }
-    })
+    setConfigFilePath(filePath)
     compileTabLogic.setConfigFilePath(filePath)
     setShowFilePathInput(false)
   }
@@ -220,9 +252,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
 
       if (await api.fileExists(configFilePathInput.current.value)) {
         api.setAppParameter('configFilePath', configFilePathInput.current.value)
-        setState(prevState => {
-          return { ...prevState, configFilePath: configFilePathInput.current.value }
-        })
+        setConfigFilePath(configFilePathInput.current.value)
         compileTabLogic.setConfigFilePath(configFilePathInput.current.value)
 
         setShowFilePathInput(false)
@@ -755,10 +785,10 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
           <div className={`pt-2 ml-4 ml-2 align-items-start justify-content-between d-flex`}>
             { (!showFilePathInput && state.useFileConfiguration) && <span
               title="Click to open the config file."
-              onClick={openFile}
-              className="py-2 text-primary remixui_compilerConfigPath"
-            >{state.configFilePath}</span> }
-            { (!showFilePathInput&& !state.useFileConfiguration) && <span className="py-2 text-secondary">{state.configFilePath}</span> }
+              onClick={configFilePath === '' ? () => {} : openFile}
+              className="py-2 remixui_compilerConfigPath"
+            >{configFilePath === '' ? 'No file selected.' : configFilePath}</span> }
+            { (!showFilePathInput && !state.useFileConfiguration) && <span className="py-2 text-secondary">{configFilePath}</span> }
             <input
               ref={configFilePathInput}
               className={`py-0 my-0 form-control ${showFilePathInput ? "d-flex" : "d-none"}`}
@@ -775,11 +805,12 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
           </div>
         </div>
         <div className="px-4">
-          <button id="compileBtn" data-id="compilerContainerCompileBtn" className="btn btn-primary btn-block d-block w-100 text-break remixui_disabled mb-1 mt-3" onClick={compile} disabled={disableCompileButton}>
+          <button id="compileBtn" data-id="compilerContainerCompileBtn" className="btn btn-primary btn-block d-block w-100 text-break remixui_disabled mb-1 mt-3" onClick={compile} disabled={(configFilePath === '' && state.useFileConfiguration) || disableCompileButton}>
             <OverlayTrigger overlay={
               <Tooltip id="overlay-tooltip-compile">
                 <div className="text-left">
-                  <div><b>Ctrl+S</b> for compiling</div>
+                  { !(configFilePath === '' && state.useFileConfiguration) && <div><b>Ctrl+S</b> for compiling</div> }
+                  { (configFilePath === '' && state.useFileConfiguration) && <div> No config file selected</div> }
                 </div>
               </Tooltip>
             }>
@@ -790,11 +821,12 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
             </OverlayTrigger>
           </button>
           <div className='d-flex align-items-center'>            
-            <button id="compileAndRunBtn" data-id="compilerContainerCompileAndRunBtn" className="btn btn-secondary btn-block d-block w-100 text-break remixui_solidityCompileAndRunButton d-inline-block remixui_disabled mb-1 mt-3" onClick={compileAndRun} disabled={disableCompileButton}>
+            <button id="compileAndRunBtn" data-id="compilerContainerCompileAndRunBtn" className="btn btn-secondary btn-block d-block w-100 text-break remixui_solidityCompileAndRunButton d-inline-block remixui_disabled mb-1 mt-3" onClick={compileAndRun} disabled={(configFilePath === '' && state.useFileConfiguration) || disableCompileButton}>
               <OverlayTrigger overlay={
                 <Tooltip id="overlay-tooltip-compile-run">
                   <div className="text-left">
-                  <div><b>Ctrl+Shift+S</b> for compiling and script execution</div>
+                    { !(configFilePath === '' && state.useFileConfiguration) && <div><b>Ctrl+Shift+S</b> for compiling and script execution</div> }
+                    { (configFilePath === '' && state.useFileConfiguration) && <div> No config file selected</div> }
                   </div>
                 </Tooltip>
               }>

libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts

@@ -24,7 +24,7 @@ export class CompileTabLogic {
   constructor (public api: ICompilerApi, public contentImport) {
     this.event = new EventEmitter()
     this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
-    this.evmVersions = ['default', 'london', 'istanbul', 'petersburg', 'constantinople', 'byzantium', 'spuriousDragon', 'tangerineWhistle', 'homestead']
+    this.evmVersions = ['default', 'berlin', 'london', 'istanbul', 'petersburg', 'constantinople', 'byzantium', 'spuriousDragon', 'tangerineWhistle', 'homestead']
   }
 
   init () {

libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx

@@ -15,6 +15,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
     isTruffleProject: false,
     workspaceName: '',
     currentFile,
+    configFilePath: 'compiler_config.json',
     loading: false,
     compileTabLogic: null,
     compiler: null,
@@ -72,6 +73,13 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
     })
   }
   
+  api.onFileRemoved = (path: string) => {
+    if (path === state.configFilePath)
+      setState(prevState => {
+        return { ...prevState, configFilePath: '' }
+      })
+  }
+
   api.onNoFileSelected = () => {
     setState(prevState => {
       return { ...prevState, currentFile: '' }
@@ -103,6 +111,13 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
     setBadgeStatus({ ...badgeStatus, [currentFile]: data })
   }
 
+  const setConfigFilePath = (path: string) => {
+    setState(prevState => {
+      return { ...prevState, configFilePath: path }
+    })
+  }
+
+
   const toast = (message: string) => {
     setState(prevState => {
       return { ...prevState, toasterMsg: message }
@@ -162,6 +177,8 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
           compiledFileName={currentFile}
           updateCurrentVersion={updateCurrentVersion}
           configurationSettings={configurationSettings}
+          configFilePath={state.configFilePath}
+          setConfigFilePath={setConfigFilePath}
         />
         { contractsFile[currentFile] && contractsFile[currentFile].contractsDetails && <ContractSelection api={api} contractsDetails={contractsFile[currentFile].contractsDetails} contractList={contractsFile[currentFile].contractList} modal={modal} /> }
         { compileErrors[currentFile] &&

libs/remix-ui/solidity-compiler/src/lib/types/index.ts

@@ -16,7 +16,9 @@ export interface CompilerContainerProps {
   modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
   compiledFileName: string,
   updateCurrentVersion: any,
-  configurationSettings: ConfigurationSettings
+  configurationSettings: ConfigurationSettings,
+  configFilePath: string,
+  setConfigFilePath: (path: string) => void
 }
 export interface ContractSelectionProps {
   api: ICompilerApi,