Revert "throw when gasPrice passed to 1559 tx"

This reverts commit 6a9b15e.
ethereumjs · Nov 11, 2024 · 226135b · 226135b
1 parent 6a9b15e
commit 226135b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/packages/tx/src/1559/tx.ts b/packages/tx/src/1559/tx.ts
@@ -132,10 +132,6 @@ export class FeeMarket1559Tx implements TransactionInterface<TransactionType.Fee
       throw new Error(msg)
     }
 
-    if (txData.gasPrice !== undefined && txData.gasPrice !== null) {
-      const msg = Legacy.errorMsg(this, 'gasPrice cannot be defined on 1559 tx')
-      throw new Error(msg)
-    }
     EIP2718.validateYParity(this)
     Legacy.validateHighS(this)
 

diff --git a/packages/tx/src/types.ts b/packages/tx/src/types.ts
@@ -375,6 +375,11 @@ export interface AccessList2930TxData extends LegacyTxData {
  * {@link FeeMarket1559Tx} data.
  */
 export interface FeeMarketEIP1559TxData extends AccessList2930TxData {
+  /**
+   * The transaction's gas price, inherited from {@link Transaction}.  This property is not used for EIP1559
+   * transactions and should always be undefined for this specific transaction type.
+   */
+  gasPrice?: never | null
   /**
    * The maximum inclusion fee per gas (this fee is given to the miner)
    */

diff --git a/packages/tx/test/base.spec.ts b/packages/tx/test/base.spec.ts
@@ -324,6 +324,7 @@ describe('[BaseTransaction]', () => {
         ...txType.txs,
         // add unsigned variants
         ...txType.txs.map((tx) =>
+          // @ts-ignore Not sure why this is now throwing
           txType.create.txData({
             ...tx,
             v: undefined,

diff --git a/packages/tx/test/eip1559.spec.ts b/packages/tx/test/eip1559.spec.ts
@@ -307,8 +307,5 @@ describe('[FeeMarket1559Tx]', () => {
       undefined,
       'total fee must be the larger of the two',
     )
-    assert.throws(() => {
-      createFeeMarket1559Tx({ gasPrice: 1 }, { common })
-    }, 'gasPrice cannot be defined on 1559 tx')
   })
 })