Commit 2ef943bd authored by yann300's avatar yann300

coding standard

parent 592cddcf
build
node_modules node_modules
npm-debug.log npm-debug.log
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
}, },
"homepage": "https://github.com/ethereum/remix#readme", "homepage": "https://github.com/ethereum/remix#readme",
"standard": { "standard": {
"global": ["web3"] "global": ["web3"],
"ignore": [
"node_modules/*",
"build/*"
]
} }
} }
'use strict'
var React = require('react') var React = require('react')
var BasicPanel = require('./basicPanel') var BasicPanel = require('./basicPanel')
var Sticker = require('./sticker') var Sticker = require('./sticker')
...@@ -7,6 +8,10 @@ var style = require('./basicStyles') ...@@ -7,6 +8,10 @@ var style = require('./basicStyles')
var Slider = require('./slider') var Slider = require('./slider')
module.exports = React.createClass({ module.exports = React.createClass({
contextTypes: {
web3: React.PropTypes.object
},
getInitialState: function () { getInitialState: function () {
return { return {
currentSelected: -1, // current selected item in the vmTrace currentSelected: -1, // current selected item in the vmTrace
...@@ -135,7 +140,7 @@ module.exports = React.createClass({ ...@@ -135,7 +140,7 @@ module.exports = React.createClass({
resolveAddress: function (address) { resolveAddress: function (address) {
if (!this.state.codes[address]) { if (!this.state.codes[address]) {
var hexCode = web3.eth.getCode(address) var hexCode = this.context.web3.eth.getCode(address)
var code = codeUtils.nameOpCodes(new Buffer(hexCode.substring(2), 'hex')) var code = codeUtils.nameOpCodes(new Buffer(hexCode.substring(2), 'hex'))
this.state.codes[address] = code[0] this.state.codes[address] = code[0]
this.state.instructionsIndexByBytesOffset[address] = code[1] this.state.instructionsIndexByBytesOffset[address] = code[1]
...@@ -341,7 +346,7 @@ module.exports = React.createClass({ ...@@ -341,7 +346,7 @@ module.exports = React.createClass({
for (var k = 0; k < mem.length; k += (width * 2)) { for (var k = 0; k < mem.length; k += (width * 2)) {
var memory = mem.substr(k, width * 2) var memory = mem.substr(k, width * 2)
ret.push({ ret.push({
address: web3.toHex(k), address: this.context.web3.toHex(k),
content: this.tryAsciiFormat(memory) content: this.tryAsciiFormat(memory)
}) })
} }
...@@ -352,7 +357,7 @@ module.exports = React.createClass({ ...@@ -352,7 +357,7 @@ module.exports = React.createClass({
var ret = { ascii: '', raw: '' } var ret = { ascii: '', raw: '' }
for (var k = 0; k < memorySlot.length; k += 2) { for (var k = 0; k < memorySlot.length; k += 2) {
var raw = memorySlot.substr(k, 2) var raw = memorySlot.substr(k, 2)
var ascii = web3.toAscii(raw) var ascii = this.context.web3.toAscii(raw)
if (ascii === String.fromCharCode(0)) { if (ascii === String.fromCharCode(0)) {
ret.ascii += '?' ret.ascii += '?'
} else { } else {
......
'use strict'
var React = require('react') var React = require('react')
var style = require('./basicStyles') var style = require('./basicStyles')
......
'use strict'
module.exports = { module.exports = {
wrapper: { wrapper: {
'fontFamily': 'arial,sans-serif' 'fontFamily': 'arial,sans-serif'
......
'use strict'
var opcodes = require('./opcodes') var opcodes = require('./opcodes')
module.exports = { module.exports = {
......
'use strict'
var React = require('react') var React = require('react')
var TxBrowser = require('./txBrowser') var TxBrowser = require('./txBrowser')
var VmTraceManager = require('./vmTraceManager')
var VmTraceBrowser = require('./vmTraceBrowser') var VmTraceBrowser = require('./vmTraceBrowser')
var style = require('./basicStyles') var style = require('./basicStyles')
...@@ -9,6 +9,14 @@ module.exports = React.createClass({ ...@@ -9,6 +9,14 @@ module.exports = React.createClass({
return {vmTrace: null, state: '', currentStep: -1} return {vmTrace: null, state: '', currentStep: -1}
}, },
childContextTypes: {
web3: React.PropTypes.object
},
getChildContext: function () {
return { web3: this.props.web3 }
},
render: function () { render: function () {
return ( return (
<div style={style.wrapper}> <div style={style.wrapper}>
...@@ -24,12 +32,12 @@ module.exports = React.createClass({ ...@@ -24,12 +32,12 @@ module.exports = React.createClass({
retrieveVmTrace: function (blockNumber, txNumber) { retrieveVmTrace: function (blockNumber, txNumber) {
this.setState({state: 'loading...'}) this.setState({state: 'loading...'})
var deb = this var self = this
VmTraceManager.retrieveVmTrace(blockNumber, txNumber, function (error, result) { this.props.web3.debug.trace(blockNumber, parseInt(txNumber), function (error, result) {
if (error) { if (error) {
console.log(error) console.log(error)
} else { } else {
deb.setState({vmTrace: result, state: ''}) self.setState({vmTrace: result, state: ''})
} }
}) })
} }
......
'use strict'
var ReactDOM = require('react-dom') var ReactDOM = require('react-dom')
var React = require('react') var React = require('react')
var Web3 = require('web3') var Web3 = require('web3')
var Web3Admin = require('./web3Admin') var Web3Admin = require('./web3Admin')
var web3 = new Web3() function loadWeb3 () {
web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545')) var web3 = new Web3()
Web3Admin.extend(web3) web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'))
Web3Admin.extend(web3)
return web3
}
var Debugger = require('./debugger') var Debugger = require('./debugger')
ReactDOM.render( ReactDOM.render(
<Debugger />, <Debugger web3={loadWeb3()} />,
document.getElementById('app') document.getElementById('app')
) )
'use strict'
const codes = { const codes = {
// 0x0 range - arithmetic ops // 0x0 range - arithmetic ops
// name, baseCost, off stack, on stack, dynamic // name, baseCost, off stack, on stack, dynamic
......
'use strict'
var React = require('react') var React = require('react')
var style = require('./sliderStyles') var style = require('./sliderStyles')
......
'use strict'
module.exports = { module.exports = {
rule: { rule: {
'width': '600px' 'width': '600px'
......
'use strict'
var React = require('react') var React = require('react')
module.exports = React.createClass({ module.exports = React.createClass({
......
'use strict'
var React = require('react') var React = require('react')
var style = require('./basicStyles') var style = require('./basicStyles')
module.exports = React.createClass({ module.exports = React.createClass({
contextTypes: {
web3: React.PropTypes.object
},
propTypes: { propTypes: {
onNewTxRequested: React.PropTypes.func.isRequired onNewTxRequested: React.PropTypes.func.isRequired
}, },
...@@ -11,7 +16,7 @@ module.exports = React.createClass({ ...@@ -11,7 +16,7 @@ module.exports = React.createClass({
}, },
submit: function () { submit: function () {
var tx = web3.eth.getTransactionFromBlock(this.state.blockNumber, this.state.txNumber) var tx = this.context.web3.eth.getTransactionFromBlock(this.state.blockNumber, this.state.txNumber)
if (tx) { if (tx) {
this.setState({from: tx.from, to: tx.to, hash: tx.hash}) this.setState({from: tx.from, to: tx.to, hash: tx.hash})
} }
......
'use strict'
var React = require('react') var React = require('react')
var AssemblyItemsBrowser = require('./assemblyItemsBrowser') var AssemblyItemsBrowser = require('./assemblyItemsBrowser')
......
'use strict'
var React = require('react') var React = require('react')
module.exports = React.createClass({ module.exports = React.createClass({
......
'use strict'
module.exports = { module.exports = {
retrieveVmTrace: function (blockNumber, txNumber, callBack) { retrieveVmTrace: function (blockNumber, txNumber, callBack) {
web3.debug.trace(blockNumber, parseInt(txNumber), function (error, result) { this.context.web3.debug.trace(blockNumber, parseInt(txNumber), function (error, result) {
callBack(error, result) callBack(error, result)
}) })
} }
......
'use strict'
module.exports = { module.exports = {
extend: function (web3) { extend: function (web3) {
// ADMIN // ADMIN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment