Skip to content

B
baas-ide
Commit 00620484 authored by yann300's avatar yann300
Browse files
Options

Merge pull request #24 from yann300/codingStd

Coding standard
parents b4d7d8c4 43443b64
Expand all Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 213 deletions
.gitignore 0 → 100644
View file @ 00620484
build
node_modules
npm-debug.log
lint.xml
package.json
View file @ 00620484
......@@ -20,12 +20,14 @@
},
"devDependencies": {
"babel-preset-react": "^6.5.0",
"babelify": "^7.2.0"
"babelify": "^7.2.0",
"standard": "^7.0.1",
"standard-reporter": "^0.0.9"
},
"scripts": {
"install": "npm install --save react react-dom; npm install -g browserify; npm install --save babelify babel-preset-react; npm install web3",
"start_node": "eth --rpccorsdomain \"*\" -j -v 0",
"build": "mkdir -p build; browserify -t [ babelify --presets [ react ] ] src/index.js -o build/app.js"
"build": "mkdir -p build; browserify -t [ babelify --presets [ react ] ] src/index.js -o build/app.js",
"test" : "standard 2>&1 | standard-reporter > lint.xml"
},
"repository": {
"type": "git",
......@@ -36,5 +38,11 @@
"bugs": {
"url": "https://github.com/ethereum/remix/issues"
},
"homepage": "https://github.com/ethereum/remix#readme"
"homepage": "https://github.com/ethereum/remix#readme",
"standard": {
"ignore": [
"node_modules/*",
"build/*"
]
}
}
src/assemblyItemsBrowser.js
View file @ 00620484
This diff is collapsed.
src/basicPanel.js
View file @ 00620484
var React = require('react');
'use strict'
var React = require('react')
var style = require('./basicStyles')
module.exports = React.createClass({
getDefaultProps: function()
{
getDefaultProps: function () {
return {
data: null,
name: null,
renderRow: null
};
}
},
render: function()
{
render: function () {
return (
<div style={style.panel.container}>
<div style={style.panel.title} >{this.props.name}</div>
<div style={style.panel.tableContainer} >
<div style={style.panel.title}>
{this.props.name}
</div>
<div style={style.panel.tableContainer}>
<table style={style.panel.table}>
<tbody>
{this.renderItems()}
......@@ -25,21 +25,26 @@ module.exports = React.createClass({
</table>
</div>
</div>
);
)
},
renderItems: function()
{
if (!this.props.data)
renderItems: function () {
if (!this.props.data) {
return []
if (!this.props.renderRow)
{
}
if (!this.props.renderRow) {
var ret = []
for (var key in this.props.data)
ret.push(<tr key={key} ><td>{this.props.data[key]}</td></tr>)
return ret
for (var key in this.props.data) {
ret.push(
<tr key={key}>
<td>
{this.props.data[key]}
</td>
</tr>)
}
else
return ret
} else {
return this.props.renderRow(this.props.data)
}
}
})
src/basicStyles.js
View file @ 00620484
'use strict'
module.exports = {
wrapper:
{
'fontFamily': "arial,sans-serif"
wrapper: {
'fontFamily': 'arial,sans-serif'
},
container:
{
container: {
'margin': '10px',
'padding': '5px'
},
address:
{
address: {
'fontStyle': 'italic'
},
instructionsList:
{
'width': "320px"
instructionsList: {
'width': '320px'
},
transactionInfo:
{
transactionInfo: {
'marginTop': '5px'
},
panel:
{
container:
{
panel: {
container: {
'border': '1px solid',
'width': '600px'
},
tableContainer:
{
tableContainer: {
'height': '150px',
'overflowY': 'auto'
},
table:
{
table: {
'padding': '5px'
},
title:
{
title: {
'padding': '5px',
'fontStyle': 'italic'
}
},
hidden:
{
hidden: {
'display': 'none'
},
display:
{
display: {
'display': 'block'
},
sticker:
{
sticker: {
'verticalAlign': 'top',
'margin': '5px'
},
inline:
{
inline: {
'display': 'inline-block'
}
}
src/codeUtils.js
View file @ 00620484
'use strict'
var opcodes = require('./opcodes')
module.exports = {
nameOpCodes: function (raw)
{
nameOpCodes: function (raw) {
var pushData = ''
var codeMap = {}
var code = []
for (var i = 0; i < raw.length; i++)
{
for (var i = 0; i < raw.length; i++) {
var pc = i
var curOpCode = opcodes(raw[pc], false).name
codeMap[i] = code.length
// no destinations into the middle of PUSH
if (curOpCode.slice(0, 4) === 'PUSH')
{
if (curOpCode.slice(0, 4) === 'PUSH') {
var jumpNum = raw[pc] - 0x5f
pushData = raw.slice(pc + 1, pc + jumpNum + 1)
i += jumpNum
......
src/debugger.js
View file @ 00620484
var React = require('react');
var TxBrowser = require('./txBrowser');
var VmTraceManager = require('./vmTraceManager');
var VmTraceBrowser = require('./vmTraceBrowser');
'use strict'
var React = require('react')
var TxBrowser = require('./txBrowser')
var VmTraceBrowser = require('./vmTraceBrowser')
var style = require('./basicStyles')
module.exports = React.createClass({
getInitialState: function() {
return {vmTrace: null, state: "", currentStep: -1}
getInitialState: function () {
return {vmTrace: null, state: '', currentStep: -1}
},
render: function() {
childContextTypes: {
web3: React.PropTypes.object
},
getChildContext: function () {
return { web3: this.props.web3 }
},
render: function () {
return (
<div style={style.wrapper} >
<h1 style={style.container} >Eth Debugger</h1>
<div style={style.wrapper}>
<h1 style={style.container}>Eth Debugger</h1>
<TxBrowser onNewTxRequested={this.retrieveVmTrace} />
<div style={style.container} >{this.state.state}</div>
<div style={style.container}>
{this.state.state}
</div>
<VmTraceBrowser vmTrace={this.state.vmTrace} />
</div>
);
)
},
retrieveVmTrace: function(blockNumber, txNumber)
{
this.setState({state: "loading..."})
var deb = this
VmTraceManager.retrieveVmTrace(blockNumber, txNumber, function(error, result)
{
deb.setState({vmTrace: result, state: ""});
retrieveVmTrace: function (blockNumber, txNumber) {
this.setState({state: 'loading...'})
var self = this
this.props.web3.debug.trace(blockNumber, parseInt(txNumber), function (error, result) {
if (error) {
console.log(error)
} else {
self.setState({vmTrace: result, state: ''})
}
})
}
});
})
src/index.js
View file @ 00620484
var ReactDOM = require('react-dom');
var React = require('react');
var Web3 = require('web3');
'use strict'
var ReactDOM = require('react-dom')
var React = require('react')
var Web3 = require('web3')
var Web3Admin = require('./web3Admin')
web3 = new Web3();
web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));
Web3Admin.extend(web3);
function loadWeb3 () {
var web3 = new 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(
<Debugger/>,
<Debugger web3={loadWeb3()} />,
document.getElementById('app')
);
)
src/opcodes.js
View file @ 00620484
'use strict'
const codes = {
// 0x0 range - arithmetic ops
// name, baseCost, off stack, on stack, dynamic
......@@ -12,7 +13,7 @@ const codes = {
0x08: ['ADDMOD', 8, 3, 1, false],
0x09: ['MULMOD', 8, 3, 1, false],
0x0a: ['EXP', 10, 2, 1, false],
0x0b: ['SIGNEXTEND', 5, 1, 1, false],
0x0b: ['SIGNEXTEND', 5, 1, 1, false]
// 0x10 range - bit ops
0x10: ['LT', 3, 2, 1, false],
......
src/slider.js
View file @ 00620484
var React = require('react');
'use strict'
var React = require('react')
var style = require('./sliderStyles')
module.exports = React.createClass({
propTypes: {
onChange: React.PropTypes.func.isRequired,
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} />
<input
ref='rule'
style={style.rule}
type='range'
min={this.props.min}
max={this.props.max}
onMouseUp={this.onMouseUp} />
</div>
);
)
},
onMouseUp: function (event) {
......@@ -28,9 +34,10 @@ module.exports = React.createClass({
setValue: function (value) {
var diff = value - this.refs.rule.value
if (diff > 0)
if (diff > 0) {
this.refs.rule.stepUp(diff)
else
} else {
this.refs.rule.stepDown(Math.abs(diff))
}
}
})
src/sliderStyles.js
View file @ 00620484
'use strict'
module.exports = {
rule:
{
'width': '600px',
rule: {
'width': '600px'
},
runner:
{
runner: {
'position': 'absolute',
'width': '16px',
'height': '16px',
......
src/sticker.js
View file @ 00620484
var React = require('react');
var style = require('./basicStyles')
'use strict'
var React = require('react')
module.exports = React.createClass({
getDefaultProps: function()
{
getDefaultProps: function () {
return {
data: null,
};
data: null
}
},
render: function()
{
render: function () {
return (
<div>
<table><tbody>
<table>
<tbody>
{this.renderItems()}
</tbody></table>
</tbody>
</table>
</div>
);
)
},
renderItems: function()
{
if (this.props.data)
{
renderItems: function () {
if (this.props.data) {
var ret = []
for (var key in this.props.data)
ret.push(<tr key={key}><td>{this.props.data[key]}</td></tr>)
for (var key in this.props.data) {
ret.push(
<tr key={key}>
<td>
{this.props.data[key]}
</td>
</tr>)
}
return ret
}
return null
},
}
})
src/txBrowser.js
View file @ 00620484
var React = require('react');
'use strict'
var React = require('react')
var style = require('./basicStyles')
module.exports = React.createClass({
contextTypes: {
web3: React.PropTypes.object
},
propTypes: {
onNewTxRequested: React.PropTypes.func.isRequired,
onNewTxRequested: React.PropTypes.func.isRequired
},
getInitialState: function() {
return {blockNumber: "1382256", txNumber: "1", from: "", to: "", hash: ""}
getInitialState: function () {
return {blockNumber: '1382256', txNumber: '1', from: '', to: '', hash: ''}
},
submit: function()
{
var tx = web3.eth.getTransactionFromBlock(this.state.blockNumber, this.state.txNumber)
if (tx)
submit: function () {
var tx = this.context.web3.eth.getTransactionFromBlock(this.state.blockNumber, this.state.txNumber)
if (tx) {
this.setState({from: tx.from, to: tx.to, hash: tx.hash})
}
this.props.onNewTxRequested(this.state.blockNumber, parseInt(this.state.txNumber))
},
}
updateBlockN: function(ev) {
this.state.blockNumber = ev.target.value;
updateBlockN: function (ev) {
this.state.blockNumber = ev.target.value
},
updateTxN: function(ev) {
this.state.txNumber = ev.target.value;
updateTxN: function (ev) {
this.state.txNumber = ev.target.value
},
render: function() {
render: function () {
return (
<div style={style.container} >
<input onChange={this.updateBlockN} type="text" placeholder= {"Block number or hash (default 1382256)" + this.state.blockNumber}></input>
<input onChange={this.updateTxN} type="text" placeholder={"Transaction Number (default 1) " + this.state.txNumber}></input>
<button onClick={this.submit}>Get</button>
<div style={style.container}>
<input onChange={this.updateBlockN} type='text' placeholder={'Block number or hash (default 1382256)' + this.state.blockNumber}></input>
<input onChange={this.updateTxN} type='text' placeholder={'Transaction Number (default 1) ' + this.state.txNumber}></input>
<button onClick={this.submit}>
Get
</button>
<div style={style.transactionInfo}>
<div>Hash: {this.state.hash}</div>
<div>From: {this.state.from}</div>
<div>To: {this.state.to}</div>
<div>
Hash:
{this.state.hash}
</div>
<div>
From:
{this.state.from}
</div>
<div>
To:
{this.state.to}
</div>
</div>
</div>
);
)
}
})
src/vmTraceBrowser.js
View file @ 00620484
var React = require('react');
var AssemblyItemsBrowser = require('./assemblyItemsBrowser');
'use strict'
var React = require('react')
var AssemblyItemsBrowser = require('./assemblyItemsBrowser')
module.exports = React.createClass({
render: function() {
render: function () {
return (
<div>
<AssemblyItemsBrowser vmTrace={this.props.vmTrace} />
</div>
)
},
});
}
})
src/vmTraceButtonNavigator.js
View file @ 00620484
var React = require('react');
'use strict'
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,
stepOverForward: React.PropTypes.func.isRequired
},
render: function() {
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>
<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" : ""
},
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' : ''
}
}
})
src/vmTraceManager.js
View file @ 00620484
'use strict'
module.exports = {
retrieveVmTrace: function(blockNumber, txNumber, callBack) {
web3.debug.trace(blockNumber, parseInt(txNumber), function(error, result)
{
retrieveVmTrace: function (blockNumber, txNumber, callBack) {
this.context.web3.debug.trace(blockNumber, parseInt(txNumber), function (error, result) {
callBack(error, result)
});
})
}
}
src/web3Admin.js
View file @ 00620484
'use strict'
module.exports = {
extend: function(web3) {
extend: function (web3) {
// ADMIN
web3._extend({
property: 'admin',
methods:
[
methods: [
new web3._extend.Method({
name: 'addPeer',
call: 'admin_addPeer',
......@@ -18,14 +17,14 @@ module.exports = {
call: 'admin_exportChain',
params: 1,
inputFormatter: [null],
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
}),
new web3._extend.Method({
name: 'importChain',
call: 'admin_importChain',
params: 1,
inputFormatter: [null],
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
}),
new web3._extend.Method({
name: 'verbosity',
......@@ -45,7 +44,7 @@ module.exports = {
name: 'startRPC',
call: 'admin_startRPC',
params: 4,
inputFormatter: [null,web3._extend.utils.formatInputInteger,null,null],
inputFormatter: [null, web3._extend.utils.formatInputInteger, null, null],
outputFormatter: web3._extend.formatters.formatOutputBool
}),
new web3._extend.Method({
......@@ -60,10 +59,9 @@ module.exports = {
call: 'admin_eth_vmTrace',
inputFormatter: [null, null, null],
params: 3
}),
})
],
properties:
[
properties: [
new web3._extend.Property({
name: 'nodeInfo',
getter: 'admin_nodeInfo',
......@@ -72,7 +70,7 @@ module.exports = {
new web3._extend.Property({
name: 'peers',
getter: 'admin_peers',
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
}),
new web3._extend.Property({
name: 'datadir',
......@@ -82,20 +80,18 @@ module.exports = {
new web3._extend.Property({
name: 'chainSyncStatus',
getter: 'admin_chainSyncStatus',
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
})
]
});
})
// DEBUG
web3._extend({
property: 'debug',
methods:
[
methods: [
new web3._extend.Method({
name: 'trace',
call: 'debug_trace',
params: 1,
inputFormatter: [null, null],
params: 2
}),
......@@ -125,7 +121,7 @@ module.exports = {
call: 'debug_processBlock',
params: 1,
inputFormatter: [web3._extend.formatters.formatInputInt],
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
}),
new web3._extend.Method({
name: 'seedHash',
......@@ -133,25 +129,22 @@ module.exports = {
params: 1,
inputFormatter: [web3._extend.formatters.formatInputInt],
outputFormatter: web3._extend.formatters.formatOutputString
}) ,
}),
new web3._extend.Method({
name: 'dumpBlock',
call: 'debug_dumpBlock',
params: 1,
inputFormatter: [web3._extend.formatters.formatInputInt],
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
})
],
properties:
[
]
});
properties: []
})
// MINER
web3._extend({
property: 'miner',
methods:
[
methods: [
new web3._extend.Method({
name: 'start',
call: 'miner_start',
......@@ -202,21 +195,19 @@ module.exports = {
outputFormatter: web3._extend.formatters.formatOutputBool
})
],
properties:
[
properties: [
new web3._extend.Property({
name: 'hashrate',
getter: 'miner_hashrate',
outputFormatter: web3._extend.utils.toDecimal
})
]
});
})
// NETWORK
web3._extend({
property: 'network',
methods:
[
methods: [
new web3._extend.Method({
name: 'addPeer',
call: 'net_addPeer',
......@@ -232,8 +223,7 @@ module.exports = {
outputFormatter: web3._extend.formatters.formatOutputString
})
],
properties:
[
properties: [
new web3._extend.Property({
name: 'listening',
getter: 'net_listening',
......@@ -247,7 +237,7 @@ module.exports = {
new web3._extend.Property({
name: 'peers',
getter: 'net_peers',
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
}),
new web3._extend.Property({
name: 'version',
......@@ -255,23 +245,19 @@ module.exports = {
outputFormatter: web3._extend.formatters.formatOutputString
})
]
});
})
// TX POOL
web3._extend({
property: 'txpool',
methods:
[
],
properties:
[
methods: [],
properties: [
new web3._extend.Property({
name: 'status',
getter: 'txpool_status',
outputFormatter: function(obj) { return obj; }
outputFormatter: function (obj) { return obj }
})
]
});
})
}
};
}
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