Merge pull request #903 from ethereum/usesplitremix

Make use of remix modules

best-practices.md

@@ -26,7 +26,7 @@
 // user-card.js
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = require('remix-lib').EventManager
 
 var css = csjs`
   .userCard        {
@@ -110,7 +110,7 @@ module.exports = UserCard
 ```js
 /*****************************************************************************/
 // 1. SETUP CONTEXT
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = require('remix-lib').EventManager
 var funds = { event: new EventManager() }
 var userfunds = 15
 function getUserFunds () { return userfunds }

package.json

@@ -19,7 +19,10 @@
     "csjs-inject": "^1.0.1",
     "csslint": "^1.0.2",
     "deep-equal": "^1.0.1",
-    "ethereum-remix": "https://github.com/ethereum/remix",
+    "remix-core": "^0.0.3",
+    "remix-lib": "^0.0.3",
+    "remix-solidity": "^0.0.2",
+    "remix-debugger": "^0.0.3",
     "ethereumjs-abi": "https://github.com/ethereumjs/ethereumjs-abi",
     "ethereumjs-block": "^1.6.0",
     "ethereumjs-tx": "^1.3.3",

src/app.js

@@ -3,8 +3,8 @@
 var $ = require('jquery')
 var csjs = require('csjs-inject')
 var yo = require('yo-yo')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var EventManager = remix.lib.EventManager
+var EventManager = remixLib.EventManager
 
 var UniversalDApp = require('./universal-dapp.js')
 var Remixd = require('./lib/remixd')
@@ -37,7 +37,7 @@ var FileManager = require('./app/files/fileManager')
 var ContextualListener = require('./app/editor/contextualListener')
 var ContextView = require('./app/editor/contextView')
 
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/compiler/compiler.js

@@ -7,7 +7,8 @@ var webworkify = require('webworkify')
 
 var compilerInput = require('./compiler-input')
 
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 
 var txHelper = require('../execution/txHelper')
 

src/app/debugger/debugger.js

@@ -1,6 +1,8 @@
 'use strict'
 
