vm: fix state tests for EIP2930

vm/tx/block: add changelog
tx: add some docs

tx: check s value OK, make json-tx geth compatible
common: remove empty test

vm: remove unnecesary comment

Author: jochem-brouwer

packages/block/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## UNRELEASED
+
+- Integration of [EIP2718](https://eips.ethereum.org/EIPS/eip-2718) (Typed Transactions) and [EIP2930](https://eips.ethereum.org/EIPS/eip-2930) (Access List Transaction), PR [#1048](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1048). It is now possible to create blocks with access list transactions.
+
 ## 3.1.0 - 2021-02-22
 
 ### Clique/PoA Support

packages/common/tests/eips.spec.ts

@@ -57,8 +57,4 @@ tape('[Common]: Initialization / Chain params', function (t: tape.Test) {
 
     st.end()
   })
-
-  t.test('Initialization', function (st: tape.Test) {
-    st.end()
-  })
 })

packages/tx/CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## UNRELEASED
+
+- Integration of [EIP2718](https://eips.ethereum.org/EIPS/eip-2718) (Typed Transactions) and [EIP2930](https://eips.ethereum.org/EIPS/eip-2930) (Access List Transaction), PR [#1048](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1048).
+
+This PR integrates the Typed Transactions. In order to produce the right transactions, there is a new class called the `TransactionFactory`. This factory helps to create the correct transaction. When decoding directly from blocks, use the `fromBlockBodyData` method. The PR also refactors the internals of the legacy transaction and the new typed transaction: there is a base transaction class, which both transaction classes extends. It is also possible to import `EIP2930Transaction` (an access list transaction).
+
+### How to migrate
+
+The old `Transaction` class has been renamed to `LegacyTransaction`. This class works just how it used to work.
+
 
 ## 3.0.2 - 2021-02-16
 

packages/tx/src/baseTransaction.ts

@@ -160,8 +160,10 @@ export abstract class BaseTransaction<TransactionObject> {
     }
   }
 
-  // In case of a LegacyTransaction, this is a Buffer[]
-  // For a TypedTransaction, this is a Buffer
+  /**
+   * Returns the raw `Buffer[]` (LegacyTransaction) or `Buffer` (typed transaction).
+   * This is the data which is found in the transactions of the block body.
+   */
   abstract raw(): Buffer[] | Buffer
   abstract hash(): Buffer
 

packages/tx/src/eip2930Transaction.ts

@@ -7,6 +7,7 @@ import {
   ecrecover,
   keccak256,
   rlp,
+  setLengthLeft,
   toBuffer,
 } from 'ethereumjs-util'
 import { BaseTransaction } from './baseTransaction'
@@ -183,7 +184,11 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
       throw new Error('The y-parity of the transaction should either be 0 or 1')
     }
 
