Setting hardfork on common

ethereumjs · Jul 23, 2019 · 85c8a59 · alcuadrado · Jul 23, 2019 · alcuadrado
1 parent 0eff24b
commit 85c8a59
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -31,6 +31,10 @@ var Block = module.exports = function (data, opts) {
     let chain = opts.chain ? opts.chain : 'mainnet'
     let hardfork = opts.hardfork ? opts.hardfork : null
     this._common = new Common(chain, hardfork)
+    if (!hardfork) {
+      hardfork = this._common.activeHardforks()
+      this._common._hardfork = hardfork
+    }
   }
 
   this.transactions = []
@@ -69,9 +73,8 @@ var Block = module.exports = function (data, opts) {
   for (var i = 0; i < rawUncleHeaders.length; i++) {
     this.uncleHeaders.push(new BlockHeader(rawUncleHeaders[i], opts))
   }
-
   for (i = 0; i < rawTransactions.length; i++) {
-    var tx = new Tx(rawTransactions[i], opts)
+    var tx = new Tx(rawTransactions[i], {common: this._common})
     this.transactions.push(tx)
   }
 }