hardhat 2.10.1 → 2.11.0-dev.0

package/src/internal/hardhat-network/provider/output.ts

@@ -1,9 +1,10 @@
-import { Block } from "@ethereumjs/block";
-import Common from "@ethereumjs/common";
-import { TypedTransaction } from "@ethereumjs/tx";
-import { RunBlockResult } from "@ethereumjs/vm/dist/runBlock";
-import { BN, bufferToHex } from "ethereumjs-util";
+import { Block } from "@ignored/block";
+import { Common } from "@ignored/common";
+import { TypedTransaction } from "@ignored/tx";
+import { bufferToHex } from "@ignored/util";
+import { RunBlockResult } from "@ignored/vm";
 
+import { BigIntUtils } from "../../util/bigint";
 import { assertHardhatInvariant } from "../../core/errors";
 import {
   bufferToRpcData,
@@ -150,7 +151,7 @@ export interface RpcDebugTraceOutput {
 
 export function getRpcBlock(
   block: Block,
-  totalDifficulty: BN,
+  totalDifficulty: bigint,
   showTransactionType: boolean,
   includeTransactions = true,
   pending = false
@@ -162,7 +163,7 @@ export function getRpcBlock(
     : block.transactions.map((tx) => bufferToRpcData(tx.hash()));
 
   const output: RpcBlockOutput = {
-    number: pending ? null : numberToRpcQuantity(new BN(block.header.number)),
+    number: pending ? null : numberToRpcQuantity(block.header.number),
     hash: pending ? null : bufferToRpcData(block.hash()),
     parentHash: bufferToRpcData(block.header.parentHash),
     // We pad this to 8 bytes because of a limitation in The Graph
@@ -170,18 +171,18 @@ export function getRpcBlock(
     nonce: pending ? null : bufferToRpcData(block.header.nonce, 8),
     mixHash: pending ? null : bufferToRpcData(block.header.mixHash, 32),
     sha3Uncles: bufferToRpcData(block.header.uncleHash),
-    logsBloom: pending ? null : bufferToRpcData(block.header.bloom),
+    logsBloom: pending ? null : bufferToRpcData(block.header.logsBloom),
     transactionsRoot: bufferToRpcData(block.header.transactionsTrie),
     stateRoot: bufferToRpcData(block.header.stateRoot),
     receiptsRoot: bufferToRpcData(block.header.receiptTrie),
     miner: bufferToRpcData(block.header.coinbase.toBuffer()),
-    difficulty: numberToRpcQuantity(new BN(block.header.difficulty)),
+    difficulty: numberToRpcQuantity(block.header.difficulty),
     totalDifficulty: numberToRpcQuantity(totalDifficulty),
     extraData: bufferToRpcData(block.header.extraData),
     size: numberToRpcQuantity(block.serialize().length),
-    gasLimit: numberToRpcQuantity(new BN(block.header.gasLimit)),
-    gasUsed: numberToRpcQuantity(new BN(block.header.gasUsed)),
-    timestamp: numberToRpcQuantity(new BN(block.header.timestamp)),
+    gasLimit: numberToRpcQuantity(block.header.gasLimit),
+    gasUsed: numberToRpcQuantity(block.header.gasUsed),
+    timestamp: numberToRpcQuantity(block.header.timestamp),
     transactions,
     uncles: block.uncleHeaders.map((uh: any) => bufferToRpcData(uh.hash())),
   };
@@ -223,23 +224,21 @@ export function getRpcTransaction(
   const baseOutput = {
     blockHash: block === "pending" ? null : bufferToRpcData(block.hash()),
     blockNumber:
-      block === "pending"
-        ? null
-        : numberToRpcQuantity(new BN(block.header.number)),
+      block === "pending" ? null : numberToRpcQuantity(block.header.number),
     from: bufferToRpcData(tx.getSenderAddress().toBuffer()),
-    gas: numberToRpcQuantity(new BN(tx.gasLimit)),
+    gas: numberToRpcQuantity(tx.gasLimit),
     hash: bufferToRpcData(tx.hash()),
     input: bufferToRpcData(tx.data),
-    nonce: numberToRpcQuantity(new BN(tx.nonce)),
+    nonce: numberToRpcQuantity(tx.nonce),
     to: tx.to === undefined ? null : bufferToRpcData(tx.to.toBuffer()),
     transactionIndex: index !== undefined ? numberToRpcQuantity(index) : null,
-    value: numberToRpcQuantity(new BN(tx.value)),
-    v: numberToRpcQuantity(new BN(tx.v)),
-    r: numberToRpcQuantity(new BN(tx.r)),
-    s: numberToRpcQuantity(new BN(tx.s)),
+    value: numberToRpcQuantity(tx.value),
+    v: numberToRpcQuantity(tx.v),
+    r: numberToRpcQuantity(tx.r),
+    s: numberToRpcQuantity(tx.s),
     type:
       showTransactionType || isTypedTransaction
-        ? numberToRpcQuantity(tx.transactionType)
+        ? numberToRpcQuantity(tx.type)
         : undefined,
     accessList:
       "accessList" in tx
@@ -274,14 +273,14 @@ export function getRpcTransaction(
   };
 }
 
-function getEffectiveGasPrice(tx: TypedTransaction, baseFeePerGas: BN) {
+function getEffectiveGasPrice(tx: TypedTransaction, baseFeePerGas: bigint) {
   const maxFeePerGas = "maxFeePerGas" in tx ? tx.maxFeePerGas : tx.gasPrice;
   const maxPriorityFeePerGas =
     "maxPriorityFeePerGas" in tx ? tx.maxPriorityFeePerGas : tx.gasPrice;
 
-  // baseFeePerGas + min(maxFeePerGas - baseFeePerGas, maxPriorityFeePerGas)
-  return baseFeePerGas.add(
-    BN.min(maxFeePerGas.sub(baseFeePerGas), maxPriorityFeePerGas)
+  return (
+    baseFeePerGas +
+    BigIntUtils.min(maxFeePerGas - baseFeePerGas, maxPriorityFeePerGas)
   );
 }
 
@@ -296,7 +295,7 @@ export function getRpcReceiptOutputsFromLocalBlockExecution(
 
   for (let i = 0; i < runBlockResult.results.length; i += 1) {
     const tx = block.transactions[i];
-    const { createdAddress, gasUsed } = runBlockResult.results[i];
+    const { createdAddress, totalGasSpent } = runBlockResult.results[i];
     const receipt = runBlockResult.receipts[i];
 
     const logs = receipt.logs.map((log) => {
@@ -309,11 +308,11 @@ export function getRpcReceiptOutputsFromLocalBlockExecution(
       transactionHash: bufferToRpcData(tx.hash()),
       transactionIndex: numberToRpcQuantity(i),
       blockHash: bufferToRpcData(block.hash()),
-      blockNumber: numberToRpcQuantity(new BN(block.header.number)),
+      blockNumber: numberToRpcQuantity(block.header.number),
       from: bufferToRpcData(tx.getSenderAddress().toBuffer()),
       to: tx.to === undefined ? null : bufferToRpcData(tx.to.toBuffer()),
-      cumulativeGasUsed: numberToRpcQuantity(new BN(receipt.gasUsed)),
-      gasUsed: numberToRpcQuantity(gasUsed),
+      cumulativeGasUsed: numberToRpcQuantity(receipt.cumulativeBlockGasUsed),
+      gasUsed: numberToRpcQuantity(totalGasSpent),
       contractAddress:
         createdAddress !== undefined
           ? bufferToRpcData(createdAddress.toBuffer())
@@ -322,9 +321,7 @@ export function getRpcReceiptOutputsFromLocalBlockExecution(
       logsBloom: bufferToRpcData(receipt.bitvector),
       // There's no way to execute an EIP-2718 tx locally if we aren't in
       // an HF >= Berlin, so this check is enough
-      type: showTransactionType
-        ? numberToRpcQuantity(tx.transactionType)
-        : undefined,
+      type: showTransactionType ? numberToRpcQuantity(tx.type) : undefined,
     };
 
     if ("stateRoot" in receipt) {
@@ -386,7 +383,7 @@ export function remoteReceiptToRpcReceiptOutput(
     transactionIndex: numberToRpcQuantity(receipt.transactionIndex),
     type:
       showTransactionType || isTypedTransaction
-        ? numberToRpcQuantity(tx.transactionType)
+        ? numberToRpcQuantity(tx.type)
         : undefined,
     effectiveGasPrice:
       showEffectiveGasPrice || tx.type === 2
@@ -433,9 +430,7 @@ function getRpcLogOutput(
     transactionHash: block !== undefined ? bufferToRpcData(tx.hash()) : null,
     blockHash: block !== undefined ? bufferToRpcData(block.hash()) : null,
     blockNumber:
-      block !== undefined
-        ? numberToRpcQuantity(new BN(block.header.number))
-        : null,
+      block !== undefined ? numberToRpcQuantity(block.header.number) : null,
     address: bufferToRpcData(log[0]),
     data: bufferToRpcData(log[2]),
     topics: log[1].map((topic: Buffer) => bufferToRpcData(topic)),

package/src/internal/hardhat-network/provider/provider.ts

@@ -7,10 +7,9 @@ import type {
   RequestArguments,
 } from "../../../types";
 
-import Common from "@ethereumjs/common";
+import { Common } from "@ignored/common";
 import chalk from "chalk";
 import debug from "debug";
-import { BN } from "ethereumjs-util";
 import { EventEmitter } from "events";
 import fsExtra from "fs-extra";
 import semver from "semver";
@@ -79,9 +78,9 @@ export class HardhatNetworkProvider
     private readonly _networkName: string,
     private readonly _chainId: number,
     private readonly _networkId: number,
-    private readonly _blockGasLimit: number,
-    private readonly _initialBaseFeePerGas: number | undefined,
-    private readonly _minGasPrice: BN,
+    private readonly _blockGasLimit: bigint,
+    private readonly _initialBaseFeePerGas: bigint | undefined,
+    private readonly _minGasPrice: bigint,
     private readonly _throwOnTransactionFailures: boolean,
     private readonly _throwOnCallFailures: boolean,
     private readonly _automine: boolean,
@@ -353,7 +352,7 @@ export class HardhatNetworkProvider
     node.removeListener("ethEvent", this._ethEventListener);
   }
 
-  private _ethEventListener = (payload: { filterId: BN; result: any }) => {
+  private _ethEventListener = (payload: { filterId: bigint; result: any }) => {
     const subscription = `0x${payload.filterId.toString(16)}`;
     const result = payload.result;
     this._emitLegacySubscriptionEvent(subscription, result);

package/src/internal/hardhat-network/provider/return-data.ts

@@ -1,5 +1,4 @@
 import { rawDecode } from "ethereumjs-abi";
-import { BN } from "ethereumjs-util";
 
 import { assertHardhatInvariant } from "../../core/errors";
 
@@ -54,7 +53,7 @@ export class ReturnData {
     return decoded.toString("utf8");
   }
 
-  public decodePanic(): BN {
+  public decodePanic(): number {
     assertHardhatInvariant(
       this._selector === PANIC_SELECTOR,
       "Expected return data to be a Panic(uint256)"
@@ -62,6 +61,10 @@ export class ReturnData {
 
     const [errorCode] = rawDecode(["uint256"], this.value.slice(4));
 
-    return errorCode;
+    return errorCode.toNumber();
+  }
+
+  public getSelector(): string | undefined {
+    return this._selector;
   }
 }

package/src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts

@@ -1,11 +1,12 @@
-import Common from "@ethereumjs/common";
-import { AccessListEIP2930Transaction } from "@ethereumjs/tx";
+import { Common } from "@ignored/common";
+import * as rlp from "@ignored/rlp";
+import { AccessListEIP2930Transaction } from "@ignored/tx";
 import {
   AccessListEIP2930TxData,
   AccessListEIP2930ValuesArray,
   TxOptions,
-} from "@ethereumjs/tx/dist/types";
-import { Address, BN, rlp } from "ethereumjs-util";
+} from "@ignored/tx/dist/types";
+import { Address, arrToBufArr, bufferToInt } from "@ignored/util";
 
 import {
   InternalError,
@@ -65,15 +66,11 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
       );
     }
 
-    const values = rlp.decode(serialized.slice(1));
+    const values = arrToBufArr(rlp.decode(serialized.slice(1)));
 
-    if (!Array.isArray(values)) {
-      throw new InvalidArgumentsError(
-        "Invalid serialized tx input. Must be array"
-      );
-    }
+    checkIsAccessListEIP2930ValuesArray(values);
 
-    return this.fromSenderAndValuesArray(sender, values as any, opts);
+    return this.fromSenderAndValuesArray(sender, values, opts);
   }
 
   public static fromSenderAndValuesArray(
@@ -81,12 +78,6 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
     values: AccessListEIP2930ValuesArray,
     opts: TxOptions = {}
   ): FakeSenderAccessListEIP2930Transaction {
-    if (values.length !== 8 && values.length !== 11) {
-      throw new InvalidArgumentsError(
-        "Invalid EIP-2930 transaction. Only expecting 8 values (for unsigned tx) or 11 values (for signed tx)."
-      );
-    }
-
     const [
       chainId,
       nonce,
@@ -112,9 +103,9 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
         value,
         data: data ?? Buffer.from([]),
         accessList: accessList ?? [],
-        v: v !== undefined ? new BN(v) : undefined, // EIP2930 supports v's with value 0 (empty Buffer)
-        r: r !== undefined && r.length !== 0 ? new BN(r) : undefined,
-        s: s !== undefined && s.length !== 0 ? new BN(s) : undefined,
+        v: v !== undefined ? bufferToInt(v) : undefined, // EIP2930 supports v's with value 0 (empty Buffer)
+        r: r !== undefined && r.length !== 0 ? bufferToInt(r) : undefined,
+        s: s !== undefined && s.length !== 0 ? bufferToInt(s) : undefined,
       },
       opts
     );
@@ -132,9 +123,9 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
     super(
       {
         ...data,
-        v: data.v ?? new BN(1),
-        r: data.r ?? new BN(1),
-        s: data.s ?? new BN(2),
+        v: data.v ?? 1,
+        r: data.r ?? 1,
+        s: data.s ?? 2,
       },
       { ...opts, freeze: false }
     );
@@ -157,7 +148,7 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
     );
   }
 
-  public _processSignature(_v: number, _r: Buffer, _s: Buffer): never {
+  public _processSignature(_v: bigint, _r: Buffer, _s: Buffer): never {
     throw new InternalError(
       "`_processSignature` is not implemented in FakeSenderAccessListEIP2930Transaction"
     );
@@ -191,3 +182,39 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
     return true;
   }
 }
+
+function checkIsAccessListEIP2930ValuesArray(
+  values: unknown
+): asserts values is AccessListEIP2930ValuesArray {
+  if (!Array.isArray(values)) {
+    throw new InvalidArgumentsError(
+      `Invalid deserialized tx. Expected a Buffer[], but got '${values as any}'`
+    );
+  }
+
+  if (values.length !== 8 && values.length !== 11) {
+    throw new InvalidArgumentsError(
+      "Invalid EIP-2930 transaction. Only expecting 8 values (for unsigned tx) or 11 values (for signed tx)."
+    );
+  }
+
+  // all elements in the array are buffers, except the 8th one that is an
+  // AccessListBuffer (an array of AccessListBufferItems)
+  for (const [i, value] of values.entries()) {
+    if (i === 7) {
+      if (!Array.isArray(value)) {
+        // we could check more things to assert that it's an AccessListBuffer,
+        // but we're assuming that just checking if it's an array is enough
+        throw new InvalidArgumentsError(
+          `Invalid deserialized tx. Expected a AccessListBuffer in position ${i}, but got '${value}'`
+        );
+      }
+    } else {
+      if (!Buffer.isBuffer(values[i])) {
+        throw new InvalidArgumentsError(
+          `Invalid deserialized tx. Expected a Buffer in position ${i}, but got '${value}'`
+        );
+      }
+    }
+  }
+}

package/src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts

@@ -1,10 +1,11 @@
-import { FeeMarketEIP1559Transaction } from "@ethereumjs/tx";
+import * as rlp from "@ignored/rlp";
+import { FeeMarketEIP1559Transaction } from "@ignored/tx";
 import {
   FeeMarketEIP1559TxData,
   FeeMarketEIP1559ValuesArray,
   TxOptions,
-} from "@ethereumjs/tx/dist/types";
-import { Address, BN, rlp } from "ethereumjs-util";
+} from "@ignored/tx/dist/types";
+import { Address, arrToBufArr, bufferToInt } from "@ignored/util";
 
 import {
   InternalError,
@@ -64,15 +65,11 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
       );
     }
 
-    const values = rlp.decode(serialized.slice(1));
+    const values = arrToBufArr(rlp.decode(serialized.slice(1)));
 
-    if (!Array.isArray(values)) {
-      throw new InvalidArgumentsError(
-        "Invalid serialized tx input. Must be array"
-      );
-    }
+    checkIsFeeMarketEIP1559ValuesArray(values);
 
-    return this.fromSenderAndValuesArray(sender, values as any, opts);
+    return this.fromSenderAndValuesArray(sender, values, opts);
   }
 
   public static fromSenderAndValuesArray(
@@ -80,12 +77,6 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
     values: FeeMarketEIP1559ValuesArray,
     opts: TxOptions = {}
   ): FakeSenderEIP1559Transaction {
-    if (values.length !== 9 && values.length !== 12) {
-      throw new InvalidArgumentsError(
-        "Invalid EIP-1559 transaction. Only expecting 9 values (for unsigned tx) or 12 values (for signed tx)."
-      );
-    }
-
     const [
       chainId,
       nonce,
@@ -113,9 +104,9 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
         value,
         data: data ?? Buffer.from([]),
         accessList: accessList ?? [],
-        v: v !== undefined ? new BN(v) : undefined, // EIP1559 supports v's with value 0 (empty Buffer)
-        r: r !== undefined && r.length !== 0 ? new BN(r) : undefined,
-        s: s !== undefined && s.length !== 0 ? new BN(s) : undefined,
+        v: v !== undefined ? bufferToInt(v) : undefined, // EIP1559 supports v's with value 0 (empty Buffer)
+        r: r !== undefined && r.length !== 0 ? bufferToInt(r) : undefined,
+        s: s !== undefined && s.length !== 0 ? bufferToInt(s) : undefined,
       },
       opts
     );
@@ -131,9 +122,9 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
     super(
       {
         ...data,
-        v: data.v ?? new BN(1),
-        r: data.r ?? new BN(1),
-        s: data.s ?? new BN(2),
+        v: data.v ?? 1,
+        r: data.r ?? 1,
+        s: data.s ?? 2,
       },
       { ...opts, freeze: false }
     );
@@ -155,7 +146,7 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
     );
   }
 
-  public _processSignature(_v: number, _r: Buffer, _s: Buffer): never {
+  public _processSignature(_v: bigint, _r: Buffer, _s: Buffer): never {
     throw new InternalError(
       "`_processSignature` is not implemented in FakeSenderEIP1559Transaction"
     );
@@ -189,3 +180,39 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
     return true;
   }
 }
+
+function checkIsFeeMarketEIP1559ValuesArray(
+  values: unknown
+): asserts values is FeeMarketEIP1559ValuesArray {
+  if (!Array.isArray(values)) {
+    throw new InvalidArgumentsError(
+      `Invalid deserialized tx. Expected a Buffer[], but got '${values as any}'`
+    );
+  }
+
+  if (values.length !== 9 && values.length !== 12) {
+    throw new InvalidArgumentsError(
+      "Invalid EIP-1559 transaction. Only expecting 9 values (for unsigned tx) or 12 values (for signed tx)."
+    );
+  }
+
+  // all elements in the array are buffers, except the 9th one that is an
+  // AccessListBuffer (an array of AccessListBufferItems)
+  for (const [i, value] of values.entries()) {
+    if (i === 8) {
+      if (!Array.isArray(value)) {
+        // we could check more things to assert that it's an AccessListBuffer,
+        // but we're assuming that just checking if it's an array is enough
+        throw new InvalidArgumentsError(
+          `Invalid deserialized tx. Expected a AccessListBuffer in position ${i}, but got '${value}'`
+        );
+      }
+    } else {
+      if (!Buffer.isBuffer(values[i])) {
+        throw new InvalidArgumentsError(
+          `Invalid deserialized tx. Expected a Buffer in position ${i}, but got '${value}'`
+        );
+      }
+    }
+  }
+}

package/src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts

@@ -1,8 +1,12 @@
-import Common from "@ethereumjs/common";
-import { Transaction, TxData, TxOptions } from "@ethereumjs/tx";
-import { Address, BN, rlp } from "ethereumjs-util";
+import { Common } from "@ignored/common";
+import * as rlp from "@ignored/rlp";
+import { Transaction, TxData, TxOptions } from "@ignored/tx";
+import { Address, arrToBufArr } from "@ignored/util";
 
-import { InternalError } from "../../../core/providers/errors";
+import {
+  InternalError,
+  InvalidArgumentsError,
+} from "../../../core/providers/errors";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 
@@ -51,11 +55,9 @@ export class FakeSenderTransaction extends Transaction {
     serialized: Buffer,
     opts?: TxOptions
   ) {
-    const values = rlp.decode(serialized);
+    const values = arrToBufArr(rlp.decode(serialized));
 
-    if (!Array.isArray(values)) {
-      throw new Error("Invalid serialized tx input. Must be array");
-    }
+    checkIsFlatBufferArray(values);
 
     return this.fromSenderAndValuesArray(sender, values, opts);
   }
@@ -98,9 +100,9 @@ export class FakeSenderTransaction extends Transaction {
     super(
       {
         ...data,
-        v: data.v ?? new BN(27),
-        r: data.r ?? new BN(1),
-        s: data.s ?? new BN(2),
+        v: data.v ?? 27,
+        r: data.r ?? 1,
+        s: data.s ?? 2,
       },
       { ...opts, freeze: false }
     );
@@ -182,3 +184,19 @@ FakeSenderTransactionPrototype._processSignature = function () {
     "`_processSignature` is not implemented in FakeSenderTransaction"
   );
 };
+
+function checkIsFlatBufferArray(values: unknown): asserts values is Buffer[] {
+  if (!Array.isArray(values)) {
+    throw new InvalidArgumentsError(
+      `Invalid deserialized tx. Expected a Buffer[], but got '${values as any}'`
+    );
+  }
+
+  for (const [i, value] of values.entries()) {
+    if (!Buffer.isBuffer(value)) {
+      throw new InvalidArgumentsError(
+        `Invalid deserialized tx. Expected a Buffer in position ${i}, but got '${value}'`
+      );
+    }
+  }
+}

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts

@@ -1,13 +1,13 @@
-import Common from "@ethereumjs/common";
-import { FeeMarketEIP1559Transaction, TxOptions } from "@ethereumjs/tx";
-import { Address, BN } from "ethereumjs-util";
+import { Common } from "@ignored/common";
+import { FeeMarketEIP1559Transaction, TxOptions } from "@ignored/tx";
+import { Address } from "@ignored/util";
 
 import {
   FeeMarketEIP1559TxData,
   FeeMarketEIP1559ValuesArray,
-} from "@ethereumjs/tx/src/types";
+} from "@ignored/tx/src/types";
 import { InternalError } from "../../../core/providers/errors";
-import { LONDON_EIPS } from "../../../util/hardforks";
+import { BigIntUtils } from "../../../util/bigint";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 
@@ -56,26 +56,14 @@ export class ReadOnlyValidEIP1559Transaction extends FeeMarketEIP1559Transaction
   private readonly _sender: Address;
 
   constructor(sender: Address, data: FeeMarketEIP1559TxData = {}) {
-    const fakeCommon = new Common({
-      chain: "mainnet",
-      hardfork: "london", // TODO: consider chaning this to ["latest hardfork"]
-    });
-
-    // this class should only be used with txs in a hardfork that
-    // supports EIP-1559
-    (fakeCommon as any).isActivatedEIP = (eip: number) => {
-      return LONDON_EIPS.has(eip);
-    };
-
-    // this class should only be used with EIP-1559 txs,
-    // which always have a `chainId` value
-    (fakeCommon as any).chainIdBN = () => {
-      if (data.chainId !== undefined) {
-        return new BN(data.chainId);
+    const fakeCommon = Common.custom(
+      {
+        chainId: BigIntUtils.fromBigIntLike(data.chainId),
+      },
+      {
+        hardfork: "london",
       }
-
-      throw new Error("Expected txData to have a chainId");
-    };
+    );
 
     super(data, { freeze: false, common: fakeCommon });
 

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts

@@ -1,14 +1,14 @@
-import Common from "@ethereumjs/common";
+import { Common } from "@ignored/common";
 import {
   AccessListEIP2930Transaction,
   AccessListEIP2930TxData,
   AccessListEIP2930ValuesArray,
   TxOptions,
-} from "@ethereumjs/tx";
-import { Address, BN } from "ethereumjs-util";
+} from "@ignored/tx";
+import { Address } from "@ignored/util";
 
 import { InternalError } from "../../../core/providers/errors";
-import { BERLIN_EIPS } from "../../../util/hardforks";
+import { BigIntUtils } from "../../../util/bigint";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 
@@ -58,25 +58,14 @@ export class ReadOnlyValidEIP2930Transaction extends AccessListEIP2930Transactio
   private readonly _sender: Address;
 
   constructor(sender: Address, data: AccessListEIP2930TxData = {}) {
-    const fakeCommon = new Common({
-      chain: "mainnet",
-    });
-
-    // this class should only be used with txs in a hardfork that
-    // supports EIP-2930
-    (fakeCommon as any).isActivatedEIP = (eip: number) => {
-      return BERLIN_EIPS.has(eip);
-    };
-
-    // this class should only be used with EIP-2930 txs,
-    // which (we assume) always have a defined `chainId` value
-    (fakeCommon as any).chainIdBN = () => {
-      if (data.chainId !== undefined) {
-        return new BN(data.chainId);
+    const fakeCommon = Common.custom(
+      {
+        chainId: BigIntUtils.fromBigIntLike(data.chainId),
+      },
+      {
+        hardfork: "berlin",
       }
-
-      throw new Error("Expected txData to have a chainId");
-    };
+    );
 
     super(data, { freeze: false, common: fakeCommon });
 

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.ts

@@ -1,6 +1,6 @@
-import Common from "@ethereumjs/common";
-import { Transaction, TxData, TxOptions } from "@ethereumjs/tx";
-import { Address } from "ethereumjs-util";
+import { Common } from "@ignored/common";
+import { Transaction, TxData, TxOptions } from "@ignored/tx";
+import { Address } from "@ignored/util";
 
 import { InternalError } from "../../../core/providers/errors";