update state

Author: bunsenstraat

libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts

@@ -152,7 +152,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
    * @param {object} settings {evmVersion, optimize, runs, version, language}
    */
   async compileWithParameters (compilationTargets: Source, settings: CompilerInputOptions) {
-    const compilerState = this.getCompilerState()
+    const compilerState = await this.getCompilerState()
     const version = settings.version || compilerState.currentVersion
     const settingsCompile: CompilerInput = JSON.parse(compilerInputFactory(null, settings))
     const res = await compile(
@@ -165,8 +165,8 @@ export const CompilerApiMixin = (Base) => class extends Base {
   }
 
   // This function is used for passing the compiler configuration to 'remix-tests'
-  getCurrentCompilerConfig () {
-    const compilerState = this.getCompilerState()
+  async getCurrentCompilerConfig () {
+    const compilerState = await this.getCompilerState()
     const compilerDetails: any = {
       currentVersion: compilerState.currentVersion,
       evmVersion: compilerState.evmVersion,

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

@@ -56,6 +56,7 @@ export class CompileTabLogic {
     if (this.language != null) {
       this.compiler.set('language', this.language)
     }
+
   }
 
   setOptimize (newOptimizeValue: boolean) {
@@ -64,9 +65,11 @@ export class CompileTabLogic {
     this.compiler.set('optimize', this.optimize)
   }
 
-  setUseFileConfiguration (useFileConfiguration: boolean) {
+  async setUseFileConfiguration (useFileConfiguration: boolean) {
     this.useFileConfiguration = useFileConfiguration
+    console.log('setUseFileConfiguration', useFileConfiguration)
     this.compiler.set('useFileConfiguration', useFileConfiguration)
+    await this.setCompilerConfigContent()
   }
 
   setConfigFilePath (path) {
@@ -85,7 +88,10 @@ export class CompileTabLogic {
     this.compiler.set('evmVersion', this.evmVersion)
   }
 
-  getCompilerState () {
+  async getCompilerState () {
+    await this.setCompilerMappings()
+    await this.setCompilerConfigContent()
+    console.log('getCompilerState', this.compiler)
     return this.compiler.state
   }
 
@@ -99,6 +105,23 @@ export class CompileTabLogic {
     this.compiler.set('language', lang)
   }
 
+  async setCompilerMappings () {
+      if (await this.api.fileExists('remappings.txt')) {
+        this.api.readFile('remappings.txt').then(remappings => {
+          this.compiler.set('remappings', remappings.split('\n').filter(Boolean))
+        })
+      } else this.compiler.set('remappings', [])
+  }
+  
+  async setCompilerConfigContent () {
+      if (this.configFilePath && this.useFileConfiguration) {
+        this.api.readFile(this.configFilePath).then(content => {
+          this.compiler.set('configFileContent', content)
+        })
+      }
+  }
+
+
   /**
    * Compile a specific file of the file manager
    * @param {string} target the path to the file to compile
@@ -110,16 +133,8 @@ export class CompileTabLogic {
         const sources = { [target]: { content } }
         this.event.emit('removeAnnotations')
         this.event.emit('startingCompilation')
-        if (await this.api.fileExists('remappings.txt')) {
-          this.api.readFile('remappings.txt').then(remappings => {
-            this.compiler.set('remappings', remappings.split('\n').filter(Boolean))
-          })
-        } else this.compiler.set('remappings', [])
-        if (this.configFilePath) {
-          this.api.readFile(this.configFilePath).then( contentConfig => {
-            this.compiler.set('configFileContent', contentConfig)
-          })
-        }
+        await this.setCompilerMappings()
+        await this.setCompilerConfigContent()
         // setTimeout fix the animation on chrome... (animation triggered by 'staringCompilation')
         setTimeout(() => { this.compiler.compile(sources, target); resolve(true) }, 100)
       }).catch((error) => {

libs/remix-ui/solidity-compiler/src/lib/reducers/compiler.ts

@@ -14,6 +14,7 @@ export const compilerInitialState = {
 }
 
 export const compilerReducer = (state = compilerInitialState, action: Action) => {
+  console.log('compilerReducer', action)
   switch (action.type) {
   case 'SET_COMPILER_MODE': {
     return {