Merge pull request #297 from mattdean-digicatapult/update-tests-Rever…

…tInCreateInInit Created contract accounts should have nonce 1 and storage empty
ethereumjs · Apr 28, 2018 · c243d5e · c243d5e
2 parents 9cd0665 + 702a07c
commit c243d5e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/lib/runCall.js b/lib/runCall.js
@@ -70,11 +70,16 @@ module.exports = function (opts, cb) {
       txData = undefined
       var newNonce = new BN(account.nonce).subn(1)
       createdAddress = toAddress = ethUtil.generateAddress(caller, newNonce.toArray())
-      stateManager.getAccount(createdAddress, function (err, account) {
-        toAccount = account
-        const NONCE_OFFSET = 1
-        toAccount.nonce = new BN(toAccount.nonce).addn(NONCE_OFFSET).toArrayLike(Buffer)
-        done(err)
+      stateManager.clearContractStorage(createdAddress, function (err) {
+        if (err) {
+          done(err)
+        }
+
+        stateManager.getAccount(createdAddress, function (err, account) {
+          toAccount = account
+          toAccount.nonce = new BN(1).toArrayLike(Buffer)
+          done(err)
+        })
       })
     } else {
       // else load the `to` account

diff --git a/lib/stateManager.js b/lib/stateManager.js
@@ -160,21 +160,14 @@ proto.getContractStorage = function (address, key, cb) {
   })
 }
 
-proto.putContractStorage = function (address, key, value, cb) {
+proto._modifyContractStorage = function (address, modifyTrie, cb) {
   var self = this
   self._getStorageTrie(address, function (err, storageTrie) {
     if (err) {
       return cb(err)
     }
 
-    if (value && value.length) {
-      // format input
-      var encodedValue = rlp.encode(value)
-      storageTrie.put(key, encodedValue, finalize)
-    } else {
-      // deleting a value
-      storageTrie.del(key, finalize)
-    }
+    modifyTrie(storageTrie, finalize)
 
     function finalize (err) {
       if (err) return cb(err)
@@ -189,6 +182,28 @@ proto.putContractStorage = function (address, key, value, cb) {
   })
 }
 
+proto.putContractStorage = function (address, key, value, cb) {
+  var self = this
+  self._modifyContractStorage(address, function (storageTrie, done) {
+    if (value && value.length) {
+      // format input
+      var encodedValue = rlp.encode(value)
+      storageTrie.put(key, encodedValue, done)
+    } else {
+      // deleting a value
+      storageTrie.del(key, done)
+    }
+  }, cb)
+}
+
+proto.clearContractStorage = function (address, cb) {
+  var self = this
+  self._modifyContractStorage(address, function (storageTrie, done) {
+    storageTrie.root = storageTrie.EMPTY_TRIE_ROOT
+    done()
+  }, cb)
+}
+
 proto.commitContracts = function (cb) {
   var self = this
   async.each(Object.keys(self._storageTries), function (address, cb) {