[VM] fix SpuriousDragon and lint

ethereumjs · Jul 13, 2020 · 04eaff3 · 04eaff3
1 parent 46d9cd6
commit 04eaff3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/packages/vm/lib/evm/opFns.ts b/packages/vm/lib/evm/opFns.ts
@@ -662,12 +662,12 @@ export const handlers: { [k: string]: OpHandler } = {
     }
     subMemUsage(runState, inOffset, inLength)
     subMemUsage(runState, outOffset, outLength)
-    
-    if (!value.isZero()){
+
+    if (!value.isZero()) {
       runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callValueTransfer')))
     }
     gasLimit = maxCallGas(gasLimit, runState.eei.getGasLeft())
-    
+
     let data = Buffer.alloc(0)
     if (!inLength.isZero()) {
       data = runState.memory.read(inOffset.toNumber(), inLength.toNumber())
@@ -676,10 +676,10 @@ export const handlers: { [k: string]: OpHandler } = {
     if (runState._common.gteHardfork('spuriousDragon')) {
       // We are at or after Spurious Dragon
       // Call new account gas: account is DEAD and we transfer nonzero value
-      if (runState.stateManager.accountIsEmpty(toAddressBuf) && !value.isZero()) {
+      if ((await runState.stateManager.accountIsEmpty(toAddressBuf)) && !value.isZero()) {
         runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callNewAccount')))
       }
-    } else if ( !(await runState.stateManager.accountExists(toAddressBuf))){
+    } else if (!(await runState.stateManager.accountExists(toAddressBuf))) {
       // We are before Spurious Dragon
       // Call new account gas: account does not exist (it is not in the state trie, not even as an "empty" account)
       const accountDoesNotExist = !(await runState.stateManager.accountExists(toAddressBuf))

diff --git a/packages/vm/lib/runTx.ts b/packages/vm/lib/runTx.ts
@@ -179,7 +179,6 @@ async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   // the state.putAccount function puts this into the "touched" accounts. This will thus be removed when
   // we clean the touched accounts below in case we are in a fork >= SpuriousDragon
   await state.putAccount(block.header.coinbase, minerAccount)
-
 
   /*
    * Cleanup accounts

diff --git a/packages/vm/lib/state/stateManager.ts b/packages/vm/lib/state/stateManager.ts
@@ -88,7 +88,7 @@ export default class DefaultStateManager implements StateManager {
     this._cache.put(address, account)
     this.touchAccount(address)
   }
-  
+
   async deleteAccount(address: Buffer) {
     this._cache.del(address)
     this.touchAccount(address)
@@ -490,10 +490,10 @@ export default class DefaultStateManager implements StateManager {
   async accountExists(address: Buffer): Promise<boolean> {
     const account = await this._cache.lookup(address)
     if (account) {
-      return true;
+      return true
     }
     if (await this._cache._trie.get(address)) {
-      return true;
+      return true
     }
     return false
   }