-    // todo verify max BN of r,s
+    if (this.common.gteHardfork('homestead') && this.s && this.s.gt(N_DIV_2)) {
+      throw new Error(
+        'Invalid Signature: s-values greater than secp256k1n/2 are considered invalid'
+      )
+    }
 
     // Verify the access list format.
     for (let key = 0; key < this.accessList.length; key++) {
@@ -247,8 +252,8 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
 
   /**
    * Returns a Buffer Array of the raw Buffers of this transaction, in order.
-   * TODO: check what raw means - is this the raw transaction as in block body?
-   * If that is the case, it is only callable if it is signed.
+   * @param asList - By default, this method returns a concatenated Buffer
+   *                 If this is not desired, then set this to `true`, to get a Buffer array.
    */
   raw(asList = false): Buffer[] | Buffer {
     const base = <Buffer[]>[
@@ -272,7 +277,8 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
   }
 
   /**
-   * Returns the rlp encoding of the transaction.
+   * Returns the encoding of the transaction. For typed transaction, this is the raw Buffer.
+   * In LegacyTransaction, this is a Buffer array.
    */
   serialize(): Buffer {
     return <Buffer>this.raw()
@@ -282,18 +288,19 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
    * Returns an object with the JSON representation of the transaction
    */
   toJSON(): JsonTx {
-    // TODO: fix type
     const accessListJSON = []
+
     for (let index = 0; index < this.accessList.length; index++) {
       const item: any = this.accessList[index]
-      const JSONItem: any = ['0x' + (<Buffer>item[0]).toString('hex')]
+      const JSONItem: any = {
+        address: '0x' + setLengthLeft(<Buffer>item[0], 20).toString('hex'),
+        storageKeys: [],
+      }
       const storageSlots: Buffer[] = item[1]
-      const JSONSlots = []
       for (let slot = 0; slot < storageSlots.length; slot++) {
         const storageSlot = storageSlots[slot]
-        JSONSlots.push('0x' + storageSlot.toString('hex'))
+        JSONItem.storageKeys.push('0x' + setLengthLeft(storageSlot, 32).toString('hex'))
       }
-      JSONItem.push(JSONSlots)
       accessListJSON.push(JSONItem)
     }
 

packages/tx/src/transactionFactory.ts

@@ -10,6 +10,11 @@ export default class TransactionFactory {
   // It is not possible to instantiate a TransactionFactory object.
   private constructor() {}
 
+  /**
+   * Create a transaction from a `txData` object
+   * @param txData - The transaction data. The `type` field will determine which transaction type is returned (if undefined, create a LegacyTransaction)
+   * @param txOptions - Options to pass on to the constructor of the transaction
+   */
   public static fromTxData(txData: TxData, txOptions: TxOptions = {}): Transaction {
     const common = txOptions.common ?? DEFAULT_COMMON
     if (txData.type === undefined) {
@@ -107,6 +112,11 @@ export default class TransactionFactory {
     throw new Error(`TypedTransaction with ID ${transactionID} unknown`)
   }
 
+  /**
+   * Check if a typed transaction eip is supported by common
+   * @param common - The common to use
+   * @param eip - The EIP to check
+   */
   public static eipSupport(common: Common, eip: number): boolean {
     if (!common.isActivatedEIP(2718)) {
       return false

packages/tx/src/types.ts

@@ -165,6 +165,8 @@ export type BaseTransactionData = {
   data?: BufferLike
 }
 
+type JsonAccessListItem = { address: string; storageKeys: string[] }
+
 /**
  * An object with all of the transaction's values represented as strings.
  */
@@ -179,7 +181,7 @@ export interface JsonTx {
   s?: string
   value?: string
   chainId?: string
-  accessList?: string[]
+  accessList?: JsonAccessListItem[]
   type?: string
 }
 

packages/vm/CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## UNRELEASED
+
+- Fixes for [EIP2929](https://eips.ethereum.org/EIPS/eip-2929) (Gas cost increases for state access opcodes), PR [#1124](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1124)
+- Integration of [EIP2718](https://eips.ethereum.org/EIPS/eip-2718) (Typed Transactions) and [EIP2930](https://eips.ethereum.org/EIPS/eip-2930) (Access List Transaction), PR [#1048](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1048). VM now has support for access list transactions.
+
 ### 5.1.0 - 2021-02-22
 
 ### Clique/PoA Support

packages/vm/lib/runBlock.ts

@@ -360,8 +360,6 @@ async function applyTransactions(this: VM, block: Block, opts: RunBlockOpts) {
         ...abstractTxReceipt,
       } as EIP2930Receipt
 
-      // rlp([status, cumulativeGasUsed, logsBloom, logs])
-
       encodedReceipt = Buffer.concat([Buffer.from('01', 'hex'), encode(Object.values(txReceipt))])
     } else {
       throw new Error(`Unsupported transaction type ${tx.transactionType}`)

packages/vm/tests/GeneralStateTestsRunner.ts

@@ -34,6 +34,13 @@ function parseTestCases(
       tx.gasLimit = testData.transaction.gasLimit[testIndexes['gas']]
       tx.value = testData.transaction.value[testIndexes['value']]
 
+      if (tx.accessLists) {
+        tx.accessList = testData.transaction.accessLists[testIndexes['data']]
+        if (tx.chainId == undefined) {
+          tx.chainId = 1
+        }
+      }
+
       return {
         transaction: tx,
         postStateRoot: testCase['hash'],