for clarity, rename _validateExceedsMaxInteger(validateCannotExceedMaxInteger) to _validateCannotExceedMaxInteger(values)

Author: ryanio

packages/tx/src/baseTransaction.ts

@@ -37,14 +37,12 @@ export abstract class BaseTransaction<TransactionObject> {
     this.r = r ? new BN(toBuffer(r)) : undefined
     this.s = s ? new BN(toBuffer(s)) : undefined
 
-    const validateCannotExceedMaxInteger = {
+    this._validateCannotExceedMaxInteger({
       nonce: this.nonce,
       gasPrice: this.gasPrice,
       gasLimit: this.gasLimit,
       value: this.value,
-    }
-
-    this._validateExceedsMaxInteger(validateCannotExceedMaxInteger)
+    })
 
     this.common = txOptions.common?.copy() ?? new Common({ chain: 'mainnet' })
   }
@@ -192,9 +190,9 @@ export abstract class BaseTransaction<TransactionObject> {
   // Accept the v,r,s values from the `sign` method, and convert this into a TransactionObject
   protected abstract _processSignature(v: number, r: Buffer, s: Buffer): TransactionObject
 
-  protected _validateExceedsMaxInteger(validateCannotExceedMaxInteger: { [key: string]: BN }) {
-    for (const [key, value] of Object.entries(validateCannotExceedMaxInteger)) {
-      if (value && value.gt(MAX_INTEGER)) {
+  protected _validateCannotExceedMaxInteger(values: { [key: string]: BN | undefined }) {
+    for (const [key, value] of Object.entries(values)) {
+      if (value?.gt(MAX_INTEGER)) {
         throw new Error(`${key} cannot exceed MAX_INTEGER, given ${value}`)
       }
     }

packages/tx/src/legacyTransaction.ts

@@ -96,16 +96,7 @@ export default class Transaction extends BaseTransaction<Transaction> {
   public constructor(txData: TxData, opts: TxOptions = {}) {
     super(txData, opts)
 
-    const validateCannotExceedMaxInteger = {
-      r: this.r ?? new BN(0),
-      s: this.s ?? new BN(0),
-    }
-
-    this._validateExceedsMaxInteger(validateCannotExceedMaxInteger)
-
-    if (this.v) {
-      this._validateTxV(this.v)
-    }
+    this._validateCannotExceedMaxInteger({ r: this.r, s: this.s })
 
     this._validateTxV(this.v)