block/vm: fix tests

ethereumjs · Apr 25, 2021 · 52cf035 · 52cf035
1 parent f876956
commit 52cf035
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/packages/block/src/header.ts b/packages/block/src/header.ts
@@ -167,7 +167,7 @@ export class BlockHeader {
   /**
    * Alias for Header.fromHeaderData() with initWithGenesisHeader set to true.
    */
-  public static genesis(headerData: HeaderData = {}, opts: BlockOptions) {
+  public static genesis(headerData: HeaderData = {}, opts?: BlockOptions) {
     opts = { ...opts, initWithGenesisHeader: true }
     return BlockHeader.fromHeaderData(headerData, opts)
   }

diff --git a/packages/vm/lib/runTx.ts b/packages/vm/lib/runTx.ts
@@ -20,6 +20,7 @@ import type {
   PreByzantiumTxReceipt,
   PostByzantiumTxReceipt,
   EIP2930Receipt,
+  EIP1559Receipt,
 } from './types'
 
 /**
@@ -431,6 +432,12 @@ export async function generateTxReceipt(
       status: txResult.execResult.exceptionError ? 0 : 1,
       ...baseReceipt,
     } as EIP2930Receipt
+  } else if ('transactionType' in tx && tx.transactionType === 2) {
+    // EIP2930 Transaction
+    receipt = {
+      status: txResult.execResult.exceptionError ? 0 : 1,
+      ...baseReceipt,
+    } as EIP1559Receipt
   } else {
     throw new Error(
       `Unsupported transaction type ${'transactionType' in tx ? tx.transactionType : 'NaN'}`

diff --git a/packages/vm/lib/types.ts b/packages/vm/lib/types.ts
@@ -42,5 +42,7 @@ export interface PostByzantiumTxReceipt extends BaseTxReceipt {
   status: 0 | 1
 }
 
-// EIP290Receipt, which has the same fields as PostByzantiumTxReceipt
+// EIP2930Receipt, which has the same fields as PostByzantiumTxReceipt
 export interface EIP2930Receipt extends PostByzantiumTxReceipt {}
+// EIP1559Receipt, which has the same fields as PostByzantiumTxReceipt
+export interface EIP1559Receipt extends PostByzantiumTxReceipt {}
diff --git a/packages/vm/tests/api/runTx.spec.ts b/packages/vm/tests/api/runTx.spec.ts
@@ -353,7 +353,7 @@ tape('runTx() -> API return values', async (t) => {
       )
       t.deepEqual(
         res.amountSpent,
-        res.gasUsed.mul(tx.gasPrice),
+        res.gasUsed.mul((<Transaction>tx).gasPrice), // can cast this, since Fee Market transactions are not included
         `runTx result -> amountSpent -> gasUsed * gasPrice (${txType.name})`
       )
       t.deepEqual(