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

Reset selfdestruct on revert #392

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Reset selfdestruct on revert #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lib/opFns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,12 +988,13 @@ function checkOutOfGas (runState, callOptions) {

// sets up and calls runCall
function makeCall (runState, callOptions, localOpts, cb) {
var selfdestruct = Object.assign({}, runState.selfdestruct)
callOptions.caller = callOptions.caller || runState.address
callOptions.origin = runState.origin
callOptions.gasPrice = runState.gasPrice
callOptions.block = runState.block
callOptions.static = callOptions.static || false
callOptions.selfdestruct = runState.selfdestruct
callOptions.selfdestruct = selfdestruct
callOptions.storageReader = runState.storageReader

// increment the runState.depth
Expand Down Expand Up @@ -1053,6 +1054,7 @@ function makeCall (runState, callOptions, localOpts, cb) {
}

if (!results.vm.exceptionError) {
Object.assign(runState.selfdestruct, selfdestruct)
// update stateRoot on current contract
runState.stateManager.getAccount(runState.address, function (err, account) {
if (err) return cb(err)
Expand Down