tx: remove gasPrice from baseTransaction

tx: export EIP1559
ethereumjs · Mar 21, 2021 · ec78daf · ec78daf
1 parent 4b48879
commit ec78daf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/packages/tx/src/baseTransaction.ts b/packages/tx/src/baseTransaction.ts
@@ -19,7 +19,6 @@ import {
 export abstract class BaseTransaction<TransactionObject> {
   public readonly nonce: BN
   public readonly gasLimit: BN
-  public readonly gasPrice: BN
   public readonly to?: Address
   public readonly value: BN
   public readonly data: Buffer
@@ -30,10 +29,9 @@ export abstract class BaseTransaction<TransactionObject> {
   public readonly s?: BN
 
   constructor(txData: TxData, txOptions: TxOptions = {}) {
-    const { nonce, gasLimit, gasPrice, to, value, data, v, r, s } = txData
+    const { nonce, gasLimit, to, value, data, v, r, s } = txData
 
     this.nonce = new BN(toBuffer(nonce))
-    this.gasPrice = new BN(toBuffer(gasPrice))
     this.gasLimit = new BN(toBuffer(gasLimit))
     this.to = to ? new Address(toBuffer(to)) : undefined
     this.value = new BN(toBuffer(value))
@@ -45,7 +43,6 @@ export abstract class BaseTransaction<TransactionObject> {
 
     this._validateCannotExceedMaxInteger({
       nonce: this.nonce,
-      gasPrice: this.gasPrice,
       gasLimit: this.gasLimit,
       value: this.value,
     })

diff --git a/packages/tx/src/eip2930Transaction.ts b/packages/tx/src/eip2930Transaction.ts
@@ -22,6 +22,7 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
   public readonly chainId: BN
   public readonly accessList: AccessListBuffer
   public readonly AccessListJSON: AccessList
+  public readonly gasPrice: BN
 
   get transactionType(): number {
     return 1
@@ -123,7 +124,7 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
    * Use the static factory methods to assist in creating a Transaction object from varying data types.
    */
   public constructor(txData: AccessListEIP2930TxData, opts: TxOptions = {}) {
-    const { chainId, accessList } = txData
+    const { chainId, accessList, gasPrice } = txData
 
     super(txData, opts)
 
@@ -140,6 +141,9 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
     AccessLists.verifyAccessList(this.accessList)
 
     this.chainId = chainId ? new BN(toBuffer(chainId)) : this.common.chainIdBN()
+    this.gasPrice = new BN(toBuffer(gasPrice))
+
+    this._validateCannotExceedMaxInteger({ gasPrice: this.gasPrice })
 
     if (!this.chainId.eq(this.common.chainIdBN())) {
       throw new Error('The chain ID does not match the chain ID of Common')

diff --git a/packages/tx/src/index.ts b/packages/tx/src/index.ts
@@ -1,4 +1,5 @@
 export { default as Transaction } from './legacyTransaction'
 export { default as AccessListEIP2930Transaction } from './eip2930Transaction'
 export { default as TransactionFactory } from './transactionFactory'
+export { default as FeeMarketEIP1559Transaction } from './eip1559Transaction'
 export * from './types'
diff --git a/packages/tx/src/legacyTransaction.ts b/packages/tx/src/legacyTransaction.ts
@@ -16,6 +16,8 @@ import { BaseTransaction } from './baseTransaction'
  * An Ethereum non-typed (legacy) transaction
  */
 export default class Transaction extends BaseTransaction<Transaction> {
+  public readonly gasPrice: BN
+
   get transactionType(): number {
     return 0
   }
@@ -96,7 +98,9 @@ export default class Transaction extends BaseTransaction<Transaction> {
   public constructor(txData: TxData, opts: TxOptions = {}) {
     super(txData, opts)
 
-    this._validateCannotExceedMaxInteger({ r: this.r, s: this.s })
+    this.gasPrice = new BN(toBuffer(txData.gasPrice))
+
+    this._validateCannotExceedMaxInteger({ r: this.r, s: this.s, gasPrice: this.gasPrice })
 
     this._validateTxV(this.v)