Tx capabilities dirty

packages/tx/src/1559/tx.ts

@@ -12,7 +12,7 @@ import * as EIP1559 from '../capabilities/eip1559.js'
 import * as EIP2718 from '../capabilities/eip2718.js'
 import * as EIP2930 from '../capabilities/eip2930.js'
 import * as Legacy from '../capabilities/legacy.js'
-import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../features/util.js'
+import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../capabilities/generic.js'
 import { TransactionType } from '../types.js'
 import { AccessLists } from '../util.js'
 

packages/tx/src/2930/tx.ts

@@ -9,8 +9,8 @@ import {
 
 import * as EIP2718 from '../capabilities/eip2718.js'
 import * as EIP2930 from '../capabilities/eip2930.js'
+import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../capabilities/generic.js'
 import * as Legacy from '../capabilities/legacy.js'
-import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../features/util.js'
 import { TransactionType } from '../types.js'
 import { AccessLists } from '../util.js'
 
@@ -72,7 +72,7 @@ export class AccessList2930Tx implements TransactionInterface<TransactionType.Ac
    * e.g. 1559 (fee market) and 2930 (access lists)
    * for FeeMarket1559Tx objects
    */
-  protected activeCapabilities: number[] = []
+  public activeCapabilities: number[] = []
 
   /**
    * This constructor takes the values, validates them, assigns them and freezes the object.
@@ -123,26 +123,6 @@ export class AccessList2930Tx implements TransactionInterface<TransactionType.Ac
     }
   }
 
-  /**
-   * Checks if a tx type defining capability is active
-   * on a tx, for example the EIP-1559 fee market mechanism
-   * or the EIP-2930 access list feature.
-   *
-   * Note that this is different from the tx type itself,
-   * so EIP-2930 access lists can very well be active
-   * on an EIP-1559 tx for example.
-   *
-   * This method can be useful for feature checks if the
-   * tx type is unknown (e.g. when instantiated with
-   * the tx factory).
-   *
-   * See `Capabilities` in the `types` module for a reference
-   * on all supported capabilities.
-   */
-  supports(capability: Capability) {
-    return this.activeCapabilities.includes(capability)
-  }
-
   getEffectivePriorityFee(baseFee?: bigint): bigint {
     return Legacy.getEffectivePriorityFee(this.gasPrice, baseFee)
   }

packages/tx/src/4844/tx.ts

@@ -14,9 +14,9 @@ import {
 import * as EIP1559 from '../capabilities/eip1559.js'
 import * as EIP2718 from '../capabilities/eip2718.js'
 import * as EIP2930 from '../capabilities/eip2930.js'
+import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../capabilities/generic.js'
 import * as Legacy from '../capabilities/legacy.js'
 import { LIMIT_BLOBS_PER_TX } from '../constants.js'
-import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../features/util.js'
 import { TransactionType } from '../types.js'
 import { AccessLists, validateNotArray } from '../util.js'
 
@@ -85,7 +85,7 @@ export class Blob4844Tx implements TransactionInterface<TransactionType.BlobEIP4
    * e.g. 1559 (fee market) and 2930 (access lists)
    * for FeeMarket1559Tx objects
    */
-  protected activeCapabilities: number[] = []
+  public activeCapabilities: number[] = []
 
   /**
    * This constructor takes the values, validates them, assigns them and freezes the object.

packages/tx/src/7702/tx.ts

@@ -11,8 +11,8 @@ import {
 import * as EIP1559 from '../capabilities/eip1559.js'
 import * as EIP2718 from '../capabilities/eip2718.js'
 import * as EIP7702 from '../capabilities/eip7702.js'
+import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../capabilities/generic.js'
 import * as Legacy from '../capabilities/legacy.js'
-import { getBaseJSON, sharedConstructor, valueBoundaryCheck } from '../features/util.js'
 import { TransactionType } from '../types.js'
 import { AccessLists, AuthorizationLists, validateNotArray } from '../util.js'
 
@@ -79,7 +79,7 @@ export class EOACode7702Tx implements TransactionInterface<TransactionType.EOACo
    * e.g. 1559 (fee market) and 2930 (access lists)
    * for FeeMarket1559Tx objects
    */
-  protected activeCapabilities: number[] = []
+  public activeCapabilities: number[] = []
 
   /**
    * This constructor takes the values, validates them, assigns them and freezes the object.

packages/tx/src/features/util.ts → packages/tx/src/capabilities/generic.ts

@@ -12,7 +12,7 @@ import {
 import { paramsTx } from '../params.js'
 import { checkMaxInitCodeSize, validateNotArray } from '../util.js'
 
-import type { TransactionInterface, TransactionType, TxData, TxOptions } from '../types.js'
+import type { L1TxInterface, TransactionType, TxData, TxOptions } from '../types.js'
 
 export function getCommon(common?: Common): Common {
   return common?.copy() ?? new Common({ chain: Mainnet })
@@ -70,7 +70,7 @@ type Mutable<T> = {
 // represents the constructor of baseTransaction
 // Note: have to use `Mutable` to write to readonly props. Only call this in constructor of txs.
 export function sharedConstructor(
-  tx: Mutable<TransactionInterface>,
+  tx: Mutable<L1TxInterface>,
   txData: TxData[TransactionType],
   opts: TxOptions = {},
 ) {
@@ -122,7 +122,7 @@ export function sharedConstructor(
   }
 }
 
-export function getBaseJSON(tx: TransactionInterface) {
+export function getBaseJSON(tx: L1TxInterface) {
   return {
     type: bigIntToHex(BigInt(tx.type)),
     nonce: bigIntToHex(tx.nonce),