develop: fix client parse, move modifyAccountFields to baseStateManager (#1765)

* client fix parse: now with common default being london, explicitly setHardforkByBlockNumber(0) when creating genesis header
* vm: move new modifyAccountFields to baseStateManager
* fix lint

Author: ryanio

packages/client/lib/util/parse.ts

@@ -148,16 +148,16 @@ async function createGethGenesisBlockHeader(json: any) {
     stateRoot,
     baseFeePerGas,
   }
-  let common
+  let common = new Common({ chain: 1 })
   if (json.config.londonBlock === 0) {
     // chainId is not important here, we just want to set
     // hardfork to London for baseFeePerGas support
-    const hardforks = new Common({ chain: 1 })
+    const hardforks = common
       .hardforks()
       .map((h) => (h.name === Hardfork.London ? { ...h, block: 0 } : h))
     common = Common.custom({ chainId: 1, hardforks })
-    common.setHardforkByBlockNumber(0)
   }
+  common.setHardforkByBlockNumber(0)
   return BlockHeader.fromHeaderData(headerData, { common })
 }
 

packages/client/test/miner/miner.spec.ts

@@ -4,7 +4,7 @@ import Common, { Chain as CommonChain, Hardfork } from '@ethereumjs/common'
 import { FeeMarketEIP1559Transaction, Transaction } from '@ethereumjs/tx'
 import { Block, BlockHeader } from '@ethereumjs/block'
 import { DefaultStateManager, StateManager } from '@ethereumjs/vm/dist/state'
-import { Account, Address, BN, keccak256 } from 'ethereumjs-util'
+import { Address, BN, keccak256 } from 'ethereumjs-util'
 import { Config } from '../../lib/config'
 import { FullEthereumService } from '../../lib/service'
 import { Chain } from '../../lib/blockchain'

packages/client/test/miner/pendingBlock.spec.ts

@@ -5,7 +5,7 @@ import { Transaction } from '@ethereumjs/tx'
 import { BlockHeader } from '@ethereumjs/block'
 import VM from '@ethereumjs/vm'
 import { DefaultStateManager, StateManager } from '@ethereumjs/vm/dist/state'
-import { Account, Address, BN } from 'ethereumjs-util'
+import { Address, BN } from 'ethereumjs-util'
 import { Config } from '../../lib/config'
 import { TxPool } from '../../lib/service/txpool'
 import { PendingBlock } from '../../lib/miner'

packages/vm/src/state/baseStateManager.ts

@@ -5,6 +5,7 @@ import { debug as createDebugLogger, Debugger } from 'debug'
 import { Account, Address, toBuffer } from 'ethereumjs-util'
 import { ripemdPrecompileAddress } from '../evm/precompiles'
 import Cache from './cache'
+import { AccountFields } from './interface'
 import { DefaultStateManagerOpts } from './stateManager'
 
 type AddressHex = string
@@ -108,6 +109,22 @@ export abstract class BaseStateManager {
     this.touchAccount(address)
   }
 
+  /**
+   * Gets the account associated with `address`, modifies the given account
+   * fields, then saves the account into state. Account fields can include
+   * `nonce`, `balance`, `stateRoot`, and `codeHash`.
+   * @param address - Address of the account to modify
+   * @param accountFields - Object containing account fields and values to modify
+   */
+  async modifyAccountFields(address: Address, accountFields: AccountFields): Promise<void> {
+    const account = await this.getAccount(address)
+    account.nonce = accountFields.nonce ?? account.nonce
+    account.balance = accountFields.balance ?? account.balance
+    account.stateRoot = accountFields.stateRoot ?? account.stateRoot
+    account.codeHash = accountFields.codeHash ?? account.codeHash
+    await this.putAccount(address, account)
+  }
+
   /**
    * Deletes an account from state under the provided `address`. The account will also be removed from the state trie.
    * @param address - Address of the account which should be deleted

packages/vm/src/state/stateManager.ts

@@ -15,7 +15,7 @@ import {
   setLengthLeft,
 } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
-import { StateManager, StorageDump, AccountFields } from './interface'
+import { StateManager, StorageDump } from './interface'
 import Cache, { getCb, putCb } from './cache'
 import { BaseStateManager } from './'
 import { short } from '../evm/opcodes'
@@ -518,20 +518,4 @@ export default class DefaultStateManager extends BaseStateManager implements Sta
     }
     return false
   }
-
-  /**
-   * Gets the account associated with `address`, modifies the given account
-   * fields, then saves the account into state. Account fields can include
-   * `nonce`, `balance`, `stateRoot`, and `codeHash`.
-   * @param address - Address of the account to modify
-   * @param accountFields - Object containing account fields and values to modify
-   */
-  async modifyAccountFields(address: Address, accountFields: AccountFields): Promise<void> {
-    const account = await this.getAccount(address)
-    account.nonce = accountFields.nonce ?? account.nonce
-    account.balance = accountFields.balance ?? account.balance
-    account.stateRoot = accountFields.stateRoot ?? account.stateRoot
-    account.codeHash = accountFields.codeHash ?? account.codeHash
-    await this.putAccount(address, account)
-  }
 }