mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

- cleaning

Browse Source 
- fixes
 - ui
pull/7/head
yann300 9 years ago
parent 1756e98a79
commit 76b625b6cc
11 changed files with 109 additions and 56 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/ASMCode.js
  2. 2
      src/BasicPanel.js
  3. 4
      src/ButtonNavigator.js
  4. 13
      src/Ethdebugger.js
  5. 19
      src/Slider.js
  6. 17
      src/StepManager.js
  7. 60
      src/Sticker.js
  8. 26
      src/TxBrowser.js
  9. 8
      src/VmDebugger.js
  10. 4
      src/styles/basicStyles.js
  11. 0
      src/styles/sliderStyles.js

2
src/ASMCode.js
Unescape View File

@ -1,5 +1,5 @@
'use strict' 'use strict'
var style = require('./basicStyles') var style = require('./styles/basicStyles')
var yo = require('yo-yo') var yo = require('yo-yo')
var CodeManager = require('./code/codeManager') var CodeManager = require('./code/codeManager')
var ui = require('./helpers/ui') var ui = require('./helpers/ui')

2
src/BasicPanel.js
Unescape View File

@ -1,5 +1,5 @@
'use strict' 'use strict'
var style = require('./basicStyles') var style = require('./styles/basicStyles')
var yo = require('yo-yo') var yo = require('yo-yo')
var ui = require('./helpers/ui') var ui = require('./helpers/ui')

4
src/ButtonNavigator.js
Unescape View File

