tx: cleanup error msgs

packages/tx/src/1559/tx.ts

@@ -117,12 +117,16 @@ export class FeeMarket1559Tx implements TransactionInterface<TransactionType.Fee
     })
 
     if (this.gasLimit * this.maxFeePerGas > MAX_INTEGER) {
-      const msg = this._errorMsg('gasLimit * maxFeePerGas cannot exceed MAX_INTEGER (2^256-1)')
+      const msg = Legacy.errorMsg(
+        this,
+        'gasLimit * maxFeePerGas cannot exceed MAX_INTEGER (2^256-1)',
+      )
       throw new Error(msg)
     }
 
     if (this.maxFeePerGas < this.maxPriorityFeePerGas) {
-      const msg = this._errorMsg(
+      const msg = Legacy.errorMsg(
+        this,
         'maxFeePerGas cannot be less than maxPriorityFeePerGas (The total must be the larger of the two)',
       )
       throw new Error(msg)
@@ -374,14 +378,4 @@ export class FeeMarket1559Tx implements TransactionInterface<TransactionType.Fee
     errorStr += ` maxFeePerGas=${this.maxFeePerGas} maxPriorityFeePerGas=${this.maxPriorityFeePerGas}`
     return errorStr
   }
-
-  /**
-   * Internal helper function to create an annotated error message
-   *
-   * @param msg Base error message
-   * @hidden
-   */
-  protected _errorMsg(msg: string) {
-    return Legacy.errorMsg(this, msg)
-  }
 }

packages/tx/src/2930/tx.ts

@@ -110,7 +110,7 @@ export class AccessList2930Tx implements TransactionInterface<TransactionType.Ac
     valueBoundaryCheck({ gasPrice: this.gasPrice })
 
     if (this.gasPrice * this.gasLimit > MAX_INTEGER) {
-      const msg = this._errorMsg('gasLimit * gasPrice cannot exceed MAX_INTEGER')
+      const msg = Legacy.errorMsg(this, 'gasLimit * gasPrice cannot exceed MAX_INTEGER')
       throw new Error(msg)
     }
 
@@ -348,14 +348,4 @@ export class AccessList2930Tx implements TransactionInterface<TransactionType.Ac
     errorStr += ` gasPrice=${this.gasPrice} accessListCount=${this.accessList?.length ?? 0}`
     return errorStr
   }
-
-  /**
-   * Internal helper function to create an annotated error message
-   *
-   * @param msg Base error message
-   * @hidden
-   */
-  protected _errorMsg(msg: string) {
-    return Legacy.errorMsg(this, msg)
-  }
 }

packages/tx/src/4844/tx.ts

