Update ethereumjs-tx library to v2.0.0 (ethereumjs#541)

* Updated ethereumjs-tx dependency from 1.3.7 to v2.1.0, move to runtime dependencies, updated ethereumjs-common to v1.3.0

* Updated ethereumjs-tx imports in tests

* Added Transaction type to runTx

* Access tx from address via getSenderAddress()

Author: holgerd77

lib/runTx.ts

@@ -1,6 +1,7 @@
 import BN = require('bn.js')
 import { toBuffer } from 'ethereumjs-util'
 import Account from 'ethereumjs-account'
+import { Transaction } from 'ethereumjs-tx'
 import VM from './index'
 import Bloom from './bloom'
 import { default as EVM, EVMResult } from './evm/evm'
@@ -20,7 +21,7 @@ export interface RunTxOpts {
   /**
    * A [`Transaction`](https://github.com/ethereum/ethereumjs-tx) to run
    */
-  tx: any // TODO: Update ethereumjs-tx
+  tx: Transaction
   /**
    * If true, skips the nonce check
    */
@@ -108,7 +109,7 @@ async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   gasLimit.isub(basefee)
 
   // Check from account's balance and nonce
-  let fromAccount = await state.getAccount(tx.from)
+  let fromAccount = await state.getAccount(tx.getSenderAddress())
   if (!opts.skipBalance && new BN(fromAccount.balance).lt(tx.getUpfrontCost())) {
     throw new Error(
       `sender doesn't have enough funds to send tx. The upfront cost is: ${tx
@@ -129,14 +130,14 @@ async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   fromAccount.balance = toBuffer(
     new BN(fromAccount.balance).sub(new BN(tx.gasLimit).mul(new BN(tx.gasPrice))),
   )
-  await state.putAccount(tx.from, fromAccount)
+  await state.putAccount(tx.getSenderAddress(), fromAccount)
 
   /*
    * Execute message
    */
-  const txContext = new TxContext(tx.gasPrice, tx.from)
+  const txContext = new TxContext(tx.gasPrice, tx.getSenderAddress())
   const message = new Message({
-    caller: tx.from,
+    caller: tx.getSenderAddress(),
     gasLimit: gasLimit,
     to: tx.to.toString('hex') !== '' ? tx.to : undefined,
     value: tx.value,
@@ -165,13 +166,13 @@ async function _runTx(this: VM, opts: RunTxOpts): Promise<RunTxResult> {
   results.amountSpent = results.gasUsed.mul(new BN(tx.gasPrice))
 
   // Update sender's balance
-  fromAccount = await state.getAccount(tx.from)
+  fromAccount = await state.getAccount(tx.getSenderAddress())
   const finalFromBalance = new BN(tx.gasLimit)
     .sub(results.gasUsed)
     .mul(new BN(tx.gasPrice))
     .add(new BN(fromAccount.balance))
   fromAccount.balance = toBuffer(finalFromBalance)
-  await state.putAccount(toBuffer(tx.from), fromAccount)
+  await state.putAccount(toBuffer(tx.getSenderAddress()), fromAccount)
 
   // Update miner's balance
   const minerAccount = await state.getAccount(block.header.coinbase)

package.json

@@ -53,7 +53,8 @@
     "ethereumjs-account": "^3.0.0",
     "ethereumjs-block": "~2.2.0",
     "ethereumjs-blockchain": "^4.0.1",
-    "ethereumjs-common": "1.2.1",
+    "ethereumjs-common": "^1.3.0",
+    "ethereumjs-tx": "^2.1.0",
     "ethereumjs-util": "^6.1.0",
     "fake-merkle-patricia-tree": "^1.0.1",
     "functional-red-black-tree": "^1.0.1",
@@ -74,7 +75,6 @@
     "browserify": "^16.2.3",
     "coveralls": "^3.0.0",
     "ethereumjs-testing": "git+https://github.com/ethereumjs/ethereumjs-testing.git#v1.2.7",
-    "ethereumjs-tx": "1.3.7",
     "husky": "^2.1.0",
     "karma": "^4.0.1",
     "karma-browserify": "^6.0.0",

tests/api/runTx.js

@@ -1,6 +1,6 @@
 const promisify = require('util.promisify')
 const tape = require('tape')
-const Transaction = require('ethereumjs-tx')
+const Transaction = require('ethereumjs-tx').Transaction
 const ethUtil = require('ethereumjs-util')
 const runTx = require('../../dist/runTx').default
 const { StateManager } = require('../../dist/state')

tests/util.js

@@ -3,7 +3,7 @@ const utils = require('ethereumjs-util')
 const BN = utils.BN
 const rlp = utils.rlp
 const Account = require('ethereumjs-account').default
-const Transaction = require('ethereumjs-tx')
+const Transaction = require('ethereumjs-tx').Transaction
 const Block = require('ethereumjs-block')
 
 exports.dumpState = function (state, cb) {