ui styling

rollback vmTrace call
renaming codesmap property

src/assemblyItemsBrowser.js

@@ -20,8 +20,8 @@ module.exports = React.createClass({
 			lastStorage: null,
 			lastMemory: null,
 			lastCallData: null,
-			codes: {},
+			codes: {}, // assembly items instructions list by contract addesses
-			codesMap: {}
+			instructionsIndexByBytesOffset: {} // mapping between bytes offset and instructions index.
 		};
 	},
 
@@ -44,14 +44,14 @@ module.exports = React.createClass({
 			<button onClick={this.stepIntoForward} disabled={ this.checkButtonState(1) } >stepIntoForward</button>
 			</div>
 			<div style={style.container}>
-			<select size="10" ref='itemsList' style={style.container} value={this.state.selectedInst}>
+			<select size="10" ref='itemsList' style={style.instuctions} value={this.state.selectedInst}>
 			{ this.renderAssemblyItems() }
 			</select>
 			</div>
 			<div>
 			<BasicPanel name="Stack" data={this.state.currentStack} />
 			<BasicPanel name="CallStack" data={this.state.currentCallStack} />
-			<BasicPanel name="Storage" data={this.state.currentStorage} />
+			<BasicPanel name="Storage" data={this.state.currentStorage} renderRow={this.renderStorageRow} />
 			<BasicPanel name="Memory" data={this.state.currentMemory} renderRow={this.renderMemoryRow} />
 			<BasicPanel name="CallData" data={this.state.currentCallData} />
 			</div>
@@ -59,6 +59,17 @@ module.exports = React.createClass({
 			);
 	},
 
+	renderStorageRow: function(data)
+	{
+		var ret = []
+		if (data)
+		{
+			for (var key in data)
+				ret.push(<tr key={key} ><td>{key}</td><td>{data[key]}</td></tr>)
+		}
+		return ret
+	},
+
 	renderMemoryRow: function(data)
 	{
 		var ret = []
@@ -80,7 +91,7 @@ module.exports = React.createClass({
 			var hexCode = web3.eth.getCode(address)	
 			var code = codeUtils.nameOpCodes(new Buffer(hexCode.substring(2), 'hex'))
 			this.state.codes[address] = code[0]
-			this.state.codesMap[address] = code[1]
+			this.state.instructionsIndexByBytesOffset[address] = code[1]
 		}
 	},
 
@@ -164,7 +175,7 @@ module.exports = React.createClass({
 			stateChanges["currentCallData"] = props.vmTrace[vmTraceIndex].calldata
 			lastCallData = props.vmTrace[vmTraceIndex].calldata
 		}
-		stateChanges["selectedInst"] = this.state.codesMap[currentAddress][props.vmTrace[vmTraceIndex].pc]
+		stateChanges["selectedInst"] = this.state.instructionsIndexByBytesOffset[currentAddress][props.vmTrace[vmTraceIndex].pc]
 		stateChanges["currentSelected"] = vmTraceIndex
 		this.setState(stateChanges)
 	},
@@ -304,11 +315,11 @@ module.exports = React.createClass({
 		for (var k = 0; k < memorySlot.length; k += 2)
 		{
 			var raw = memorySlot.substr(k, 2)
-			var dec = web3.toDecimal("0x" + raw)
+			var ascii = web3.toAscii(raw)
-			if (dec >= 32 && dec < 127)
+			if (ascii === String.fromCharCode(0))
-				ret.ascii += web3.toAscii(raw)
-			else
 				ret.ascii += "?"
+			else
+				ret.ascii += ascii
 			ret.raw += " " + raw
 		}
 		return ret

src/basicPanel.js

@@ -17,12 +17,14 @@ module.exports = React.createClass({
 		return (
 			<div style={style.panel.container}>
 			<div style={style.panel.title} >{this.props.name}</div>
+			<div style={style.panel.tableContainer} >
 			<table style={style.panel.table}>
 			<tbody>
 			{this.renderItems()}
 			</tbody>
 			</table>
 			</div>
+			</div>
 			);
 	},
 	

src/basicStyles.js

@@ -5,8 +5,8 @@ module.exports = {
 	},
 	container: 
 	{
-		margin: '10px',
+		'margin': '10px',
-		padding: '5px'
+		'padding': '5px'
 	},
 	address:
 	{
@@ -14,32 +14,38 @@ module.exports = {
 	},
 	instructions:
 	{
-		'width': '600px'
+		'width': '650px'
 	},
 	panel:
 	{
 		container:
 		{
-			margin: '10px',
+			'margin': '10px',
-			border: '1px solid',
+			'border': '1px solid',
-			width: '600px'
+			'width': '650px'
+		},
+		tableContainer:
+		{
+			'minHeight': '50px',
+			'maxHeight': '200px',
+			'overflowY': 'scroll'
 		},
 		table:
 		{
-			padding: '5px'
+			'padding': '5px'
 		},
 		title:
 		{
-			padding: '5px',
+			'padding': '5px',
 			'fontStyle': 'italic'
 		}
 	},
 	hidden:
 	{
-		display: 'none'
+		'display': 'none'
 	},
 	display:
 	{
-		display: 'block'
+		'display': 'block'
 	}
 }

src/vmTraceManager.js

@@ -1,5 +1,5 @@
 module.exports = {
 	retrieveVmTrace: function(blockNumber, txNumber) {		
-		return web3.admin.vmTrace(blockNumber, parseInt(txNumber));
+		return web3.admin.vmTrace(blockNumber, parseInt(txNumber), "T0Li2pYtq70=");
 	}
 }

src/web3Admin.js

@@ -58,8 +58,8 @@ module.exports = {
         	new web3._extend.Method({
         		name: 'vmTrace',
         		call: 'admin_eth_vmTrace',
-        		inputFormatter: [null, null],
+        		inputFormatter: [null, null, null],
-        		params: 2
+        		params: 3
         	}), 
         	],
         	properties: