last fixups

packages/vm/lib/evm/eei.ts

@@ -245,35 +245,35 @@ export default class EEI {
    * Returns the block’s number.
    */
   getBlockNumber(): BN {
-    return new BN(this._env.block.header.number)
+    return this._env.block.header.number
   }
 
   /**
    * Returns the block's beneficiary address.
    */
   getBlockCoinbase(): BN {
-    return new BN(this._env.block.header.coinbase)
+    return new BN(this._env.block.header.coinbase.buf)
   }
 
   /**
    * Returns the block's timestamp.
    */
   getBlockTimestamp(): BN {
-    return new BN(this._env.block.header.timestamp)
+    return this._env.block.header.timestamp
   }
 
   /**
    * Returns the block's difficulty.
    */
   getBlockDifficulty(): BN {
-    return new BN(this._env.block.header.difficulty)
+    return this._env.block.header.difficulty
   }
 
   /**
    * Returns the block's gas limit.
    */
   getBlockGasLimit(): BN {
-    return new BN(this._env.block.header.gasLimit)
+    return this._env.block.header.gasLimit
   }
 
   /**

packages/vm/lib/evm/evm.ts

@@ -340,7 +340,7 @@ export default class EVM {
       depth: message.depth || 0,
       gasPrice: this._tx.gasPrice,
       origin: this._tx.origin || message.caller || zeros(32),
-      block: this._block || Block.fromBlockData(),
+      block: this._block || new Block(),
       contract: await this._state.getAccount(message.to || zeros(32)),
       codeAddress: message.codeAddress,
     }

packages/vm/lib/runCall.ts

@@ -33,7 +33,7 @@ export interface RunCallOpts {
  * @ignore
  */
 export default function runCall(this: VM, opts: RunCallOpts): Promise<EVMResult> {
-  const block = opts.block || Block.fromBlockData()
+  const block = opts.block || new Block()
 
   const txContext = new TxContext(
     opts.gasPrice || new BN(0),

packages/vm/lib/runCode.ts

@@ -72,7 +72,7 @@ export interface RunCodeOpts {
  */
 export default function runCode(this: VM, opts: RunCodeOpts): Promise<ExecResult> {
   if (!opts.block) {
-    opts.block = Block.fromBlockData()
+    opts.block = new Block()
   }
 
   // Backwards compatibility

packages/vm/lib/runTx.ts

@@ -81,7 +81,7 @@ export default async function runTx(this: VM, opts: RunTxOpts): Promise<RunTxRes
 
 async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   const state = this.stateManager
-  const { block, tx } = opts
+  const { tx, block } = opts
 
   /**
    * The `beforeTx` event
@@ -152,7 +152,7 @@ async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   results.gasUsed.iadd(basefee)
   // Process any gas refund
   const gasRefund = evm._refund
-  if (gasRefund) {
+  if (gasRefund.gtn(0)) {
     if (gasRefund.lt(results.gasUsed.divn(2))) {
       results.gasUsed.isub(gasRefund)
     } else {
@@ -171,14 +171,15 @@ async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   await state.putAccount(caller, fromAccount)
 
   // Update miner's balance
-  const minerAccount = await state.getAccount(block!.header.coinbase.buf)
+  const minerBuf = block!.header.coinbase.buf
+  const minerAccount = await state.getAccount(minerBuf)
   // add the amount spent on gas to the miner's account
   minerAccount.balance = new BN(minerAccount.balance).add(results.amountSpent).toArrayLike(Buffer)
 
   // Put the miner account into the state. If the balance of the miner account remains zero, note that
   // the state.putAccount function puts this into the "touched" accounts. This will thus be removed when
   // we clean the touched accounts below in case we are in a fork >= SpuriousDragon
-  await state.putAccount(block!.header.coinbase.buf, minerAccount)
+  await state.putAccount(minerBuf, minerAccount)
 
   /*
    * Cleanup accounts

packages/vm/tests/GeneralStateTestsRunner.ts

@@ -70,20 +70,17 @@ async function runTestCase(options: any, testData: any, t: tape.Test) {
 
   const common = new Common({ chain: 'mainnet', hardfork, eips })
 
-  const vm = new VM({
-    state,
-    common: common,
-  })
+  const vm = new VM({ state, common })
 
   await setupPreConditions(vm.stateManager._trie, testData)
 
-  const tx = makeTx(testData.transaction, common)
+  const tx = makeTx(testData.transaction, { common })
 
   if (!tx.validate()) {
     throw new Error('Transaction is invalid')
   }
 
-  const block = makeBlockFromEnv(testData.env)
+  const block = makeBlockFromEnv(testData.env, { common })
 
   if (options.jsontrace) {
     vm.on('step', function (e: any) {

packages/vm/tests/util.ts

@@ -1,8 +1,8 @@
 import * as tape from 'tape'
 import { BN, rlp, keccak256, stripHexPrefix, setLengthLeft, toBuffer } from 'ethereumjs-util'
 import Account from '@ethereumjs/account'
-import { Transaction } from '@ethereumjs/tx'
-import { Block, BlockHeader } from '@ethereumjs/block'
+import { Transaction, TxOptions } from '@ethereumjs/tx'
+import { Block, BlockHeader, BlockOptions } from '@ethereumjs/block'
 import Common from '@ethereumjs/common'
 
 export function dumpState(state: any, cb: Function) {
@@ -87,11 +87,11 @@ const format = (exports.format = function (
 /**
  * Make a tx using JSON from tests repo
  * @param {Object} txData The tx object from tests repo
- * @param {Common} common An @ethereumjs/common object
+ * @param {TxOptions} opts Tx opts that can include an @ethereumjs/common object
  * @returns {Transaction} Transaction to be passed to VM.runTx function
  */
-export function makeTx(txData: any, common: Common) {
-  const tx = Transaction.fromTxData(txData, { common })
+export function makeTx(txData: any, opts: TxOptions = {}) {
+  const tx = Transaction.fromTxData(txData, opts)
 
   if (txData.secretKey) {
     const privKey = toBuffer(txData.secretKey)
@@ -249,7 +249,7 @@ export function verifyLogs(logs: any, testData: any, t: tape.Test) {
   }
 }
 
-export function makeBlockHeader(data: any) {
+export function makeBlockHeader(data: any, opts: BlockOptions = {}) {
   const {
     currentTimestamp,
     currentGasLimit,
@@ -266,15 +266,7 @@ export function makeBlockHeader(data: any) {
     gasLimit: currentGasLimit,
     timestamp: currentTimestamp,
   }
-  return BlockHeader.fromHeaderData(headerData)
-  // const headerData = {
-  //   number: format(currentNumber),
-  //   coinbase: setLengthLeft(format(currentCoinbase, false, true), 20),
-  //   parentHash: format(previousHash),
-  //   difficulty: format(currentDifficulty),
-  //   gasLimit: format(currentGasLimit),
-  //   timestamp: format(currentTimestamp),
-  // }
+  return BlockHeader.fromHeaderData(headerData, opts)
 }
 
 /**
@@ -284,13 +276,9 @@ export function makeBlockHeader(data: any) {
  * @param uncleHeaders uncle headers for the block (optional)
  * @returns the block
  */
-export function makeBlockFromEnv(
-  env: any,
-  transactions: Transaction[] = [],
-  uncleHeaders: BlockHeader[] = [],
-): Block {
-  const header = makeBlockHeader(env)
-  return new Block(header, transactions, uncleHeaders)
+export function makeBlockFromEnv(env: any, opts: BlockOptions = {}): Block {
+  const header = makeBlockHeader(env, opts)
+  return new Block(header)
 }
 
 /**