-var remix = require('ethereum-remix')
+var remixDebugger = require('remix-debugger')
+var remixLib = require('remix-lib')
+var remixCore = require('remix-core')
 var executionContext = require('../../execution-context')
 
 /**
@@ -8,13 +10,13 @@ var executionContext = require('../../execution-context')
  */
 function Debugger (id, appAPI, editorEvent) {
   this.el = document.querySelector(id)
-  this.debugger = new remix.ui.Debugger()
+  this.debugger = new remixDebugger.ui.Debugger()
-  this.sourceMappingDecoder = new remix.util.SourceMappingDecoder()
+  this.sourceMappingDecoder = new remixLib.SourceMappingDecoder()
   this.el.appendChild(this.debugger.render())
   this.appAPI = appAPI
   this.isActive = false
 
-  this.breakPointManager = new remix.code.BreakpointManager(this.debugger, (sourceLocation) => {
+  this.breakPointManager = new remixCore.code.BreakpointManager(this.debugger, (sourceLocation) => {
     return appAPI.offsetToLineColumn(sourceLocation, sourceLocation.file, this.editor, this.appAPI.lastCompilationResult().data)
   })
 

src/app/editor/contextView.js

@@ -1,10 +1,10 @@
 'use strict'
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
-var SourceMappingDecoder = remix.util.SourceMappingDecoder
+var SourceMappingDecoder = remixLib.SourceMappingDecoder
 
 var css = csjs`
   .contextview            {

src/app/editor/contextualListener.js

@@ -1,8 +1,8 @@
 'use strict'
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var SourceMappingDecoder = remix.util.SourceMappingDecoder
+var SourceMappingDecoder = remixLib.SourceMappingDecoder
-var AstWalker = remix.util.AstWalker
+var AstWalker = remixLib.AstWalker
-var EventManager = remix.lib.EventManager
+var EventManager = remixLib.EventManager
 
 /*
   trigger contextChanged(nodes)

src/app/editor/editor.js

@@ -1,6 +1,6 @@
 'use strict'
-
+var remixLib = require('remix-lib')
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var ace = require('brace')
@@ -8,8 +8,7 @@ var Range = ace.acequire('ace/range').Range
 require('brace/ext/language_tools')
 var langTools = ace.acequire('ace/ext/language_tools')
 require('./mode-solidity.js')
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/execution/txFormat.js

@@ -4,7 +4,7 @@ var ethJSABI = require('ethereumjs-abi')
 var ethJSUtil = require('ethereumjs-util')
 var BN = ethJSUtil.BN
 var helper = require('./txHelper')
-var TreeView = require('ethereum-remix').ui.TreeView
+var TreeView = require('remix-debugger').ui.TreeView
 var executionContext = require('../../execution-context')
 
 module.exports = {

src/app/execution/txListener.js

@@ -2,9 +2,9 @@
 var async = require('async')
 var ethJSABI = require('ethereumjs-abi')
 var ethJSUtil = require('ethereumjs-util')
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
-var remix = require('ethereum-remix')
+var EventManager = remixLib.EventManager
-var codeUtil = remix.util.code
+var codeUtil = remixLib.util
 var executionContext = require('../../execution-context')
 var txFormat = require('./txFormat')
 var txHelper = require('./txHelper')

src/app/execution/txLogger.js

@@ -4,11 +4,11 @@ const copy = require('clipboard-copy')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
-var EventManager = remix.lib.EventManager
+var EventManager = remixLib.EventManager
 var helper = require('../../lib/helper')
 var executionContext = require('../../execution-context')
 var modalDialog = require('../ui/modal-dialog-custom')

src/app/files/browser-files.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = require('remix-lib').EventManager
 
 function Files (storage) {
   var event = new EventManager()

src/app/files/file-explorer.js

@@ -1,16 +1,15 @@
 /* global FileReader */
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var Treeview = require('ethereum-remix').ui.TreeView
+var Treeview = require('remix-debugger').ui.TreeView
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
-
+var remixLib = require('remix-lib')
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = remixLib.EventManager
 
 var helper = require('../../lib/helper')
 
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/files/fileManager.js

@@ -1,9 +1,9 @@
 'use strict'
 
 var $ = require('jquery')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
 var yo = require('yo-yo')
-var EventManager = remix.lib.EventManager
+var EventManager = remixLib.EventManager
 
 /*
   attach to files event (removed renamed)

src/app/files/shared-folder.js

@@ -1,6 +1,6 @@
 'use strict'
 var async = require('async')
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = require('remix-lib').EventManager
 
 class SharedFolder {
   constructor (remixd) {

src/app/panels/editor-panel.js

@@ -1,8 +1,8 @@
 var csjs = require('csjs-inject')
 var yo = require('yo-yo')
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
-var remix = require('ethereum-remix')
+var EventManager = remixLib.EventManager
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var Terminal = require('./terminal')

src/app/panels/file-panel.js

@@ -3,7 +3,8 @@ var $ = require('jquery')
 var csjs = require('csjs-inject')
 var yo = require('yo-yo')
 var minixhr = require('minixhr')  // simple and small cross-browser XMLHttpRequest (XHR)
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 var FileExplorer = require('../files/file-explorer')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
@@ -11,8 +12,7 @@ var QueryParams = require('../../lib/query-params')
 var queryParams = new QueryParams()
 var helper = require('../../lib/helper')
 
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 module.exports = filepanel

src/app/panels/righthand-panel.js

@@ -1,5 +1,6 @@
 var yo = require('yo-yo')
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 var tabbedMenu = require('../tabs/tabbed-menu')
 var compileTab = require('../tabs/compile-tab')
 var runTab = require('../tabs/run-tab')
@@ -10,8 +11,7 @@ var supportTab = require('../tabs/support-tab')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/panels/terminal.js

@@ -4,15 +4,15 @@ var javascriptserialize = require('javascript-serialize')
 var jsbeautify = require('js-beautify')
 var type = require('component-type')
 var vm = require('vm')
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 var Web3 = require('web3')
 
 var executionContext = require('../../execution-context')
 var Dropdown = require('../ui/dropdown')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/staticanalysis/modules/abstractAstView.js

@@ -1,5 +1,5 @@
 var common = require('./staticAnalysisCommon')
-var AstWalker = require('ethereum-remix').util.AstWalker
+var AstWalker = require('remix-lib').AstWalker
 
 function abstractAstView () {
   this.contracts = []

src/app/staticanalysis/staticAnalysisRunner.js

@@ -1,5 +1,5 @@
 'use strict'
-var AstWalker = require('ethereum-remix').util.AstWalker
+var AstWalker = require('remix-lib').AstWalker
 var list = require('./modules/list')
 
 function staticAnalysisRunner () {

src/app/staticanalysis/staticAnalysisView.js

@@ -5,11 +5,11 @@ var $ = require('jquery')
 var utils = require('../../lib/utils')
 var csjs = require('csjs-inject')
 
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = remixLib.EventManager
 
 var css = csjs`
   .analysis {

src/app/tabs/analysis-tab.js

@@ -2,8 +2,8 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/compile-tab.js

@@ -8,12 +8,12 @@ var parseContracts = require('../contract/contractParser')
 var publishOnSwarm = require('../contract/publishOnSwarm')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
-var TreeView = require('ethereum-remix').ui.TreeView
+var TreeView = require('remix-debugger').ui.TreeView
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/debugger-tab.js

@@ -2,8 +2,8 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/run-tab.js

@@ -11,8 +11,8 @@ const copy = require('clipboard-copy')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/settings-tab.js

@@ -5,8 +5,8 @@ var QueryParams = require('../../lib/query-params')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 var helper = require('../../lib/helper')
 

src/app/tabs/support-tab.js

@@ -2,8 +2,8 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/tabbed-menu.js

@@ -2,8 +2,8 @@ var $ = require('jquery')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 module.exports = tabbedMenu

src/app/ui/dropdown.js

@@ -1,9 +1,9 @@
 var yo = require('yo-yo')
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/ui/modaldialog.js

@@ -1,7 +1,7 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

src/app/ui/renderer.js

@@ -5,8 +5,8 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 // var csjs = require('csjs-inject')
-var remix = require('ethereum-remix')
+var remixLib = require('remix-lib')
-var styleGuide = remix.ui.styleGuide
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = yo`<style>

src/execution-context.js

@@ -1,12 +1,12 @@
 'use strict'
 
 var Web3 = require('web3')
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 var EthJSVM = require('ethereumjs-vm')
 var ethUtil = require('ethereumjs-util')
 var StateManager = require('ethereumjs-vm/lib/stateManager')
-var remix = require('ethereum-remix')
+var Web3VMProvider = remixLib.vm.Web3VMProvider
-var Web3VMProvider = remix.web3.web3VMProvider
 var rlp = ethUtil.rlp
 var modalDialogCustom = require('./app/ui/modal-dialog-custom')
 

src/lib/offsetToLineColumnConverter.js

@@ -1,5 +1,5 @@
 'use strict'
-var SourceMappingDecoder = require('ethereum-remix').util.SourceMappingDecoder
+var SourceMappingDecoder = require('remix-lib').SourceMappingDecoder
 
 function offsetToColumnConverter (compilerEvent) {
   this.lineBreakPositionsByContent = {}

src/lib/remixd.js

@@ -1,5 +1,5 @@
 'use strict'
-var EventManager = require('ethereum-remix').lib.EventManager
+var EventManager = require('remix-lib').EventManager
 var modalDialog = require('../app/ui/modaldialog')
 var yo = require('yo-yo')
 

src/universal-dapp.js

@@ -4,7 +4,8 @@
 var $ = require('jquery')
 var ethJSUtil = require('ethereumjs-util')
 var BN = ethJSUtil.BN
-var EventManager = require('ethereum-remix').lib.EventManager
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
 var crypto = require('crypto')
 var async = require('async')
 var TxRunner = require('./app/execution/txRunner')
@@ -21,8 +22,7 @@ const copy = require('clipboard-copy')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
 
-var remix = require('ethereum-remix')
+var styleGuide = remixLib.ui.styleGuide
-var styleGuide = remix.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`