Create Network out of App

extensions/etherscan-general/index.js

@@ -40,7 +40,7 @@ function load () {
     }
   })
   setInterval(function () {
-    remix.call('app', 'detectNetWork', [], function (error, result) {
+    remix.call('network', 'detectNetWork', [], function (error, result) {
       if (error) console.log(error)
       if (network.innerHTML !== result[0].name + ' - ' + result[0].id) {
         currentNetWork = result[0].name

src/app.js

@@ -6,7 +6,6 @@ var yo = require('yo-yo')
 var async = require('async')
 var request = require('request')
 var remixLib = require('remix-lib')
-var EventManager = require('./lib/events')
 var registry = require('./global/registry')
 var UniversalDApp = require('./universal-dapp.js')
 var UniversalDAppUI = require('./universal-dapp-ui.js')
@@ -54,8 +53,8 @@ import { EntityStore } from './lib/store'
 import { RemixAppManager } from './remixAppManager'
 import { LandingPage } from './app/ui/landing-page/landing-page'
 import framingService from './framingService'
-import { BaseApi } from 'remix-plugin'
 import { ThemeModule } from './app/tabs/theme-module'
+import { NetworkModule } from './app/tabs/network-module'
 
 var css = csjs`
   html { box-sizing: border-box; }
@@ -115,17 +114,9 @@ var css = csjs`
   }
 `
 
-const profile = {
-  name: 'app',
-  description: 'service - provides information about current context (network).',
-  methods: ['getExecutionContextProvider', 'getProviderEndpoint', 'detectNetWork', 'addProvider', 'removeProvider']
-}
-
-class App extends BaseApi {
+class App {
   constructor (api = {}, events = {}, opts = {}) {
-    super(profile)
     var self = this
-    this.event = new EventManager()
     self._components = {}
     registry.put({api: self, name: 'app'})
 
@@ -247,45 +238,6 @@ class App extends BaseApi {
       if (callback) callback(error)
     })
   }
-
-  getExecutionContextProvider () {
-    return new Promise((resolve, reject) => {
-      resolve(executionContext.getProvider())
-    })
-  }
-
-  getProviderEndpoint () {
-    return new Promise((resolve, reject) => {
-      if (executionContext.getProvider() === 'web3') {
-        resolve(executionContext.web3().currentProvider.host)
-      } else {
-        reject('no endpoint: current provider is either injected or vm')
-      }
-    })
-  }
-
-  detectNetWork () {
-    return new Promise((resolve, reject) => {
-      executionContext.detectNetwork((error, network) => {
-        if (error) return reject(error)
-        resolve(network)
-      })
-    })
-  }
-
-  addProvider (name, url) {
-    return new Promise((resolve, reject) => {
-      executionContext.addProvider({ name, url })
-      resolve()
-    })
-  }
-
-  removeProvider (name) {
-    return new Promise((resolve, reject) => {
-      executionContext.removeProvider(name)
-      resolve()
-    })
-  }
 }
 
 module.exports = App
@@ -381,6 +333,10 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   const fileManager = self._components.fileManager
   registry.put({api: fileManager, name: 'filemanager'})
 
+  // ----------------- Network ----------------------------
+  const networkModule = new NetworkModule()
+  registry.put({api: networkModule, name: 'network'})
+
   // ----------------- theme module ----------------------------
   const themeModule = new ThemeModule()
   registry.put({api: themeModule, name: 'themeModule'})
@@ -406,17 +362,18 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
 
   const pluginManagerComponent = new PluginManagerComponent()
   const swapPanelComponent = new SwapPanelComponent('swapPanel', appStore, appManager, { default: true, displayHeader: true })
+  registry.put({api: appManager.proxy(), name: 'pluginmanager'})
+
+  pluginManagerComponent.setApp(appManager)
+  pluginManagerComponent.setStore(appStore)
+
+  // ----------------- Vertical Icon ----------------------------
   const verticalIconsComponent = new VerticalIconsComponent('swapPanel', appStore)
   const swapPanelApi = new SwapPanelApi(swapPanelComponent, verticalIconsComponent) // eslint-disable-line
   const mainPanelApi = new SwapPanelApi(mainPanelComponent, verticalIconsComponent) // eslint-disable-line
   const verticalIconsApi = new VerticalIconsApi(verticalIconsComponent) // eslint-disable-line
-
-  registry.put({api: appManager.proxy(), name: 'pluginmanager'})
   registry.put({api: verticalIconsApi, name: 'verticalicon'})
 
-  pluginManagerComponent.setApp(appManager)
-  pluginManagerComponent.setStore(appStore)
-
   self._components.editorpanel.init()
   self._components.fileManager.init()
 
@@ -471,6 +428,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
     // { profile: support.profile(), api: support },
     settings.api(),
     pluginManagerComponent.api(),
+    networkModule.api(),
     themeModule.api()
   ])
 

src/app/files/fileManager.js

@@ -1,6 +1,5 @@
 'use strict'
 
-import { ApiFactory } from 'remix-plugin'
 import yo from 'yo-yo'
 const EventEmitter = require('events')
 var globalRegistry = require('../../global/registry')

src/app/tabs/network-module.js

@@ -0,0 +1,66 @@
+const executionContext = require('../../execution-context')
+import { NetworkApi } from 'remix-plugin'
+
+export const profile = {
+  name: 'network',
+  description: 'Manage the network (mainnet, ropsten, goerli...) and the provider (web3, vm, injected)'
+}
+
+// Network API has :
+// - events: ['providerChanged']
+// - methods: ['getNetworkProvider', 'getEndpoint', 'detectNetwork', 'addNetwork', 'removeNetwork']
+
+export class NetworkModule extends NetworkApi {
+  constructor () {
+    super(profile)
+    // TODO: See with remix-lib to make sementic coherent
+    executionContext.event.register('contextChanged', (provider) => {
+      this.events.emit('providerChanged', provider)
+    })
+    /*
+    // Events that could be implemented later
+    executionContext.event.register('removeProvider', (provider) => {
+      this.events.emit('networkRemoved', provider)
+    })
+    executionContext.event.register('addProvider', (provider) => {
+      this.events.emit('networkAdded', provider)
+    })
+    executionContext.event.register('web3EndpointChanged', (provider) => {
+      this.events.emit('web3EndpointChanged', provider)
+    })
+    */
+  }
+
+  /** Return the current network provider (web3, vm, injected) */
+  getNetworkProvider () {
+    return executionContext.getProvider()
+  }
+
+  /** Return the current network */
+  detectNetwork () {
+    return new Promise((resolve, reject) => {
+      executionContext.detectNetwork((error, network) => {
+        error ? reject(error) : resolve(network)
+      })
+    })
+  }
+
+  /** Return the url only if network provider is 'web3' */
+  getEndpoint () {
+    const provider = executionContext.getProvider()
+    if (provider !== 'web3') {
+      throw new Error('no endpoint: current provider is either injected or vm')
+    }
+    return provider.web3().currentProvider.host
+  }
+
+  /** Add a custom network to the list of available networks */
+  addNetwork (customNetwork) {
+    executionContext.addProvider(customNetwork)
+  }
+
+  /** Remove a network to the list of availble networks */
+  removeNetwork (name) {
+    executionContext.removeProvider(name)
+  }
+}

test-browser/plugin/plugin.js

@@ -18,7 +18,7 @@ window.onload = function () {
   })
 
   setInterval(function () {
-    extension.call('app', 'detectNetWork', [], function (error, result) {
+    extension.call('network', 'detectNetWork', [], function (error, result) {
       console.log(error, result)
     })
   }, 5000)
@@ -80,12 +80,12 @@ window.onload = function () {
   })
 
   document.querySelector('input#addnetwork').addEventListener('click', function () {
-    extension.call('app', 'addProvider', [document.getElementById('filename').value, document.getElementById('valuetosend').value],
+    extension.call('network', 'addProvider', [document.getElementById('filename').value, document.getElementById('valuetosend').value],
     function (error, result) { console.log(error, result) })
   })
 
   document.querySelector('input#removenetwork').addEventListener('click', function () {
-    extension.call('app', 'removeProvider', [document.getElementById('filename').value],
+    extension.call('network', 'removeProvider', [document.getElementById('filename').value],
     function (error, result) { console.log(error, result) })
   })
 }