Merge pull request #113 from ethereumjs/fix-undefined-transaction-sta…

…te-on-block-addition Explicitly initialize Common instances with chainstart HF
ethereumjs · Jun 2, 2020 · 2d86f29 · 2d86f29
2 parents 22a72f4 + 08f212c
commit 2d86f29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bin/cli.js b/bin/cli.js
@@ -114,7 +114,10 @@ async function run () {
   const syncDirName = args.syncmode === 'light' ? 'lightchaindata' : 'chaindata'
   const networkDirName = args.network === 'mainnet' ? '' : `${args.network}/`
   const chainParams = args.params ? await parse.params(args.params) : args.network
-  const common = new Common(chainParams)
+  // Initialize Common with an explicit 'chainstart' HF set until
+  // hardfork awareness is implemented within the library
+  // Also a fix for https://github.com/ethereumjs/ethereumjs-vm/issues/757
+  const common = new Common(chainParams, 'chainstart')
   const servers = parse.transports(args.transports).map(t => {
     const Server = serverFromName(t.name)
     if (t.name === 'rlpx') {

diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js
@@ -10,7 +10,7 @@ const promisify = require('util-promisify')
 
 const defaultOptions = {
   logger: defaultLogger,
-  common: new Common('mainnet')
+  common: new Common('mainnet', 'chainstart')
 }
 
 /**

diff --git a/lib/service/ethereumservice.js b/lib/service/ethereumservice.js
@@ -7,7 +7,7 @@ const Common = require('ethereumjs-common').default
 
 const defaultOptions = {
   lightserv: false,
-  common: new Common('mainnet'),
+  common: new Common('mainnet', 'chainstart'),
   minPeers: 3,
   timeout: 5000,
   interval: 1000