Merge pull request ethereumjs#392 from ethereumjs/reset-selfdestruct-on-revert

holgerd77 · web-flow · commit db3db1c333e2 · 2018-11-16T20:31:48.000+01:00
Reset selfdestruct on revert
diff --git a/lib/opFns.js b/lib/opFns.js
@@ -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
@@ -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)
