Merge branch 'master' into tx-fix-isSigned

Author: holgerd77

packages/vm/lib/runTx.ts

@@ -27,6 +27,12 @@ export interface RunTxOpts {
    * If true, skips the balance check
    */
   skipBalance?: boolean
+
+  /**
+   * If true, skips the validation of the tx's gas limit
+   * agains the block's gas limit.
+   */
+  skipBlockGasLimitValidation?: boolean
 }
 
 /**
@@ -66,7 +72,10 @@ export default async function runTx(this: VM, opts: RunTxOpts): Promise<RunTxRes
   // create a reasonable default if no block is given
   opts.block = opts.block ?? Block.fromBlockData({}, { common: opts.tx.common })
 
-  if (opts.block.header.gasLimit.lt(opts.tx.gasLimit)) {
+  if (
+    opts.skipBlockGasLimitValidation !== true &&
+    opts.block.header.gasLimit.lt(opts.tx.gasLimit)
+  ) {
     throw new Error('tx has a higher gas limit than the block')
   }
 

packages/vm/tests/api/runTx.spec.ts

@@ -1,5 +1,6 @@
 import tape from 'tape'
-import { Address, BN, MAX_INTEGER } from 'ethereumjs-util'
+import { Account, Address, BN, MAX_INTEGER } from 'ethereumjs-util'
+import { Block } from '@ethereumjs/block'
 import Common from '@ethereumjs/common'
 import { Transaction } from '@ethereumjs/tx'
 import VM from '../../lib'
@@ -144,6 +145,48 @@ tape('should clear storage cache after every transaction', async (t) => {
   t.end()
 })
 
+tape('should be possible to disable the block gas limit validation', async (t) => {
+  const vm = new VM()
+
+  const privateKey = Buffer.from(
+    'e331b6d69882b4cb4ea581d88e0b604039a3de5967688d3dcffdd2270c0fd109',
+    'hex'
+  )
+  const address = Address.fromPrivateKey(privateKey)
+  const initialBalance = new BN(10).pow(new BN(18))
+
+  const account = await vm.stateManager.getAccount(address)
+  await vm.stateManager.putAccount(
+    address,
+    Account.fromAccountData({ ...account, balance: initialBalance })
+  )
+
+  const transferCost = 21000
+
+  const unsignedTx = Transaction.fromTxData({
+    to: address,
+    gasLimit: transferCost,
+    gasPrice: 1,
+    nonce: 0,
+  })
+
+  const tx = unsignedTx.sign(privateKey)
+
+  const block = Block.fromBlockData({
+    header: { gasLimit: transferCost - 1 },
+  })
+
+  const result = await vm.runTx({
+    tx,
+    block,
+    skipBlockGasLimitValidation: true,
+  })
+
+  t.equals(result.execResult.exceptionError, undefined)
+
+  t.end()
+})
+
 // The following test tries to verify that running a tx
 // would work, even when stateManager is not using a cache.
 // It fails at the moment, and has been therefore commented.