tx, vm: renamed LegacyTransaction -> Transaction

Author: holgerd77

packages/tx/src/baseTransaction.ts

@@ -161,7 +161,7 @@ export abstract class BaseTransaction<TransactionObject> {
   }
 
   /**
-   * Returns the raw `Buffer[]` (LegacyTransaction) or `Buffer` (typed transaction).
+   * Returns the raw `Buffer[]` (Transaction) or `Buffer` (typed transaction).
    * This is the data which is found in the transactions of the block body.
    */
   abstract raw(): Buffer[] | Buffer

packages/tx/src/eip2930Transaction.ts

@@ -273,7 +273,7 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
 
   /**
    * Returns the encoding of the transaction. For typed transaction, this is the raw Buffer.
-   * In LegacyTransaction, this is a Buffer array.
+   * In Transaction, this is a Buffer array.
    */
   serialize(): Buffer {
     return <Buffer>this.raw()

packages/tx/src/index.ts

@@ -1,4 +1,4 @@
-export { default as LegacyTransaction } from './legacyTransaction'
+export { default as Transaction } from './legacyTransaction'
 export { default as AccessListEIP2930Transaction } from './eip2930Transaction'
 export { default as TransactionFactory } from './transactionFactory'
 export * from './types'

packages/tx/src/legacyTransaction.ts

@@ -21,7 +21,7 @@ const N_DIV_2 = new BN('7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46
 /**
  * An Ethereum transaction.
  */
-export default class LegacyTransaction extends BaseTransaction<LegacyTransaction> {
+export default class Transaction extends BaseTransaction<Transaction> {
   public readonly v?: BN
   public readonly r?: BN
   public readonly s?: BN
@@ -31,7 +31,7 @@ export default class LegacyTransaction extends BaseTransaction<LegacyTransaction
   }
 
   public static fromTxData(txData: TxData, opts: TxOptions = {}) {
-    return new LegacyTransaction(txData, opts)
+    return new Transaction(txData, opts)
   }
 
   public static fromRlpSerializedTx(serialized: Buffer, opts: TxOptions = {}) {
@@ -46,7 +46,7 @@ export default class LegacyTransaction extends BaseTransaction<LegacyTransaction
 
   // alias of fromRlpSerializedTx
   public static fromSerializedTx(serialized: Buffer, opts: TxOptions = {}) {
-    return LegacyTransaction.fromRlpSerializedTx(serialized, opts)
+    return Transaction.fromRlpSerializedTx(serialized, opts)
   }
 
   public static fromValuesArray(values: Buffer[], opts: TxOptions = {}) {
@@ -63,7 +63,7 @@ export default class LegacyTransaction extends BaseTransaction<LegacyTransaction
 
       const emptyBuffer = Buffer.from([])
 
-      return new LegacyTransaction(
+      return new Transaction(
         {
           nonce: new BN(nonce),
           gasPrice: new BN(gasPrice),
@@ -209,7 +209,7 @@ export default class LegacyTransaction extends BaseTransaction<LegacyTransaction
       common: this.common,
     }
 
-    return LegacyTransaction.fromTxData(
+    return Transaction.fromTxData(
       {
         nonce: this.nonce,
         gasPrice: this.gasPrice,

packages/tx/src/transactionFactory.ts

@@ -1,5 +1,5 @@
 import Common from '@ethereumjs/common'
-import { default as LegacyTransaction } from './legacyTransaction'
+import { default as Transaction } from './legacyTransaction'
 import { default as AccessListEIP2930Transaction } from './eip2930Transaction'
 import { TxOptions, Transaction, TxData } from './types'
 import { BN } from 'ethereumjs-util'
@@ -12,14 +12,14 @@ export default class TransactionFactory {
 
   /**
    * 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 txData - The transaction data. The `type` field will determine which transaction type is returned (if undefined, create a Transaction)
    * @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) {
-      // Assume LegacyTransaction
-      return LegacyTransaction.fromTxData(txData, txOptions)
+      // Assume Transaction
+      return Transaction.fromTxData(txData, txOptions)
     } else {
       const txType = new BN(txData.type).toNumber()
       return TransactionFactory.getTransactionClass(txType, common).fromTxData(txData, txOptions)
@@ -57,14 +57,14 @@ export default class TransactionFactory {
 
       return AccessListEIP2930Transaction.fromRlpSerializedTx(rawData, txOptions)
     } else {
-      return LegacyTransaction.fromRlpSerializedTx(rawData, txOptions)
+      return Transaction.fromRlpSerializedTx(rawData, txOptions)
     }
   }
 
   /**
    * When decoding a BlockBody, in the transactions field, a field is either:
    * A Buffer (a TypedTransaction - encoded as TransactionType || rlp(TransactionPayload))
-   * A Buffer[] (LegacyTransaction)
+   * A Buffer[] (Transaction)
    * This method returns the right transaction.
    * @param rawData - Either a Buffer or a Buffer[]
    * @param txOptions - The transaction options
@@ -73,16 +73,16 @@ export default class TransactionFactory {
     if (Buffer.isBuffer(rawData)) {
       return this.fromRawData(rawData, txOptions)
     } else if (Array.isArray(rawData)) {
-      // It is a LegacyTransaction
-      return LegacyTransaction.fromValuesArray(rawData, txOptions)
+      // It is a Transaction
+      return Transaction.fromValuesArray(rawData, txOptions)
     } else {
       throw new Error('Cannot decode transaction: unknown type input')
     }
   }
 
   /**
    * This helper method allows one to retrieve the class which matches the transactionID
-   * If transactionID is undefined, return the LegacyTransaction class.
+   * If transactionID is undefined, return the Transaction class.
    * @param transactionID
    * @param common
    */
@@ -97,7 +97,7 @@ export default class TransactionFactory {
     const legacyTxn = transactionID == 0 || (transactionID >= 0x80 && transactionID <= 0xff)
 
     if (legacyTxn) {
-      return LegacyTransaction
+      return Transaction
     }
 
     switch (transactionID) {

packages/tx/src/types.ts

@@ -1,6 +1,6 @@
 import { AddressLike, BNLike, BufferLike } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
-import { default as LegacyTransaction } from './legacyTransaction'
+import { default as Transaction } from './legacyTransaction'
 import { default as AccessListEIP2930Transaction } from './eip2930Transaction'
 
 /**
@@ -131,7 +131,7 @@ export interface TxData {
   type?: BNLike
 }
 
-export type Transaction = LegacyTransaction | AccessListEIP2930Transaction
+export type Transaction = Transaction | AccessListEIP2930Transaction
 
 export type BaseTransactionData = {
   /**

packages/tx/test/base.spec.ts

@@ -1,15 +1,15 @@
 import tape from 'tape'
 import Common from '@ethereumjs/common'
-import { LegacyTransaction, AccessListEIP2930Transaction } from '../src'
+import { Transaction, AccessListEIP2930Transaction } from '../src'
 import { TxsJsonEntry } from './types'
 import { BaseTransaction } from '../src/baseTransaction'
 import { privateToPublic } from 'ethereumjs-util'
 
 tape('[BaseTransaction]', function (t) {
   const legacyFixtures: TxsJsonEntry[] = require('./json/txs.json')
-  const legacyTxs: BaseTransaction<LegacyTransaction>[] = []
+  const legacyTxs: BaseTransaction<Transaction>[] = []
   legacyFixtures.slice(0, 4).forEach(function (tx: any) {
-    legacyTxs.push(LegacyTransaction.fromTxData(tx.data))
+    legacyTxs.push(Transaction.fromTxData(tx.data))
   })
 
   const eip2930Fixtures = require('./json/eip2930txs.json')
@@ -21,8 +21,8 @@ tape('[BaseTransaction]', function (t) {
   const zero = Buffer.alloc(0)
   const txTypes = [
     {
-      class: LegacyTransaction,
-      name: 'LegacyTransaction',
+      class: Transaction,
+      name: 'Transaction',
       values: Array(6).fill(zero),
       txs: legacyTxs,
       fixtures: legacyFixtures,