Refactoring

Author: rmeissner

lib/opFns.js

@@ -536,9 +536,8 @@ module.exports = {
       outLength: new BN(0)
     }
 
-    // Deduct gas costs for hashing
-    // TODO this is not yet part of the tests
-    // subGas(runState, new BN(runState._common.param('gasPrices', 'sha3Word')).imul(length.divCeil(new BN(32))))
+    // Deduct gas costs for hashingq
+    subGas(runState, new BN(runState._common.param('gasPrices', 'sha3Word')).imul(length.divCeil(new BN(32))))
     checkCallMemCost(runState, options, localOpts)
     checkOutOfGas(runState, options)
     makeCall(runState, options, localOpts, done)

lib/runCall.js

@@ -78,50 +78,57 @@ module.exports = function (opts, cb) {
         createdAddress = toAddress = ethUtil.generateAddress(caller, newNonce.toArray())
       }
 
-      stateManager.getAccount(createdAddress, function (err, account) {
-        if (err) {
-          done(err)
-          return
-        }
+      checkAccountState(createdAddress, setupNewContract, done)
+    } else {
+      // else load the `to` account
+      toAccount = stateManager.cache.get(toAddress)
+      done()
+    }
+  }
 
-        if ((account.nonce && new BN(account.nonce) > 0) || account.codeHash.compare(EMPTY_CODE_HASH) !== 0) {
-          done(ERROR.INVALID_OPCODE)
-          return
-        }
+  function checkAccountState(address, next, done) {
+    stateManager.getAccount(address, function (err, account) {
+      if (err) {
+        done(err)
+        return
+      }
 
-        stateManager.clearContractStorage(createdAddress, function (err) {
-          if (err) {
-            done(err)
-            return
-          }
+      if ((account.nonce && new BN(account.nonce) > 0) || account.codeHash.compare(EMPTY_CODE_HASH) !== 0) {
+        done(ERROR.INVALID_OPCODE)
+        return
+      }
+
+      next(address, done)
+    })
+  }
 
-          async.series([
-            newContractEvent,
-            getAccount
-          ], done)
+  function setupNewContract(address, done) {
+    stateManager.clearContractStorage(address, function (err) {
+      if (err) {
+        done(err)
+        return
+      }
 
-          function newContractEvent (callback) {
-            self.emit('newContract', {
-              address: createdAddress,
-              code: code
-            }, callback)
-          }
+      async.series([
+        newContractEvent,
+        getAccount
+      ], done)
 
-          function getAccount (callback) {
-            stateManager.getAccount(createdAddress, function (err, account) {
-              toAccount = account
-              const NONCE_OFFSET = 1
-              toAccount.nonce = new BN(toAccount.nonce).addn(NONCE_OFFSET).toArrayLike(Buffer)
-              callback(err)
-            })
-          }
+      function newContractEvent (callback) {
+        self.emit('newContract', {
+          address: address,
+          code: code
+        }, callback)
+      }
+
+      function getAccount (callback) {
+        stateManager.getAccount(address, function (err, account) {
+          toAccount = account
+          toAccount.nonce = new BN(toAccount.nonce).addn(1).toArrayLike(Buffer)
+          callback(err)
         })
-      })
-    } else {
-      // else load the `to` account
-      toAccount = stateManager.cache.get(toAddress)
-      done()
-    }
+      }
+    })
   }
 
   function subTxValue (cb) {