Refactor remix lib - remix-debug - remix-solidity

apps/remix-ide/src/app/editor/contextView.js

@@ -1,7 +1,7 @@
 'use strict'
 const yo = require('yo-yo')
-const remixLib = require('@remix-project/remix-lib')
-const SourceMappingDecoder = remixLib.SourceMappingDecoder
+const remixDebug = require('@remix-project/remix-debug')
+const SourceMappingDecoder = remixDebug.SourceMappingDecoder
 const globalRegistry = require('../../global/registry')
 
 const css = require('./styles/contextView-styles')

apps/remix-ide/src/app/editor/contextualListener.js

@@ -1,8 +1,8 @@
 'use strict'
-const remixLib = require('@remix-project/remix-lib')
+const remixdebug = require('@remix-project/remix-debug')
 const csjs = require('csjs-inject')
-const SourceMappingDecoder = remixLib.SourceMappingDecoder
-const AstWalker = remixLib.AstWalker
+const SourceMappingDecoder = remixdebug.SourceMappingDecoder
+const AstWalker = remixdebug.AstWalker
 const EventManager = require('../../lib/events')
 const globalRegistry = require('../../global/registry')
 import { Plugin } from '@remixproject/engine'

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

@@ -1,5 +1,5 @@
 const yo = require('yo-yo')
-const remixLib = require('@remix-project/remix-lib')
+const remixDebug = require('@remix-project/remix-debug')
 const css = require('./styles/debugger-tab-styles')
 import toaster from '../ui/tooltip'
 const DebuggerUI = require('./debugger/debuggerUI')
@@ -59,7 +59,7 @@ class DebuggerTab extends ViewPlugin {
       this,
       this.el.querySelector('#debugger'),
       (address, receipt) => {
-        const target = (address && remixLib.helpers.trace.isContractCreation(address)) ? receipt.contractAddress : address
+        const target = (address && remixDebug.traceHelper.isContractCreation(address)) ? receipt.contractAddress : address
         return this.call('fetchAndCompile', 'resolve', target || receipt.contractAddress || receipt.to, '.debug', this.blockchain.web3())
       }
     )

apps/remix-ide/src/app/tabs/debugger/debuggerUI.js

@@ -11,9 +11,9 @@ var EventManager = require('../../../lib/events')
 
 var globalRegistry = require('../../../global/registry')
 
-var remixLib = require('@remix-project/remix-lib')
+var remixDebug = require('@remix-project/remix-debug')
 
-var init = remixLib.init
+var init = remixDebug.init
 
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')

apps/remix-ide/src/lib/cmdInterpreterAPI.js

@@ -1,7 +1,7 @@
 'use strict'
 var yo = require('yo-yo')
 var async = require('async')
-var remixLib = require('@remix-project/remix-lib')
+var remixDebug = require('@remix-project/remix-debug')
 var EventManager = require('../lib/events')
 
 var CompilerImport = require('../app/compiler/compiler-imports')