@@ -132,12 +132,16 @@ export class Blob4844Tx implements TransactionInterface<TransactionType.BlobEIP4
     validateNotArray(txData)
 
     if (this.gasLimit * this.maxFeePerGas > MAX_INTEGER) {
-      const msg = this._errorMsg('gasLimit * maxFeePerGas cannot exceed MAX_INTEGER (2^256-1)')
+      const msg = Legacy.errorMsg(
+        this,
+        'gasLimit * maxFeePerGas cannot exceed MAX_INTEGER (2^256-1)',
+      )
       throw new Error(msg)
     }
 
     if (this.maxFeePerGas < this.maxPriorityFeePerGas) {
-      const msg = this._errorMsg(
+      const msg = Legacy.errorMsg(
+        this,
         'maxFeePerGas cannot be less than maxPriorityFeePerGas (The total must be the larger of the two)',
       )
       throw new Error(msg)
@@ -156,24 +160,28 @@ export class Blob4844Tx implements TransactionInterface<TransactionType.BlobEIP4
     for (const hash of this.blobVersionedHashes) {
       if (hash.length !== 66) {
         // 66 is the length of a 32 byte hash as a PrefixedHexString
-        const msg = this._errorMsg('versioned hash is invalid length')
+        const msg = Legacy.errorMsg(this, 'versioned hash is invalid length')
         throw new Error(msg)
       }
       if (BigInt(parseInt(hash.slice(2, 4))) !== this.common.param('blobCommitmentVersionKzg')) {
         // We check the first "byte" of the hash (starts at position 2 since hash is a PrefixedHexString)
-        const msg = this._errorMsg('versioned hash does not start with KZG commitment version')
+        const msg = Legacy.errorMsg(
+          this,
+          'versioned hash does not start with KZG commitment version',
+        )
         throw new Error(msg)
       }
     }
     if (this.blobVersionedHashes.length > LIMIT_BLOBS_PER_TX) {
-      const msg = this._errorMsg(`tx can contain at most ${LIMIT_BLOBS_PER_TX} blobs`)
+      const msg = Legacy.errorMsg(this, `tx can contain at most ${LIMIT_BLOBS_PER_TX} blobs`)
       throw new Error(msg)
     } else if (this.blobVersionedHashes.length === 0) {
-      const msg = this._errorMsg(`tx should contain at least one blob`)
+      const msg = Legacy.errorMsg(this, `tx should contain at least one blob`)
       throw new Error(msg)
     }
     if (this.to === undefined) {
-      const msg = this._errorMsg(
+      const msg = Legacy.errorMsg(
+        this,
         `tx should have a "to" field and cannot be used to create contracts`,
       )
       throw new Error(msg)
@@ -449,16 +457,6 @@ export class Blob4844Tx implements TransactionInterface<TransactionType.BlobEIP4
     return errorStr
   }
 
-  /**
-   * Internal helper function to create an annotated error message
-   *
-   * @param msg Base error message
-   * @hidden
-   */
-  protected _errorMsg(msg: string) {
-    return Legacy.errorMsg(this, msg)
-  }
-
   /**
    * @returns the number of blobs included with this transaction
    */

packages/tx/src/7702/tx.ts

@@ -131,12 +131,16 @@ export class EOACode7702Tx implements TransactionInterface<TransactionType.EOACo
     validateNotArray(txData)
 
     if (this.gasLimit * this.maxFeePerGas > MAX_INTEGER) {
-      const msg = this._errorMsg('gasLimit * maxFeePerGas cannot exceed MAX_INTEGER (2^256-1)')
+      const msg = Legacy.errorMsg(
+        this,
+        'gasLimit * maxFeePerGas cannot exceed MAX_INTEGER (2^256-1)',
+      )
       throw new Error(msg)
     }
 
     if (this.maxFeePerGas < this.maxPriorityFeePerGas) {
-      const msg = this._errorMsg(
+      const msg = Legacy.errorMsg(
+        this,
         'maxFeePerGas cannot be less than maxPriorityFeePerGas (The total must be the larger of the two)',
       )
       throw new Error(msg)
@@ -146,7 +150,8 @@ export class EOACode7702Tx implements TransactionInterface<TransactionType.EOACo
     Legacy.validateHighS(this)
 
     if (this.to === undefined) {
-      const msg = this._errorMsg(
+      const msg = Legacy.errorMsg(
+        this,
         `tx should have a "to" field and cannot be used to create contracts`,
       )
       throw new Error(msg)
@@ -398,14 +403,4 @@ export class EOACode7702Tx implements TransactionInterface<TransactionType.EOACo
     errorStr += ` maxFeePerGas=${this.maxFeePerGas} maxPriorityFeePerGas=${this.maxPriorityFeePerGas}`
     return errorStr
   }
-
-  /**
-   * Internal helper function to create an annotated error message
-   *
-   * @param msg Base error message
-   * @hidden
-   */
-  protected _errorMsg(msg: string) {
-    return Legacy.errorMsg(this, msg)
-  }
 }

packages/tx/src/legacy/tx.ts

@@ -401,14 +401,4 @@ export class LegacyTx implements TransactionInterface<TransactionType.Legacy> {
     errorStr += ` gasPrice=${this.gasPrice}`
     return errorStr
   }
-
-  /**
-   * Internal helper function to create an annotated error message
-   *
-   * @param msg Base error message
-   * @hidden
-   */
-  /*protected _errorMsg(msg: string) {
-    return Legacy.errorMsg(this, msg)
-  }*/
 }