`
- )
}
StepManager.prototype.reset = function () {
diff --git a/src/app/debugger/remix-debugger/src/ui/StoragePanel.js b/src/app/debugger/remix-debugger/src/ui/StoragePanel.js
index cd4573e4f7..3fdb8218c5 100644
--- a/src/app/debugger/remix-debugger/src/ui/StoragePanel.js
+++ b/src/app/debugger/remix-debugger/src/ui/StoragePanel.js
@@ -1,7 +1,7 @@
'use strict'
var DropdownPanel = require('./DropdownPanel')
-var remixCore = require('remix-core')
-var StorageViewer = remixCore.storage.StorageViewer
+var remixDebug = require('remix-debug')
+var StorageViewer = remixDebug.storage.StorageViewer
var yo = require('yo-yo')
function StoragePanel (_parent, _traceManager) {
diff --git a/src/app/debugger/remix-debugger/src/ui/TxBrowser.js b/src/app/debugger/remix-debugger/src/ui/TxBrowser.js
index f2d6a00aa1..b326cfe41f 100644
--- a/src/app/debugger/remix-debugger/src/ui/TxBrowser.js
+++ b/src/app/debugger/remix-debugger/src/ui/TxBrowser.js
@@ -1,5 +1,4 @@
var remixLib = require('remix-lib')
-var global = remixLib.global
var EventManager = remixLib.EventManager
var traceHelper = remixLib.helpers.trace
var yo = require('yo-yo')
@@ -24,8 +23,8 @@ var css = csjs`
}
.txinput {
${styles.rightPanel.debuggerTab.input_Debugger}
- min-width: 30px;
margin: 3px;
+ width: inherit;
}
.txbuttons {
width: 100%;
@@ -34,6 +33,10 @@ var css = csjs`
}
.txbutton {
${styles.rightPanel.debuggerTab.button_Debugger}
+ width: inherit;
+ }
+ .txbuttonstart {
+ ${styles.rightPanel.debuggerTab.button_Debugger}
}
.txbutton:hover {
color: ${styles.rightPanel.debuggerTab.button_Debugger_icon_HoverColor};
@@ -43,16 +46,16 @@ var css = csjs`
margin-bottom: 10px;
}
`
-function TxBrowser (_parent) {
+function TxBrowser (_parent, opts) {
this.event = new EventManager()
this.blockNumber
this.txNumber
this.view
- this.displayConnectionSetting = true
+ this.displayConnectionSetting = opts.displayConnectionSetting
+ this.web3 = opts.web3
var self = this
_parent.event.register('providerChanged', this, function (provider) {
- self.displayConnectionSetting = provider === 'INTERNAL'
self.setDefaultValues()
if (self.view) {
yo.update(self.view, self.render())
@@ -73,19 +76,23 @@ TxBrowser.prototype.setDefaultValues = function () {
}
}
-TxBrowser.prototype.submit = function () {
+TxBrowser.prototype.submit = function (tx) {
+ var self = this
+ self.event.trigger('newTxLoading', [this.blockNumber, this.txNumber])
+ if (tx) {
+ return self.update(null, tx)
+ }
if (!this.txNumber) {
+ self.update('no tx index or tx hash to look for')
return
}
- this.event.trigger('newTxLoading', [this.blockNumber, this.txNumber])
try {
- var self = this
if (this.txNumber.indexOf('0x') !== -1) {
- global.web3.eth.getTransaction(this.txNumber, function (error, result) {
+ self.web3.eth.getTransaction(this.txNumber, function (error, result) {
self.update(error, result)
})
} else {
- global.web3.eth.getTransactionFromBlock(this.blockNumber, this.txNumber, function (error, result) {
+ self.web3.eth.getTransactionFromBlock(this.blockNumber, this.txNumber, function (error, result) {
self.update(error, result)
})
}
@@ -150,9 +157,9 @@ TxBrowser.prototype.updateTxN = function (ev) {
this.txNumber = ev.target.value
}
-TxBrowser.prototype.load = function (txHash) {
+TxBrowser.prototype.load = function (txHash, tx) {
this.txNumber = txHash
- this.submit()
+ this.submit(tx)
}
TxBrowser.prototype.unload = function (txHash) {
@@ -184,8 +191,8 @@ TxBrowser.prototype.render = function () {
-
-
+
+
diff --git a/src/app/debugger/remix-debugger/src/ui/VmDebugger.js b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
index 9e8be588b7..06953b2ccf 100644
--- a/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
+++ b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
@@ -11,79 +11,82 @@ var StepDetail = require('./StepDetail')
var DropdownPanel = require('./DropdownPanel')
var SolidityState = require('./SolidityState')
var SolidityLocals = require('./SolidityLocals')
-var remixCore = require('remix-core')
-var StorageResolver = remixCore.storage.StorageResolver
+var remixDebug = require('remix-debug')
+var StorageResolver = remixDebug.storage.StorageResolver
var yo = require('yo-yo')
var css = csjs`
.asmCode {
float: left;
- width: 250px;
+ width: 50%;
}
.stepDetail {
- float: right;
+ }
+ .vmheadView {
+ margin-top:10px;
}
`
-function VmDebugger (_parent, _traceManager, _codeManager, _solidityProxy, _callTree) {
+function VmDebugger (_parentUI, _traceManager, _codeManager, _solidityProxy, _callTree) {
+ let _parent = _parentUI.debugger
+ var self = this
+ this.view
this.asmCode = new CodeListView(_parent, _codeManager)
- this.stackPanel = new StackPanel(_parent, _traceManager)
- this.storagePanel = new StoragePanel(_parent, _traceManager)
- this.memoryPanel = new MemoryPanel(_parent, _traceManager)
- this.calldataPanel = new CalldataPanel(_parent, _traceManager)
- this.callstackPanel = new CallstackPanel(_parent, _traceManager)
- this.stepDetail = new StepDetail(_parent, _traceManager)
- this.solidityState = new SolidityState(_parent, _traceManager, _codeManager, _solidityProxy)
- this.solidityLocals = new SolidityLocals(_parent, _traceManager, _callTree)
+ this.stackPanel = new StackPanel(_parentUI, _traceManager)
+ this.storagePanel = new StoragePanel(_parentUI, _traceManager)
+ this.memoryPanel = new MemoryPanel(_parentUI, _traceManager)
+ this.calldataPanel = new CalldataPanel(_parentUI, _traceManager)
+ this.callstackPanel = new CallstackPanel(_parentUI, _traceManager)
+ this.stepDetail = new StepDetail(_parentUI, _traceManager)
+ this.solidityState = new SolidityState(_parentUI, _traceManager, _codeManager, _solidityProxy)
+ this.solidityLocals = new SolidityLocals(_parentUI, _traceManager, _callTree)
/* Return values - */
this.returnValuesPanel = new DropdownPanel('Return Value', {json: true})
this.returnValuesPanel.data = {}
- _parent.event.register('indexChanged', this.returnValuesPanel, function (index) {
- var self = this
+ _parentUI.event.register('indexChanged', this.returnValuesPanel, function (index) {
+ if (!self.view) return
+ var innerself = this
_traceManager.getReturnValue(index, function (error, returnValue) {
if (error) {
- self.update([error])
- } else if (_parent.currentStepIndex === index) {
- self.update([returnValue])
+ innerself.update([error])
+ } else if (_parentUI.currentStepIndex === index) {
+ innerself.update([returnValue])
}
})
})
/* Return values - */
- this.fullStoragesChangesPanel = new FullStoragesChangesPanel(_parent, _traceManager)
+ this.fullStoragesChangesPanel = new FullStoragesChangesPanel(_parentUI, _traceManager)
- this.view
- var self = this
_parent.event.register('newTraceLoaded', this, function () {
- var storageResolver = new StorageResolver()
+ if (!self.view) return
+ var storageResolver = new StorageResolver({web3: _parent.web3})
self.storagePanel.storageResolver = storageResolver
self.solidityState.storageResolver = storageResolver
self.solidityLocals.storageResolver = storageResolver
self.fullStoragesChangesPanel.storageResolver = storageResolver
- self.headView.style.display = 'block'
- self.view.style.display = 'block'
+ self.asmCode.basicPanel.show()
+ self.stackPanel.basicPanel.show()
+ self.storagePanel.basicPanel.show()
+ self.memoryPanel.basicPanel.show()
+ self.calldataPanel.basicPanel.show()
+ self.callstackPanel.basicPanel.show()
})
_parent.event.register('traceUnloaded', this, function () {
- self.headView.style.display = 'none'
- self.view.style.display = 'none'
+ if (!self.view) return
})
_parent.callTree.event.register('callTreeReady', () => {
- self.asmCode.basicPanel.show()
+ if (!self.view) return
if (_parent.callTree.reducedTrace.length) {
self.solidityLocals.basicPanel.show()
self.solidityState.basicPanel.show()
}
- self.stackPanel.basicPanel.show()
- self.storagePanel.basicPanel.show()
- self.memoryPanel.basicPanel.show()
- self.calldataPanel.basicPanel.show()
- self.callstackPanel.basicPanel.show()
})
}
VmDebugger.prototype.renderHead = function () {
- var headView = yo`
+ var headView = yo`
${this.asmCode.render()}
${this.stepDetail.render()}
@@ -95,8 +98,13 @@ VmDebugger.prototype.renderHead = function () {
return headView
}
+VmDebugger.prototype.remove = function () {
+ // used to stop listenning on event. bad and should be "refactored"
+ this.view = null
+}
+
VmDebugger.prototype.render = function () {
- var view = yo`