Merge pull request #21 from yann300/slider

package.json

@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "babel-preset-react": "^6.5.0",
-    "babelify": "^7.2.0",
+    "babelify": "^7.2.0"
   },
   "scripts": {
     "install": "npm install --save react react-dom; npm install -g browserify; npm install --save babelify babel-preset-react; npm install web3",

src/assemblyItemsBrowser.js

 var React = require('react');
 var BasicPanel = require('./basicPanel')
 var Sticker = require('./sticker')
+var ButtonNavigator = require('./vmTraceButtonNavigator')
 var codeUtils = require('./codeUtils')
 var style = require('./basicStyles')
+var Slider = require('./slider');
 
 module.exports = React.createClass({
 
 	getInitialState: function()
 	{
 		return {
-			currentSelected: 0, // current selected item in the vmTrace
-			selectedInst: 0, // current selected item in the contract assembly code
+			currentSelected: -1, // current selected item in the vmTrace
+			selectedInst: -1, // current selected item in the contract assembly code
 			currentAddress: null,
 			currentStack: null,
 			currentLevels: null,
@@ -36,14 +38,12 @@ module.exports = React.createClass({
 		return (
 			<div style={this.props.vmTrace === null ? style.hidden : style.display} >
 			<div style={style.container}><span style={style.address}>Current code: {this.state.currentAddress}</span></div> 
-			
 			<div style={style.container}>
-				<button onClick={this.stepIntoBack} disabled={ this.checkButtonState(-1) } >Step Into Back</button>
-				<button onClick={this.stepOverBack} disabled={ this.checkButtonState(-1) } >Step Over Back</button>
-				<button onClick={this.stepOverForward} disabled={ this.checkButtonState(1) } >Step Over Forward</button>
-				<button onClick={this.stepIntoForward} disabled={ this.checkButtonState(1) } >Step Into Forward</button>
+				<Slider ref="slider" onChange={this.selectState} min="0" max={this.props.vmTrace ? this.props.vmTrace.length : 0}/>
+				<ButtonNavigator
+                    vmTraceLength={this.props.vmTrace ? this.props.vmTrace.length : 0} step={this.state.currentSelected} stepIntoBack={this.stepIntoBack} 
+                    stepIntoForward={this.stepIntoForward} stepOverBack={this.stepOverBack} stepOverForward={this.stepOverForward} />
 			</div>
-
 			<div style={style.container}>
 			<table>
 				<tbody>
@@ -117,17 +117,7 @@ module.exports = React.createClass({
 			this.state.codes[address] = code[0]
 			this.state.instructionsIndexByBytesOffset[address] = code[1]
 		}
-	},
-
-	checkButtonState: function(incr)
-	{
-		if (!this.props.vmTrace)
-			return "disabled"
-		if (incr === -1)
-			return this.state.currentSelected === 0 ? "disabled" : ""
-		else if (incr === 1)
-			return this.state.currentSelected >= this.props.vmTrace.length - 1 ? "disabled" : "" 
-	},
+	},	
 
 	renderAssemblyItems: function()
 	{
@@ -145,6 +135,7 @@ module.exports = React.createClass({
 		if (!nextProps.vmTrace)
 			return
 		this.buildCallStack(nextProps.vmTrace)
+		this.setState({"currentSelected": -1})
 		this.updateState(nextProps, 0)
 	},
 
@@ -154,7 +145,7 @@ module.exports = React.createClass({
 			return
 		var callStack = []
 		var depth = -1
-		for (var k = 1; k < vmTrace.length; k++)
+		for (var k = 0; k < vmTrace.length; k++)
 		{
 			var trace = vmTrace[k]
 			if (trace.depth === undefined || trace.depth === depth)
@@ -170,51 +161,43 @@ module.exports = React.createClass({
 
 	updateState: function(props, vmTraceIndex)
 	{
-		if (!props.vmTrace)
+		if (!props.vmTrace || !props.vmTrace[vmTraceIndex])
 			return
-		var previousState = this.state.currentSelected
+		var previousIndex = this.state.currentSelected
 		var stateChanges = {}
-
-		var currentAddress = this.state.currentAddress
-		if (!currentAddress)
-			currentAddress = props.vmTrace[vmTraceIndex].address
-		if (props.vmTrace[vmTraceIndex].address && props.vmTrace[vmTraceIndex].address !== this.state.currentAddress)
-		{
-			this.resolveAddress(props.vmTrace[vmTraceIndex].address)
-			stateChanges["currentAddress"] = props.vmTrace[vmTraceIndex].address
-		}
-
-		if (props.vmTrace[vmTraceIndex].stack)
+		
+		if (props.vmTrace[vmTraceIndex].stack) // there's always a stack
 		{
 			var stack = props.vmTrace[vmTraceIndex].stack
 			stack.reverse()
 			stateChanges["currentStack"] = stack
 		}
-
-		var callStackIndex = vmTraceIndex
-		if (vmTraceIndex < previousState)
-			callStackIndex = this.retrieveLastSeenProperty(vmTraceIndex, "depth", props.vmTrace)
-		if (this.state.callStack[callStackIndex] || callStackIndex === 0)
-			stateChanges["currentCallStack"] = this.state.callStack[callStackIndex]
-
-		var storageIndex = vmTraceIndex
-		if (vmTraceIndex < previousState)
-			storageIndex = this.retrieveLastSeenProperty(vmTraceIndex, "storage", props.vmTrace)
-		if (props.vmTrace[storageIndex].storage || storageIndex === 0)
-			stateChanges["currentStorage"] = props.vmTrace[storageIndex].storage
-
-		var memoryIndex = vmTraceIndex
-		if (vmTraceIndex < previousState)
-			memoryIndex = this.retrieveLastSeenProperty(vmTraceIndex, "memory", props.vmTrace)	
-		if (props.vmTrace[memoryIndex].memory || memoryIndex === 0)
-			stateChanges["currentMemory"] = this.formatMemory(props.vmTrace[memoryIndex].memory, 16)
-
-		var callDataIndex = vmTraceIndex
-		if (vmTraceIndex < previousState)
-			callDataIndex = this.retrieveLastSeenProperty(vmTraceIndex, "calldata", props.vmTrace)
-		if (props.vmTrace[vmTraceIndex].calldata || callDataIndex === 0)
-			stateChanges["currentCallData"] = [props.vmTrace[callDataIndex].calldata]
-
+		
+		var currentAddress = this.state.currentAddress
+		var addressIndex = this.shouldUpdateStateProperty("address", vmTraceIndex, previousIndex, props.vmTrace)
+		if (addressIndex > -1)
+		{
+			currentAddress = props.vmTrace[addressIndex].address
+			this.resolveAddress(currentAddress)
+			Object.assign(stateChanges, { "currentAddress": currentAddress })
+		}
+		
+		var depthIndex = this.shouldUpdateStateProperty("depth", vmTraceIndex, previousIndex, props.vmTrace)
+		if (depthIndex > -1)
+			Object.assign(stateChanges, { "currentCallStack": this.state.callStack[depthIndex] })
+
+		var storageIndex = this.shouldUpdateStateProperty("storage", vmTraceIndex, previousIndex, props.vmTrace)
+		if (storageIndex > -1)
+			Object.assign(stateChanges, { "currentStorage": props.vmTrace[storageIndex].storage })
+
+		var memoryIndex = this.shouldUpdateStateProperty("memory", vmTraceIndex, previousIndex, props.vmTrace)
+		if (memoryIndex > -1)
+			Object.assign(stateChanges, { "currentMemory": this.formatMemory(props.vmTrace[memoryIndex].memory, 16) })
+		
+		var callDataIndex = this.shouldUpdateStateProperty("calldata", vmTraceIndex, previousIndex, props.vmTrace)
+		if (callDataIndex > -1)
+			Object.assign(stateChanges, { "currentCallData": [props.vmTrace[callDataIndex].calldata] })
+		
 		stateChanges["selectedInst"] = this.state.instructionsIndexByBytesOffset[currentAddress][props.vmTrace[vmTraceIndex].pc]
 		stateChanges["currentSelected"] = vmTraceIndex
 
@@ -224,9 +207,23 @@ module.exports = React.createClass({
 			"Step Cost: " + props.vmTrace[vmTraceIndex].gascost,
 			"Remaining Gas: " + props.vmTrace[vmTraceIndex].gas
 		]
-
+		this.refs.slider.setValue(vmTraceIndex)
 		this.setState(stateChanges)
 	},
+	
+	shouldUpdateStateProperty: function(vmTraceName, nextIndex, previousIndex, vmTrace)
+	{
+		var propIndex = -1
+		if (previousIndex + 1 === nextIndex)
+			propIndex = nextIndex
+		else
+			propIndex = this.retrieveLastSeenProperty(nextIndex, vmTraceName, vmTrace)
+		
+		if (propIndex > -1 && vmTrace[propIndex][vmTraceName] !== undefined)
+			return propIndex
+		else
+			return -1
+	},
 
 	retrieveLastSeenProperty: function(currentIndex, propertyName, vmTrace)
 	{
@@ -245,22 +242,6 @@ module.exports = React.createClass({
 		this.moveSelection(-1)
 	},
 
-	stepOverBack: function()
-	{
-		if (this.isReturnInstruction(this.state.currentSelected - 1))
-			this.stepOutBack();
-		else
-			this.moveSelection(-1);
-	},
-
-	stepOverForward: function()
-	{
-		if (this.isCallInstruction(this.state.currentSelected))
-			this.stepOutForward();
-		else
-			this.moveSelection(1);
-	},
-
 	stepIntoForward: function()
 	{
 		this.moveSelection(1)

src/debugger.js

@@ -6,16 +6,16 @@ var style = require('./basicStyles')
 
 module.exports = React.createClass({
 	getInitialState: function() {
-		return {vmTrace: null, state: ""}
+		return {vmTrace: null, state: "", currentStep: -1}
 	},
 
 	render: function() {
 		return (
 			<div style={style.wrapper} >
-			<h1 style={style.container} >Eth Debugger</h1>
-			<TxBrowser onNewTxRequested={this.retrieveVmTrace} />
-			<div style={style.container} >{this.state.state}</div>
-			<VmTraceBrowser vmTrace={this.state.vmTrace} />
+				<h1 style={style.container} >Eth Debugger</h1>
+				<TxBrowser onNewTxRequested={this.retrieveVmTrace} />
+				<div style={style.container} >{this.state.state}</div>
+				<VmTraceBrowser vmTrace={this.state.vmTrace} />
 			</div>
 			);
 	},

src/slider.js

+var React = require('react');
+var style = require('./sliderStyles')
+
+module.exports = React.createClass({
+
+    propTypes: {
+        onChange: React.PropTypes.func.isRequired,
+    },
+
+    getDefaultProps: function () {
+        return {
+            min: 0,
+            max: 500
+        };
+    },
+
+    render: function () {
+        return (
+            <div>
+                <input ref="rule" style={style.rule} type="range"  min={this.props.min} max={this.props.max} onMouseUp={this.onMouseUp}  />
+            </div>
+        );
+    },
+
+    onMouseUp: function (event) {
+        this.props.onChange(parseInt(this.refs.rule.value))
+    },
+
+    setValue: function (value) {
+        var diff = value - this.refs.rule.value
+        if (diff > 0)
+            this.refs.rule.stepUp(diff)
+        else
+            this.refs.rule.stepDown(Math.abs(diff))
+    }
+})

src/sliderStyles.js

+module.exports = {
+    rule:
+    {
+        'width': '600px',
+    },    
+    runner:
+    {
+        'position': 'absolute',
+        'width': '16px',
+        'height': '16px',
+        'margin': '0',
+        'padding': '0',
+        'overflow': 'hidden',
+        'border': '1px solid #a4bed4',
+        'background-color': '#f1f7ff'
+    }
+}
\ No newline at end of file

src/txBrowser.js

@@ -13,7 +13,8 @@ module.exports = React.createClass({
 	submit: function()
 	{
 		var tx = web3.eth.getTransactionFromBlock(this.state.blockNumber, this.state.txNumber)
-		this.setState({from: tx.from, to: tx.to, hash: tx.hash})
+		if (tx)
+			this.setState({from: tx.from, to: tx.to, hash: tx.hash})
 		this.props.onNewTxRequested(this.state.blockNumber, parseInt(this.state.txNumber))
 	},
 	

src/vmTraceBrowser.js

@@ -2,7 +2,12 @@ var React = require('react');
 var AssemblyItemsBrowser = require('./assemblyItemsBrowser');
 
 module.exports = React.createClass({
+	
 	render: function() {
-		return ( <AssemblyItemsBrowser vmTrace={this.props.vmTrace} /> )
-	}
+		return ( 
+			<div>				
+				<AssemblyItemsBrowser vmTrace={this.props.vmTrace} /> 
+			</div>
+		)
+	},
 });

src/vmTraceButtonNavigator.js

+var React = require('react');
+
+module.exports = React.createClass({
+    
+    propTypes: {
+    	stepIntoBack: React.PropTypes.func.isRequired,
+        stepIntoForward: React.PropTypes.func.isRequired,
+        stepOverBack: React.PropTypes.func.isRequired,
+        stepOverForward: React.PropTypes.func.isRequired,
+  	},
+    
+    render: function() {		
+		return (
+			<div>
+				<button onClick={this.props.stepIntoBack} disabled={this.checkButtonState(-1)} >Step Into Back</button>
+				<button onClick={this.props.stepOverBack} disabled={this.checkButtonState(-1)} >Step Over Back</button>
+				<button onClick={this.props.stepOverForward} disabled={this.checkButtonState(1)} >Step Over Forward</button>
+				<button onClick={this.props.stepIntoForward} disabled={this.checkButtonState(1)} >Step Into Forward</button>
+			</div>
+			);
+	},
+	
+	checkButtonState: function(incr)
+	{
+		if (incr === -1)
+			return this.props.step === 0 ? "disabled" : ""
+		else if (incr === 1)
+			return this.props.step >= this.props.vmTraceLength - 1 ? "disabled" : "" 
+	},
+})
\ No newline at end of file