fix usage of solidity logic

apps/remix-ide/src/app.js

@@ -454,7 +454,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
 
   engine.register([
     compileTab,
-    compileTab.compileTabLogic,
     run,
     debug,
     analysis,

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

@@ -25,7 +25,7 @@ const profile = {
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
   version: packageJson.version,
-  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile']
+  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile', 'getCompilerState']
 }
 
 // EditorApi:

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

@@ -30,13 +30,10 @@ export const CompilerApiMixin = (Base) => class extends Base {
   }
 
   onActivation () {
-    this.call('manager', 'activatePlugin', 'solidity-logic')
     this.listenToEvents()    
   }
 
-  onDeactivation () {
+  onDeactivation () {}
-    this.call('manager', 'deactivatePlugin', 'solidity-logic')
-  }
 
   resolveContentAndSave (url) {
     return this.call('contentImport', 'resolveAndSave', url)
@@ -62,8 +59,8 @@ export const CompilerApiMixin = (Base) => class extends Base {
     return this.compileTabLogic.compiler.state.lastCompilationResult
   }
 
-  addExternalFile (fileName, content) {
+  getCompilerState () {
-    this.fileProvider.addExternal(fileName, content)
+    return this.compileTabLogic.getCompilerState()
   }
 
   /**

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

@@ -12,7 +12,7 @@ const profile = {
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
   version: '0.0.1',
-  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile']
+  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile' ,'getCompilerState']
 }
 
 export interface ConfigurationSettings {

libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx

@@ -29,7 +29,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => {
 
             modal(`Published ${contract.name}'s Metadata`, publishMessage(result.uploaded))
             // triggered each time there's a new verified publish (means hash correspond)
-            api.addExternalFile('swarm/' + result.item.hash, result.item.content)
+            api.writeFile('swarm/' + result.item.hash, result.item.content)
           } catch (err) {
             let parseError = err
             try {
@@ -43,7 +43,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => {
 
             modal(`Published ${contract.name}'s Metadata`, publishMessage(result.uploaded))
             // triggered each time there's a new verified publish (means hash correspond)
-            api.addExternalFile('ipfs/' + result.item.hash, result.item.content)
+            api.writeFile('ipfs/' + result.item.hash, result.item.content)
           } catch (err) {
             modal('IPFS Publish Failed', publishMessageFailed(storage, err))
           }

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

@@ -23,6 +23,5 @@ export interface ICompilerApi {
     writeFile: (file: string, content: string) => Promise<void>
     readFile: (file: string) => Promise<string>
     open: (file: string) => void
-    addExternalFile: (file: string, content: string) => void
     onCurrentFileChanged: (listener: onCurrentFileChanged) => void
 }

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

@@ -1,15 +1,5 @@
-import { Plugin } from '@remixproject/engine'
-
-const packageJson = require('../../../../../../package.json')
 const Compiler = require('@remix-project/remix-solidity').Compiler
 const EventEmitter = require('events')
-const profile = {
-  name: 'solidity-logic',
-  displayName: 'Solidity compiler logic',
-  description: 'Compile solidity contracts - Logic',
-  methods: ['getCompilerState'],
-  version: packageJson.version
-}
 
 declare global {
   interface Window {
@@ -18,7 +8,7 @@ declare global {
 }
 const _paq = window._paq = window._paq || []  //eslint-disable-line
 
-export class CompileTab extends Plugin {
+export class CompileTab {
   public compiler
   public optimize
   public runs
@@ -27,7 +17,6 @@ export class CompileTab extends Plugin {
   public event
 
   constructor (public api, public contentImport) {
-    super(profile)
     this.event = new EventEmitter()
     this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
   }

libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx

@@ -217,7 +217,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           })
           // Slither Analysis
           if (slitherEnabled) {
-            props.analysisModule.call('solidity-logic', 'getCompilerState').then(async (compilerState) => {
+            props.analysisModule.call('solidity', 'getCompilerState').then((compilerState) => {
               const { currentVersion, optimize, evmVersion } = compilerState
               props.analysisModule.call('terminal', 'log', { type: 'info', value: '[Slither Analysis]: Running...' })
               _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyzeWithSlither'])