@ -49,7 +49,7 @@ ButtonNavigator.prototype.stepChanged = function (step) {
if (!this.traceManager) { if (!this.traceManager) {
this.intoForwardDisabled = true this.intoForwardDisabled = true
this.overForwardDisabled = true this.overForwardDisabled = true
this.NextCallDisabled = true this.nextCallDisabled = true
} else { } else {
var self = this var self = this
this.traceManager.getLength(function (error, length) { this.traceManager.getLength(function (error, length) {
@ -58,7 +58,7 @@ ButtonNavigator.prototype.stepChanged = function (step) {
self.overBackDisabled = true self.overBackDisabled = true
self.intoForwardDisabled = true self.intoForwardDisabled = true
self.overForwardDisabled = true self.overForwardDisabled = true
self.NextcallDisabled = true self.nextCallDisabled = true
console.log(error) console.log(error)
} else { } else {
self.intoForwardDisabled = step >= length - 1 self.intoForwardDisabled = step >= length - 1

13
src/Ethdebugger.js
Unescape View File

@ -3,7 +3,8 @@ var TxBrowser = require('./TxBrowser')
var StepManager = require('./StepManager') var StepManager = require('./StepManager')
var TraceManager = require('./trace/traceManager') var TraceManager = require('./trace/traceManager')
var VmDebugger = require('./VmDebugger') var VmDebugger = require('./VmDebugger')
var style = require('./basicStyles') var Sticker = require('./Sticker')
var style = require('./styles/basicStyles')
var util = require('./helpers/global') var util = require('./helpers/global')
var EventManager = require('./lib/eventManager') var EventManager = require('./lib/eventManager')
var yo = require('yo-yo') var yo = require('yo-yo')
@ -31,14 +32,20 @@ function Ethdebugger () {
self.stepChanged(stepIndex) self.stepChanged(stepIndex)
}) })
this.vmDebugger = new VmDebugger(this, this.traceManager, this.web3) this.vmDebugger = new VmDebugger(this, this.traceManager, this.web3)
this.sticker = new Sticker(this, this.traceManager, this.web3)
} }
Ethdebugger.prototype.render = function () { Ethdebugger.prototype.render = function () {
return ( return (
yo`<div style=${ui.formatCss(style.font)}> yo`<div style=${ui.formatCss(style.font)}>
<h1 style=${ui.formatCss(style.container)}>Eth Debugger</h1> <h1 style=${ui.formatCss(style.container)}>VM Debugger</h1>
<div style='display:inline-block'>
${this.txBrowser.render()} ${this.txBrowser.render()}
${this.stepManager.render()} ${this.stepManager.render()}
</div>
<div style='display:inline-block'>
${this.sticker.render()}
</div>
${this.vmDebugger.render()} ${this.vmDebugger.render()}
</div>` </div>`
) )
@ -46,7 +53,7 @@ Ethdebugger.prototype.render = function () {
Ethdebugger.prototype.unLoad = function () { Ethdebugger.prototype.unLoad = function () {
this.traceManager.init() this.traceManager.init()
this.stepManager.init() this.stepManager.reset()
this.trigger('traceUnloaded') this.trigger('traceUnloaded')
} }

19
src/Slider.js
Unescape View File

@ -1,5 +1,5 @@
'use strict' 'use strict'
var style = require('./sliderStyles') var style = require('./styles/sliderStyles')
var util = require('./helpers/global') var util = require('./helpers/global')
var EventManager = require('./lib/eventManager') var EventManager = require('./lib/eventManager')
var yo = require('yo-yo') var yo = require('yo-yo')
@ -33,18 +33,11 @@ Slider.prototype.render = function () {
return view return view
} }
Slider.prototype.init = function () { Slider.prototype.init = function (length) {
var self = this this.max = length
this.traceManager.getLength(function (error, length) { this.disabled = length === 0
if (error) { yo.update(this.view, this.render())
console.log(error) this.setValue(0)
} else {
self.max = length
self.disabled = length === 0
yo.update(self.view, self.render())
self.setValue(0)
}
})
} }
Slider.prototype.onMouseUp = function (event) { Slider.prototype.onMouseUp = function (event) {

17
src/StepManager.js
Unescape View File

@ -1,7 +1,7 @@
'use strict' 'use strict'
var ButtonNavigator = require('./ButtonNavigator') var ButtonNavigator = require('./ButtonNavigator')
var Slider = require('./Slider') var Slider = require('./Slider')
var style = require('./basicStyles') var style = require('./styles/basicStyles')
var util = require('./helpers/global') var util = require('./helpers/global')
var EventManager = require('./lib/eventManager') var EventManager = require('./lib/eventManager')
var yo = require('yo-yo') var yo = require('yo-yo')
@ -14,10 +14,13 @@ function StepManager (_parent, _traceManager) {
var self = this var self = this
this.parent.register('newTraceLoaded', this, function () { this.parent.register('newTraceLoaded', this, function () {
self.traceManager.getLength(function (length) { self.traceManager.getLength(function (error, length) {
self.slider.max = length if (error) {
self.slider.init() console.log(error)
} else {
self.slider.init(length)
self.init() self.init()
}
}) })
}) })
@ -53,6 +56,12 @@ StepManager.prototype.render = function () {
) )
} }
StepManager.prototype.reset = function () {
this.slider.setValue(0)
this.currentStepIndex = 0
this.buttonNavigator.stepChanged(0)
}
StepManager.prototype.init = function () { StepManager.prototype.init = function () {
this.slider.setValue(0) this.slider.setValue(0)
this.changeState(0) this.changeState(0)

60
src/Sticker.js
Unescape View File

@ -5,23 +5,25 @@ function Sticker (_parent, _traceManager) {
this.parent = _parent this.parent = _parent
this.traceManager = _traceManager this.traceManager = _traceManager
this.vmTraceStep this.vmTraceStep = '-'
this.step this.step = '-'
this.addmemory this.addmemory = '-'
this.gas this.gas = '-'
this.remainingGas this.remainingGas = '-'
this.loadedAddress = '-'
this.hide = true
this.view this.view
this.init() this.init()
} }
Sticker.prototype.render = function () { Sticker.prototype.render = function () {
var view = yo`<div> var view = yo`<div style=${this.hide ? 'display: none' : 'display: block'}>
<table> <table>
<tbody> <tbody>
<tr key='vmtracestep'> <tr key='vmtracestep'>
<td> <td>
vmtracestep VMtracestep:
</td> </td>
<td> <td>
${this.vmTraceStep} ${this.vmTraceStep}
@ -29,7 +31,7 @@ Sticker.prototype.render = function () {
</tr> </tr>
<tr key='step'> <tr key='step'>
<td> <td>
step Step:
</td> </td>
<td> <td>
${this.step} ${this.step}
@ -37,7 +39,7 @@ Sticker.prototype.render = function () {
</tr> </tr>
<tr key='addmemory'> <tr key='addmemory'>
<td> <td>
add memory Add memory:
</td> </td>
<td> <td>
${this.addmemory} ${this.addmemory}
@ -45,7 +47,7 @@ Sticker.prototype.render = function () {
</tr> </tr>
<tr key='gas'> <tr key='gas'>
<td> <td>
gas Gas:
</td> </td>
<td> <td>
${this.gas} ${this.gas}
@ -53,12 +55,20 @@ Sticker.prototype.render = function () {
</tr> </tr>
<tr key='remaininggas'> <tr key='remaininggas'>
<td> <td>
remaining gas Remaining gas:
</td> </td>
<td> <td>
${this.remainingGas} ${this.remainingGas}
</td> </td>
</tr> </tr>
<tr key='remaininggas'>
<td>
Loaded address:
</td>
<td>
${this.loadedAddress}
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div>` </div>`
@ -70,6 +80,16 @@ Sticker.prototype.render = function () {
Sticker.prototype.init = function () { Sticker.prototype.init = function () {
var self = this var self = this
this.parent.register('traceUnloaded', this, function () {
self.hide = true
yo.update(self.view, self.render())
})
this.parent.register('newTraceLoaded', this, function () {
self.hide = false
yo.update(self.view, self.render())
})
this.parent.register('indexChanged', this, function (index) { this.parent.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
@ -78,7 +98,7 @@ Sticker.prototype.init = function () {
self.traceManager.getCurrentStep(index, function (error, step) { self.traceManager.getCurrentStep(index, function (error, step) {
if (error) { if (error) {
console.log(error) console.log(error)
self.step = '' self.step = '-'
} else { } else {
self.step = step self.step = step
} }
@ -88,7 +108,7 @@ Sticker.prototype.init = function () {
self.traceManager.getMemExpand(index, function (error, addmem) { self.traceManager.getMemExpand(index, function (error, addmem) {
if (error) { if (error) {
console.log(error) console.log(error)
self.addmemory = '' self.addmemory = '-'
} else { } else {
self.addmemory = addmem self.addmemory = addmem
} }
@ -98,17 +118,27 @@ Sticker.prototype.init = function () {
self.traceManager.getStepCost(index, function (error, gas) { self.traceManager.getStepCost(index, function (error, gas) {
if (error) { if (error) {
console.log(error) console.log(error)
self.gas = gas self.gas = '-'
} else { } else {
self.gas = gas self.gas = gas
} }
yo.update(self.view, self.render()) yo.update(self.view, self.render())
}) })
self.traceManager.getCurrentCalledAddressAt(index, function (error, address) {
if (error) {
console.log(error)
self.loadedAddress = '-'
} else {
self.loadedAddress = address
}
yo.update(self.view, self.render())
})
self.traceManager.getRemainingGas(index, function (error, remaingas) { self.traceManager.getRemainingGas(index, function (error, remaingas) {
if (error) { if (error) {
console.log(error) console.log(error)
self.remainingGas = '' self.remainingGas = '-'
} else { } else {
self.remainingGas = remaingas self.remainingGas = remaingas
} }

26
src/TxBrowser.js
Unescape View File

@ -1,4 +1,4 @@
var style = require('./basicStyles') var style = require('./styles/basicStyles')
var util = require('./helpers/global') var util = require('./helpers/global')
var EventManager = require('./lib/eventManager') var EventManager = require('./lib/eventManager')
var traceHelper = require('./helpers/traceHelper') var traceHelper = require('./helpers/traceHelper')
@ -10,13 +10,14 @@ function TxBrowser (_web3) {
this.web3 = _web3 this.web3 = _web3
this.blockNumber this.blockNumber
this.txNumber = '0x71a6d583d16d142c5c3e8903060e8a4ee5a5016348a9448df6c3e63b68076ec4' this.txNumber
this.hash this.hash
this.from this.from
this.to this.to
this.view this.view
}
this.setDefaultValues()
}
// 0xcda2b2835add61af54cf83bd076664d98d7908c6cd98d86423b3b48d8b8e51ff // 0xcda2b2835add61af54cf83bd076664d98d7908c6cd98d86423b3b48d8b8e51ff
// creation 0xa9619e1d0a35b2c1d686f5b661b3abd87f998d2844e8e9cc905edb57fc9ce349 // creation 0xa9619e1d0a35b2c1d686f5b661b3abd87f998d2844e8e9cc905edb57fc9ce349
@ -25,6 +26,14 @@ function TxBrowser (_web3) {
// creation: 0x72908de76f99fca476f9e3a3b5d352f350a98cd77d09cebfc59ffe32a6ecaa0b // creation: 0x72908de76f99fca476f9e3a3b5d352f350a98cd77d09cebfc59ffe32a6ecaa0b
// invokation: 0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51 // invokation: 0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51
TxBrowser.prototype.setDefaultValues = function () {
this.from = ' - '
this.to = ' - '
this.hash = ' - '
this.blockNumber = null
this.txNumber = '0x71a6d583d16d142c5c3e8903060e8a4ee5a5016348a9448df6c3e63b68076ec4'
}
TxBrowser.prototype.submit = function () { TxBrowser.prototype.submit = function () {
if (!this.txNumber) { if (!this.txNumber) {
return return
@ -47,11 +56,15 @@ TxBrowser.prototype.submit = function () {
this.from = tx.from this.from = tx.from
this.to = tx.to this.to = tx.to
this.hash = tx.hash this.hash = tx.hash
yo.update(this.view, this.render())
this.trigger('newTxRequested', [this.blockNumber, this.txNumber, tx]) this.trigger('newTxRequested', [this.blockNumber, this.txNumber, tx])
} else { } else {
var mes = '<not found>'
this.from = mes
this.to = mes
this.hash = mes
console.log('cannot find ' + this.blockNumber + ' ' + this.txNumber) console.log('cannot find ' + this.blockNumber + ' ' + this.txNumber)
} }
yo.update(this.view, this.render())
} }
TxBrowser.prototype.updateBlockN = function (ev) { TxBrowser.prototype.updateBlockN = function (ev) {
@ -62,6 +75,11 @@ TxBrowser.prototype.updateTxN = function (ev) {
this.txNumber = ev.target.value this.txNumber = ev.target.value
} }
TxBrowser.prototype.init = function (ev) {
this.setDefaultValues()
yo.update(this.view, this.render())
}
TxBrowser.prototype.render = function () { TxBrowser.prototype.render = function () {
var self = this var self = this
var view = yo`<div style=${ui.formatCss(style.container)}> var view = yo`<div style=${ui.formatCss(style.container)}>

8
src/VmDebugger.js
Unescape View File

@ -1,6 +1,5 @@
'use strict' 'use strict'
var Sticker = require('./Sticker') var style = require('./styles/basicStyles')
var style = require('./basicStyles')
var ASMCode = require('./ASMCode') var ASMCode = require('./ASMCode')
var CalldataPanel = require('./CalldataPanel') var CalldataPanel = require('./CalldataPanel')
var MemoryPanel = require('./MemoryPanel') var MemoryPanel = require('./MemoryPanel')
@ -11,7 +10,6 @@ var yo = require('yo-yo')
var ui = require('./helpers/ui') var ui = require('./helpers/ui')
function VmDebugger (_parent, _traceManager, _web3) { function VmDebugger (_parent, _traceManager, _web3) {
this.sticker = new Sticker(_parent, _traceManager, _web3)
this.asmCode = new ASMCode(_parent, _traceManager, _web3) this.asmCode = new ASMCode(_parent, _traceManager, _web3)
this.stackPanel = new StackPanel(_parent, _traceManager) this.stackPanel = new StackPanel(_parent, _traceManager)
this.storagePanel = new StoragePanel(_parent, _traceManager) this.storagePanel = new StoragePanel(_parent, _traceManager)
@ -35,10 +33,8 @@ VmDebugger.prototype.render = function () {
<tbody> <tbody>
<tr> <tr>
<td> <td>
${this.asmCode.render()} ${this.asmCode.render()}
<div style=${ui.formatCss(style.inline, style.sticker)}>
${this.sticker.render()}
</div>
</td> </td>
<td> <td>
${this.stackPanel.render()} ${this.stackPanel.render()}

4
src/basicStyles.js → src/styles/basicStyles.js
Unescape View File

@ -11,8 +11,8 @@ module.exports = {
'font-style': 'italic' 'font-style': 'italic'
}, },
instructionsList: { instructionsList: {
'width': '320px', 'width': '600px',
'height': '300px' 'height': '330px'
}, },
transactionInfo: { transactionInfo: {
'margin-top': '5px' 'margin-top': '5px'

0
src/sliderStyles.js → src/styles/sliderStyles.js
Unescape View File

Write Preview
Loading…
Cancel
Save