@@ -116,7 +116,7 @@ class CmdInterpreterAPI {
       }
       self.d.goTo = (row) => {
         if (self._deps.editor.current()) {
-          var breakPoint = new remixLib.code.BreakpointManager(self.d, (sourceLocation) => {
+          var breakPoint = new remixDebug.BreakpointManager(self.d, (sourceLocation) => {
             return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file,
               self._deps.compilersArtefacts['__last'].getSourceCode().sources,
               self._deps.compilersArtefacts['__last'].getAsts())

apps/remix-ide/src/lib/offsetToLineColumnConverter.js

@@ -1,7 +1,7 @@
 'use strict'
 import { Plugin } from '@remixproject/engine'
 import * as packageJson from '../../../../package.json'
-const SourceMappingDecoder = require('@remix-project/remix-lib').SourceMappingDecoder
+var SourceMappingDecoder = require('@remix-project/remix-debug').SourceMappingDecoder
 
 const profile = {
   name: 'offsetToLineColumnConverter',

libs/remix-debug/index.js

@@ -1,4 +1,5 @@
 'use strict'
+const init = require('./src/init')
 const EthDebugger = require('./src/Ethdebugger')
 const TransactionDebugger = require('./src/debugger/debugger')
 const CmdLine = require('./src/cmdline')
@@ -8,8 +9,12 @@ const StorageResolver = require('./src/storage/storageResolver')
 
 const SolidityDecoder = require('./src/solidity-decoder')
 
-const remixLib = require('@remix-project/remix-lib')
-const BreakpointManager = remixLib.code.BreakpointManager
+const BreakpointManager = require('./src/code/breakpointManager')
+
+const SourceMappingDecoder = require('./src/source/sourceMappingDecoder')
+const AstWalker = require('./src/source/astWalker')
+
+const traceHelper = require('./src/trace/traceHelper')
 
 /*
   Use of breakPointManager :
@@ -20,6 +25,10 @@ const BreakpointManager = remixLib.code.BreakpointManager
   this.debugger.setBreakpointManager(breakPointManager)
 */
 module.exports = {
+  init,
+  traceHelper,
+  SourceMappingDecoder,
+  AstWalker,
   EthDebugger: EthDebugger,
   TransactionDebugger: TransactionDebugger,
   /**
@@ -36,4 +45,3 @@ module.exports = {
   },
   CmdLine: CmdLine
 }
-

libs/remix-debug/src/Ethdebugger.js

@@ -1,16 +1,15 @@
 'use strict'
 
-const remixLib = require('@remix-project/remix-lib')
-const TraceManager = remixLib.trace.TraceManager
-const CodeManager = remixLib.code.CodeManager
-const traceHelper = remixLib.helpers.trace
-const EventManager = remixLib.EventManager
-
-const {SolidityProxy, stateDecoder, localDecoder, InternalCallTree} = require('./solidity-decoder')
-
 const StorageViewer = require('./storage/storageViewer')
 const StorageResolver = require('./storage/storageResolver')
 
+const TraceManager = require('./trace/traceManager')
+const CodeManager = require('./code/codeManager')
+const traceHelper = require('./trace/traceHelper')
+const EventManager = require('./eventManager')
+
+const {SolidityProxy, stateDecoder, localDecoder, InternalCallTree} = require('./solidity-decoder')
+
 /**
   * Ethdebugger is a wrapper around a few classes that helps debugging a transaction
   *

libs/remix-debug/src/cmdline/index.js

@@ -1,14 +1,10 @@
 const Web3 = require('web3')
 const Debugger = require('../debugger/debugger.js')
-const ContextManager = require('./contextManager.js')
 import EventManager from 'events'
-const remixLib = require('@remix-project/remix-lib')
-const executionContext = remixLib.execution.executionContext
 
 class CmdLine {
 
   constructor () {
-    this.executionContext = executionContext
     this.events = new EventManager()
     this.lineColumnPos = null
     this.rawLocation = null
@@ -32,21 +28,10 @@ class CmdLine {
   }
 
   initDebugger (cb) {
-    this.contextManager = new ContextManager(this.executionContext)
-
     this.debugger = new Debugger({
-      web3: this.contextManager.getWeb3(),
+      web3: this.web3,
       compilationResult: () => { return this.compilation.compilationResult }
     })
-
-    this.contextManager.event.register('providerChanged', () => {
-      this.debugger.updateWeb3(this.contextManager.getWeb3())
-    })
-
-    this.contextManager.initProviders()
-
-    this.contextManager.addProvider('debugger_web3', this.web3)
-    this.contextManager.switchProvider('debugger_web3', cb)
   }
 
   getSource () {

libs/remix-lib/src/code/breakpointManager.js → libs/remix-debug/src/code/breakpointManager.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const EventManager = require('../eventManager')
-const helper = require('../helpers/traceHelper')
+const helper = require('../trace/traceHelper')
 
 /**
   * allow to manage breakpoint
@@ -21,7 +21,7 @@ class BreakpointManager {
     this.breakpoints = {}
     this.locationToRowConverter = _locationToRowConverter
     this.previousLine
-    this.jumpToCallback = _jumpToCallback || (() => {})
+    this.jumpToCallback = _jumpToCallback || (() => {}) // eslint-disable-line
   }
 
   /**

libs/remix-lib/src/code/codeManager.js → libs/remix-debug/src/code/codeManager.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const EventManager = require('../eventManager')
-const traceHelper = require('../helpers/traceHelper')
-const SourceMappingDecoder = require('../sourceMappingDecoder')
+const traceHelper = require('../trace/traceHelper')
+const SourceMappingDecoder = require('../source/sourceMappingDecoder')
 const CodeResolver = require('./codeResolver')
 
 /*

libs/remix-lib/src/code/disassembler.js → libs/remix-debug/src/code/disassembler.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const parseCode = require('./codeUtils').parseCode
-const util = require('../util')
+const remixLib = require('@remix-project/remix-lib')
+const util = remixLib.util
 
 const createExpressions = function (instructions) {
   const expressions = []

libs/remix-debug/src/debugger/VmDebugger.js

@@ -1,5 +1,5 @@
 const remixLib = require('@remix-project/remix-lib')
-const EventManager = remixLib.EventManager
+const EventManager = require('../eventManager')
 const ui = remixLib.helpers.ui
 const StorageResolver = require('../storage/storageResolver')
 const StorageViewer = require('../storage/storageViewer')

libs/remix-debug/src/debugger/debugger.js

@@ -1,17 +1,16 @@
 'use strict'
 const Ethdebugger = require('../Ethdebugger')
-const remixLib = require('@remix-project/remix-lib')
-const EventManager = remixLib.EventManager
-const traceHelper = remixLib.helpers.trace
-const OffsetToColumnConverter = remixLib.OffsetToColumnConverter
+const EventManager = require('../eventManager')
+const traceHelper = require('../trace/traceHelper')
+const BreakpointManager = require('../code/breakpointManager')
 
 const StepManager = require('./stepManager')
 const VmDebuggerLogic = require('./VmDebugger')
 
 function Debugger (options) {
   this.event = new EventManager()
 
-  this.offsetToLineColumnConverter = options.offsetToLineColumnConverter || (new OffsetToColumnConverter())
+  this.offsetToLineColumnConverter = options.offsetToLineColumnConverter
   /*
     Returns a compilation result for a given address or the last one available if none are found
   */
@@ -22,7 +21,7 @@ function Debugger (options) {
     compilationResult: this.compilationResult
   })
 
-  this.breakPointManager = new remixLib.code.BreakpointManager(this.debugger, async (sourceLocation) => {
+  this.breakPointManager = new BreakpointManager(this.debugger, async (sourceLocation) => {
     const compilationResult = await this.compilationResult()
     if (!compilationResult) return { start: null, end: null }
     return this.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, compilationResult.source.sources, compilationResult.data.sources)

libs/remix-debug/src/debugger/solidityLocals.js

@@ -1,5 +1,4 @@
-const remixLib = require('@remix-project/remix-lib')
-const EventManager = remixLib.EventManager
+const EventManager = require('../eventManager')
 
 const localDecoder = require('../solidity-decoder/localDecoder')
 const StorageViewer = require('../storage/storageViewer')

libs/remix-debug/src/debugger/solidityState.js

@@ -1,5 +1,4 @@
-const remixLib = require('@remix-project/remix-lib')
-const EventManager = remixLib.EventManager
+const EventManager = require('../eventManager')
 const stateDecoder = require('../solidity-decoder/stateDecoder')
 const StorageViewer = require('../storage/storageViewer')
 

libs/remix-debug/src/debugger/stepManager.js

@@ -1,5 +1,5 @@
 const remixLib = require('@remix-project/remix-lib')
-const EventManager = remixLib.EventManager
+const EventManager = require('../eventManager')
 const util = remixLib.util
 
 class DebuggerStepManager {