Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subdivide runState, refactor loop #498

Merged
merged 11 commits into from
Apr 25, 2019
Merged

Subdivide runState, refactor loop #498

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d037219
Break runState into runState, result, env
s1na Apr 23, 2019
b7139e0
Drop emitFreeLogs flag, mv static from runState to env
s1na Apr 23, 2019
3a94f2d
Mv depth to env, throw on pc out of range
s1na Apr 23, 2019
becd29b
Add interpreter runPrecompile to replace runJit
s1na Apr 23, 2019
15a1499
Pass message & txContext directly to loop.run
s1na Apr 23, 2019
e205a44
evm: make runState an attribute of loop, mv lastReturned to eei
s1na Apr 23, 2019
9339bb0
evm: fix isAccountEmpty
s1na Apr 23, 2019
446fbdf
evm: mv parseVmResults logic to loop.run
s1na Apr 23, 2019
e27ac52
Minor improvements
s1na Apr 24, 2019
5c721b5
Fix linting errors
s1na Apr 24, 2019
51b8d6b
Fix typo
s1na Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 23 additions & 33 deletions lib/evm/loop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,29 @@ module.exports = class Loop {
}
}

return this.parseVmResults(err, opts.message.gasLimit)
let gasUsed = opts.message.gasLimit.sub(this._runState.gasLeft)
if (err) {
if (err.error !== ERROR.REVERT) {
gasUsed = opts.message.gasLimit
}

// remove any logs on error
this._result = Object.assign({}, this._result, {
logs: [],
vmError: true,
gasRefund: null,
selfdestruct: null
})
}

return Object.assign({}, this._result, {
runState: Object.assign({}, this._runState, this._result, this._runState.eei._env),
exception: err ? 0 : 1,
exceptionError: err,
gas: this._runState.gasLeft,
gasUsed,
'return': this._result.returnValue ? this._result.returnValue : Buffer.alloc(0)
})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inlined parseVmResults, ok.

}

canContinueExecution () {
Expand Down Expand Up @@ -141,38 +163,6 @@ module.exports = class Loop {
return opFns[opInfo.name]
}

async parseVmResults (err, gasLimit) {
// remove any logs on error
if (err) {
this._result.logs = []
this._result.vmError = true
}

const results = {
runState: Object.assign({}, this._runState, this._result, this._runState.eei._env),
selfdestruct: this._result.selfdestruct,
gasRefund: this._result.gasRefund,
exception: err ? 0 : 1,
exceptionError: err,
logs: this._result.logs,
gas: this._runState.gasLeft,
'return': this._result.returnValue ? this._result.returnValue : Buffer.alloc(0)
}

if (results.exceptionError) {
delete results.gasRefund
delete results.selfdestruct
}

if (err && err.error !== ERROR.REVERT) {
results.gasUsed = gasLimit
} else {
results.gasUsed = gasLimit.sub(this._runState.gasLeft)
}

return results
}

async runStepHook () {
const eventObj = {
pc: this._runState.programCounter,
Expand Down
2 changes: 1 addition & 1 deletion lib/evm/opFns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ module.exports = {

function describeLocation (runState) {
var hash = utils.keccak256(runState.eei.getCode()).toString('hex')
var address = runState.address.toString('hex')
var address = runState.eei.getAddress().toString('hex')
var pc = runState.programCounter - 1
return hash + '/' + address + ':' + pc
}
Expand Down