Merge pull request #380 from ethereumjs/fix-test-GasLimitHigherThan2p…

…63m1

Fix failing blockchain test GasLimitHigherThan2p63m1

lib/runBlock.js

@@ -55,6 +55,7 @@ module.exports = function (opts, cb) {
   // run everything
   async.series([
     beforeBlock,
+    validateBlock,
     processTransactions,
     payOmmersAndMiner
   ], parseBlockResults)
@@ -81,6 +82,14 @@ module.exports = function (opts, cb) {
     self.emit('afterBlock', result, cb)
   }
 
+  function validateBlock (cb) {
+    if (new BN(block.header.gasLimit).gte(new BN('8000000000000000', 16))) {
+      cb(new Error('Invalid block with gas limit greater than (2^63 - 1)'))
+    } else {
+      cb()
+    }
+  }
+
   /**
    * Processes all of the transaction in the block
    * @method processTransaction

tests/api/runBlock.js

@@ -69,6 +69,23 @@ tape('runBlock', async (t) => {
   })
 })
 
+tape('should fail when block gas limit higher than 2^63-1', async (t) => {
+  const suite = setup()
+
+  const genesis = createGenesis()
+  const block = new Block({
+    header: {
+      ...suite.data.blocks[0].header,
+      gasLimit: Buffer.from('8000000000000000', 16)
+    }
+  })
+  suite.p.runBlock({ block, root: genesis.header.stateRoot })
+    .then(() => t.fail('should have returned error'))
+    .catch((e) => t.ok(e.message.includes('Invalid block')))
+
+  t.end()
+})
+
 tape('should fail when tx gas limit higher than block gas limit', async (t) => {
   const suite = setup()