Merge c1888ec into 3c458de

Author: danjm

index.js

@@ -5,7 +5,7 @@ const Stoplight = require('flow-stoplight')
 const semaphore = require('semaphore')
 const level = require('level-mem')
 const Block = require('ethereumjs-block')
-const Common = require('ethereumjs-common')
+const Common = require('ethereumjs-common').default
 const ethUtil = require('ethereumjs-util')
 const Ethash = require('ethashjs')
 const Buffer = require('safe-buffer').Buffer

package.json

@@ -27,7 +27,7 @@
     "async": "^2.6.1",
     "ethashjs": "~0.0.7",
     "ethereumjs-block": "~2.1.0",
-    "ethereumjs-common": "~0.6.0",
+    "ethereumjs-common": "~1.0.0",
     "ethereumjs-util": "~6.0.0",
     "flow-stoplight": "^1.0.0",
     "level-mem": "^3.0.1",

test/index.js

@@ -3,7 +3,7 @@
 const test = require('tape')
 const Blockchain = require('..')
 const Block = require('ethereumjs-block')
-const Common = require('ethereumjs-common')
+const Common = require('ethereumjs-common').default
 const async = require('async')
 const ethUtil = require('ethereumjs-util')
 const level = require('level-mem')