Merge pull request #2582 from ethereum/refactor_iuri

refactor, abstract and remove dependencies on executionContext and udapp - 2

src/app.js

@@ -22,9 +22,8 @@ var toolTip = require('./app/ui/tooltip')
 var CompilerMetadata = require('./app/files/compiler-metadata')
 var CompilerImport = require('./app/compiler/compiler-imports')
 
-var executionContext = remixLib.execution.executionContext
-
-const Blockchain = require('./app/tabs/runTab/model/blockchain.js')
+const Blockchain = require('./blockchain/blockchain.js')
+const PluginUDapp = require('./blockchain/pluginUDapp.js')
 
 const PluginManagerComponent = require('./app/components/plugin-manager-component')
 const CompilersArtefacts = require('./app/compiler/compiler-artefacts')
@@ -50,7 +49,6 @@ import { HiddenPanel } from './app/components/hidden-panel'
 import { VerticalIcons } from './app/components/vertical-icons'
 import { LandingPage } from './app/ui/landing-page/landing-page'
 import { MainPanel } from './app/components/main-panel'
-import { UniversalDApp } from 'remix-lib'
 
 import migrateFileSystem from './migrateFileSystem'
 
@@ -225,9 +223,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   const fileManager = new FileManager(editor)
   registry.put({api: fileManager, name: 'filemanager'})
 
-  // ----------------- universal dapp: run transaction, listen on transactions, decode events
-  const udapp = new UniversalDApp(registry.get('config').api, executionContext)
-  const blockchain = new Blockchain(executionContext, udapp)
+  const blockchain = new Blockchain(registry.get('config').api)
+  const pluginUdapp = new PluginUDapp(blockchain)
 
   // ----------------- compilation metadata generation servive ----------------------------
   const compilerMetadataGenerator = new CompilerMetadata(blockchain, fileManager, registry.get('config').api)
@@ -237,7 +234,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
 
   const {eventsDecoder, txlistener} = makeUdapp(blockchain, compilersArtefacts, (domEl) => mainview.getTerminal().logHtml(domEl))
   // ----------------- network service (resolve network id / name) ----------------------------
-  const networkModule = new NetworkModule(executionContext)
+  const networkModule = new NetworkModule(blockchain)
   // ----------------- convert offset to line/column service ----------------------------
   var offsetToLineColumnConverter = new OffsetToLineColumnConverter()
   registry.put({api: offsetToLineColumnConverter, name: 'offsettolinecolumnconverter'})
@@ -300,8 +297,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   )
   const run = new RunTab(
     blockchain,
-    udapp,
-    executionContext,
+    pluginUdapp,
     registry.get('config').api,
     registry.get('filemanager').api,
     registry.get('editor').api,
@@ -311,7 +307,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
     mainview
   )
   const analysis = new AnalysisTab(registry)
-  const debug = new DebuggerTab(executionContext)
+  const debug = new DebuggerTab(blockchain)
   const test = new TestTab(
     registry.get('filemanager').api,
     filePanel,

src/app/tabs/debugger-tab.js

@@ -21,10 +21,10 @@ const profile = {
 
 class DebuggerTab extends ViewPlugin {
 
-  constructor (executionContext) {
+  constructor (blockchain) {
     super(profile)
     this.el = null
-    this.executionContext = executionContext
+    this.blockchain = blockchain
   }
 
   render () {
@@ -34,7 +34,7 @@ class DebuggerTab extends ViewPlugin {
       <div class="${css.debuggerTabView}" id="debugView">
         <div id="debugger" class="${css.debugger}"></div>
       </div>`
-    this.debuggerUI = new DebuggerUI(this.el.querySelector('#debugger'), this.executionContext)
+    this.debuggerUI = new DebuggerUI(this.el.querySelector('#debugger'), this.blockchain)
     return this.el
   }
 

src/app/tabs/debugger/debuggerUI.js

@@ -30,9 +30,9 @@ var css = csjs`
 
 class DebuggerUI {
 
-  constructor (container, executionContext) {
+  constructor (container, blockchain) {
     this.registry = globalRegistry
-    this.executionContext = executionContext
+    this.blockchain = blockchain
     this.event = new EventManager()
 
     this.isActive = false
@@ -105,13 +105,13 @@ class DebuggerUI {
 
   getDebugWeb3 () {
     return new Promise((resolve, reject) => {
-      this.executionContext.detectNetwork((error, network) => {
+      this.blockchain.detectNetwork((error, network) => {
         let web3
         if (error || !network) {
-          web3 = init.web3DebugNode(this.executionContext.web3())
+          web3 = init.web3DebugNode(this.blockchain.web3())
         } else {
           const webDebugNode = init.web3DebugNode(network.name)
-          web3 = !webDebugNode ? this.executionContext.web3() : webDebugNode
+          web3 = !webDebugNode ? this.blockchain.web3() : webDebugNode
         }
         init.extendWeb3(web3)
         resolve(web3)

src/app/tabs/network-module.js

@@ -14,11 +14,11 @@ export const profile = {
 // - methods: ['getNetworkProvider', 'getEndpoint', 'detectNetwork', 'addNetwork', 'removeNetwork']
 
 export class NetworkModule extends Plugin {
-  constructor (executionContext) {
+  constructor (blockchain) {
     super(profile)
-    this.executionContext = executionContext
+    this.blockchain = blockchain
     // TODO: See with remix-lib to make sementic coherent
-    this.executionContext.event.register('contextChanged', (provider) => {
+    this.blockchain.event.register('contextChanged', (provider) => {
       this.emit('providerChanged', provider)
     })
     /*
@@ -37,34 +37,34 @@ export class NetworkModule extends Plugin {
 
   /** Return the current network provider (web3, vm, injected) */
   getNetworkProvider () {
-    return this.executionContext.getProvider()
+    return this.blockchain.getProvider()
   }
 
   /** Return the current network */
   detectNetwork () {
     return new Promise((resolve, reject) => {
-      this.executionContext.detectNetwork((error, network) => {
+      this.blockchain.detectNetwork((error, network) => {
         error ? reject(error) : resolve(network)
       })
     })
   }
 
   /** Return the url only if network provider is 'web3' */
   getEndpoint () {
-    const provider = this.executionContext.getProvider()
+    const provider = this.blockchain.getProvider()
     if (provider !== 'web3') {
       throw new Error('no endpoint: current provider is either injected or vm')
     }
-    return this.executionContext.web3().currentProvider.host
+    return this.blockchain.web3().currentProvider.host
   }
 
   /** Add a custom network to the list of available networks */
   addNetwork (customNetwork) {
-    this.executionContext.addProvider(customNetwork)
+    this.blockchain.addProvider(customNetwork)
   }
 
   /** Remove a network to the list of availble networks */
   removeNetwork (name) {
-    this.executionContext.removeProvider(name)
+    this.blockchain.removeProvider(name)
   }
 }