hardhat 2.11.0-dev.0 → 2.11.0

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

@@ -1,6 +1,9 @@
-import { AccessListEIP2930TxData, TxData } from "@ignored/tx";
+import {
+  AccessListEIP2930TxData,
+  TxData,
+} from "@nomicfoundation/ethereumjs-tx";
 
-import { FeeMarketEIP1559TxData } from "@ignored/tx/dist/types";
+import { FeeMarketEIP1559TxData } from "@nomicfoundation/ethereumjs-tx/dist/types";
 import { RpcTransaction } from "../../../core/jsonrpc/types/output/transaction";
 
 export function rpcToTxData(

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

@@ -1,13 +1,17 @@
-import { Block } from "@ignored/block";
-import { Common } from "@ignored/common";
-import { Transaction, TransactionFactory, TypedTransaction } from "@ignored/tx";
+import { Block } from "@nomicfoundation/ethereumjs-block";
+import { Common } from "@nomicfoundation/ethereumjs-common";
+import {
+  Transaction,
+  TransactionFactory,
+  TypedTransaction,
+} from "@nomicfoundation/ethereumjs-tx";
 import {
   Address,
   bufferToHex,
   toBuffer,
   toRpcSig,
   zeroAddress,
-} from "@ignored/util";
+} from "@nomicfoundation/ethereumjs-util";
 import * as t from "io-ts";
 import cloneDeep from "lodash/cloneDeep";
 
@@ -81,7 +85,7 @@ import {
 
 import { assertHardhatNetworkInvariant } from "../utils/assertions";
 import { optional } from "../../../util/io-ts";
-import { BigIntUtils } from "../../../util/bigint";
+import * as BigIntUtils from "../../../util/bigint";
 import { ModulesLogger } from "./logger";
 
 const EIP1559_MIN_HARDFORK = "london";
@@ -963,7 +967,7 @@ export class EthModule {
       // Please keep it updated.
 
       if (error instanceof Error) {
-        if (error.message === "invalid remainder") {
+        if (error.message === "invalid RLP: remainder must be zero") {
           throw new InvalidArgumentsError("Invalid transaction", error);
         }
 

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

@@ -1,4 +1,4 @@
-import { Address } from "@ignored/util";
+import { Address } from "@nomicfoundation/ethereumjs-util";
 import * as t from "io-ts";
 
 import {
@@ -115,6 +115,11 @@ export class HardhatModule {
 
       case "hardhat_mine":
         return this._hardhatMineAction(...this._hardhatMineParams(params));
+
+      case "hardhat_setPrevRandao":
+        return this._hardhatSetPrevRandaoAction(
+          ...this._hardhatSetPrevRandaoParams(params)
+        );
     }
 
     throw new MethodNotFoundError(`Method ${method} not found`);
@@ -387,6 +392,25 @@ export class HardhatModule {
     return validateParams(params, optional(rpcQuantity), optional(rpcQuantity));
   }
 
+  // hardhat_setPrevRandao
+
+  private _hardhatSetPrevRandaoParams(params: any[]): [Buffer] {
+    // using rpcHash because it's also 32 bytes long
+    return validateParams(params, rpcHash);
+  }
+
+  private async _hardhatSetPrevRandaoAction(prevRandao: Buffer) {
+    if (!this._node.isPostMergeHardfork()) {
+      throw new InvalidInputError(
+        `hardhat_setPrevRandao is only available in post-merge hardforks, the current hardfork is ${this._node.hardfork}`
+      );
+    }
+
+    this._node.setPrevRandao(prevRandao);
+
+    return true;
+  }
+
   private async _logBlock(
     result: MineBlockResult,
     { isIntervalMined }: { isIntervalMined: boolean }

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

@@ -1,6 +1,6 @@
-import { Block } from "@ignored/block";
-import { TypedTransaction } from "@ignored/tx";
-import { bufferToHex } from "@ignored/util";
+import { Block } from "@nomicfoundation/ethereumjs-block";
+import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
 import ansiEscapes from "ansi-escapes";
 import chalk, { Chalk } from "chalk";
 import util from "util";

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

@@ -1,4 +1,4 @@
-import { Common } from "@ignored/common";
+import { Common } from "@nomicfoundation/ethereumjs-common";
 
 import { numberToRpcQuantity } from "../../../core/jsonrpc/types/base-types";
 import { validateParams } from "../../../core/jsonrpc/types/input/validation";

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

@@ -1,4 +1,4 @@
-import { Address, toRpcSig } from "@ignored/util";
+import { Address, toRpcSig } from "@nomicfoundation/ethereumjs-util";
 
 import { rpcAddress, rpcData } from "../../../core/jsonrpc/types/base-types";
 import { validateParams } from "../../../core/jsonrpc/types/input/validation";

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

@@ -1,12 +1,10 @@
-import { arrToBufArr, bufArrToArr } from "@ignored/util";
-import { keccak256 } from "ethereum-cryptography/keccak";
-
 import {
   bufferToRpcData,
   rpcData,
 } from "../../../core/jsonrpc/types/base-types";
 import { validateParams } from "../../../core/jsonrpc/types/input/validation";
 import { MethodNotFoundError } from "../../../core/providers/errors";
+import { keccak256 } from "../../../util/keccak";
 import { getPackageJson } from "../../../util/packageInfo";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
@@ -35,8 +33,8 @@ export class Web3Module {
 
   private async _clientVersionAction(): Promise<string> {
     const hardhatPackage = await getPackageJson();
-    const ethereumjsVMPackage = require("@ignored/vm/package.json");
-    return `HardhatNetwork/${hardhatPackage.version}/@ignored/vm/${ethereumjsVMPackage.version}`;
+    const ethereumjsVMPackage = require("@nomicfoundation/ethereumjs-vm/package.json");
+    return `HardhatNetwork/${hardhatPackage.version}/@nomicfoundation/ethereumjs-vm/${ethereumjsVMPackage.version}`;
   }
 
   // web3_sha3
@@ -46,6 +44,6 @@ export class Web3Module {
   }
 
   private async _sha3Action(buffer: Buffer): Promise<string> {
-    return bufferToRpcData(arrToBufArr(keccak256(bufArrToArr(buffer))));
+    return bufferToRpcData(keccak256(buffer));
   }
 }

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

@@ -1,7 +1,7 @@
 import type { ReturnData } from "./return-data";
 
-import { Block } from "@ignored/block";
-import { RunBlockResult } from "@ignored/vm";
+import { Block } from "@nomicfoundation/ethereumjs-block";
+import { RunBlockResult } from "@nomicfoundation/ethereumjs-vm";
 
 import { HARDHAT_MEMPOOL_SUPPORTED_ORDERS } from "../../constants";
 import { BuildInfo, HardhatNetworkChainsConfig } from "../../../types";
@@ -18,7 +18,7 @@ export function isForkedNodeConfig(
 
 interface CommonConfig {
   automine: boolean;
-  blockGasLimit: bigint;
+  blockGasLimit: number;
   chainId: number;
   genesisAccounts: GenesisAccount[];
   hardfork: string;
@@ -28,7 +28,7 @@ interface CommonConfig {
   allowUnlimitedContractSize?: boolean;
   initialDate?: Date;
   tracingConfig?: TracingConfig;
-  initialBaseFeePerGas?: bigint;
+  initialBaseFeePerGas?: number;
   mempoolOrder: MempoolOrder;
   coinbase: string;
   chains: HardhatNetworkChainsConfig;
@@ -68,7 +68,7 @@ export interface CallParams {
   gasLimit: bigint;
   value: bigint;
   data: Buffer;
-  // We use this access list format because @ignored/tx access list data
+  // We use this access list format because @nomicfoundation/ethereumjs-tx access list data
   // forces us to use it or stringify them
   accessList?: AccessListBufferItem[];
   // Fee params
@@ -98,7 +98,7 @@ export interface LegacyTransactionParams extends BaseTransactionParams {
 
 export interface AccessListTransactionParams extends BaseTransactionParams {
   gasPrice: bigint;
-  // We use this access list format because @ignored/tx access list data
+  // We use this access list format because @nomicfoundation/ethereumjs-tx access list data
   // forces us to use it or stringify them
   accessList: AccessListBufferItem[];
   // We don't include chainId as it's not necessary, the node

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

@@ -1,11 +1,11 @@
-import { Block, HeaderData } from "@ignored/block";
-import { Common } from "@ignored/common";
+import { Block, HeaderData } from "@nomicfoundation/ethereumjs-block";
+import { Common } from "@nomicfoundation/ethereumjs-common";
 import {
   AccessListEIP2930Transaction,
   FeeMarketEIP1559Transaction,
   Transaction,
   TypedTransaction,
-} from "@ignored/tx";
+} from "@nomicfoundation/ethereumjs-tx";
 import {
   Address,
   ECDSASignature,
@@ -16,17 +16,26 @@ import {
   privateToAddress,
   setLengthLeft,
   toBuffer,
-} from "@ignored/util";
-import { Bloom, EEI, RunBlockResult, RunTxResult, VM } from "@ignored/vm";
-import { EVM, EVMResult } from "@ignored/evm";
-import { ERROR } from "@ignored/evm/dist/exceptions";
-import { DefaultStateManager, StateManager } from "@ignored/statemanager";
+} from "@nomicfoundation/ethereumjs-util";
+import {
+  Bloom,
+  EEI,
+  RunBlockResult,
+  RunTxResult,
+  VM,
+} from "@nomicfoundation/ethereumjs-vm";
+import { EVM, EVMResult } from "@nomicfoundation/ethereumjs-evm";
+import { ERROR } from "@nomicfoundation/ethereumjs-evm/dist/exceptions";
+import {
+  DefaultStateManager,
+  StateManager,
+} from "@nomicfoundation/ethereumjs-statemanager";
 import { SignTypedDataVersion, signTypedData } from "@metamask/eth-sig-util";
 import chalk from "chalk";
 import debug from "debug";
 import EventEmitter from "events";
 
-import { BigIntUtils } from "../../util/bigint";
+import * as BigIntUtils from "../../util/bigint";
 import { CompilerInput, CompilerOutput } from "../../../types";
 import { HardforkHistoryConfig } from "../../../types/config";
 import { HARDHAT_NETWORK_SUPPORTED_HARDFORKS } from "../../constants";
@@ -169,7 +178,7 @@ export class HardhatNode extends EventEmitter {
       forkBlockNum = forkBlockNumber;
 
       this._validateHardforks(
-        BigIntUtils.mapNumberToBigInt(config.forkConfig.blockNumber),
+        config.forkConfig.blockNumber,
         common,
         forkNetworkId
       );
@@ -288,7 +297,7 @@ export class HardhatNode extends EventEmitter {
   }
 
   private static _validateHardforks(
-    forkBlockNumber: bigint | undefined,
+    forkBlockNumber: number | undefined,
     common: Common,
     remoteChainId: number
   ): void {
@@ -2348,7 +2357,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
         // know anything about the txs in the current block
       }
 
-      // NOTE: This is a workaround of both an @ignored/vm limitation, and
+      // NOTE: This is a workaround of both an @nomicfoundation/ethereumjs-vm limitation, and
       //   a bug in Hardhat Network.
       //
       // See: https://github.com/nomiclabs/hardhat/issues/1666
@@ -2512,6 +2521,10 @@ Hardhat Network's forking functionality only works with blocks from at least spu
     return hardforkGte(this.hardfork, HardforkName.MERGE);
   }
 
+  public setPrevRandao(prevRandao: Buffer): void {
+    this._mixHashGenerator.setNext(prevRandao);
+  }
+
   private _getNextMixHash(): Buffer {
     return this._mixHashGenerator.next();
   }

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

@@ -1,10 +1,10 @@
-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 { Block } from "@nomicfoundation/ethereumjs-block";
+import { Common } from "@nomicfoundation/ethereumjs-common";
+import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
+import { RunBlockResult } from "@nomicfoundation/ethereumjs-vm";
 
-import { BigIntUtils } from "../../util/bigint";
+import * as BigIntUtils from "../../util/bigint";
 import { assertHardhatInvariant } from "../../core/errors";
 import {
   bufferToRpcData,

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

@@ -7,7 +7,7 @@ import type {
   RequestArguments,
 } from "../../../types";
 
-import { Common } from "@ignored/common";
+import { Common } from "@nomicfoundation/ethereumjs-common";
 import chalk from "chalk";
 import debug from "debug";
 import { EventEmitter } from "events";
@@ -24,9 +24,9 @@ import {
   MethodNotSupportedError,
   ProviderError,
 } from "../../core/providers/errors";
-import { FIRST_SOLC_VERSION_SUPPORTED } from "../stack-traces/solidityTracer";
-import { Mutex } from "../vendor/await-semaphore";
+import { Mutex } from "../../vendor/await-semaphore";
 
+import { FIRST_SOLC_VERSION_SUPPORTED } from "../stack-traces/constants";
 import { MiningTimer } from "./MiningTimer";
 import { DebugModule } from "./modules/debug";
 import { EthModule } from "./modules/eth";
@@ -62,7 +62,6 @@ export class HardhatNetworkProvider
   extends EventEmitter
   implements EIP1193Provider
 {
-  private _common?: Common;
   private _node?: HardhatNode;
   private _ethModule?: EthModule;
   private _netModule?: NetModule;
@@ -72,14 +71,16 @@ export class HardhatNetworkProvider
   private _debugModule?: DebugModule;
   private _personalModule?: PersonalModule;
   private readonly _mutex = new Mutex();
+  // this field is not used here but it's used in the tests
+  private _common?: Common;
 
   constructor(
     private readonly _hardfork: string,
     private readonly _networkName: string,
     private readonly _chainId: number,
     private readonly _networkId: number,
-    private readonly _blockGasLimit: bigint,
-    private readonly _initialBaseFeePerGas: bigint | undefined,
+    private readonly _blockGasLimit: number,
+    private readonly _initialBaseFeePerGas: number | undefined,
     private readonly _minGasPrice: bigint,
     private readonly _throwOnTransactionFailures: boolean,
     private readonly _throwOnCallFailures: boolean,

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

@@ -49,19 +49,23 @@ export class ReturnData {
       "Expected return data to be a Error(string)"
     );
 
-    const decoded = rawDecode(["string"], this.value.slice(4));
-    return decoded.toString("utf8");
+    const [decodedError] = rawDecode(["string"], this.value.slice(4)) as [
+      string
+    ];
+
+    return decodedError;
   }
 
-  public decodePanic(): number {
+  public decodePanic(): bigint {
     assertHardhatInvariant(
       this._selector === PANIC_SELECTOR,
       "Expected return data to be a Panic(uint256)"
     );
 
-    const [errorCode] = rawDecode(["uint256"], this.value.slice(4));
+    // we are assuming that panic codes are smaller than Number.MAX_SAFE_INTEGER
+    const errorCode = BigInt(`0x${this.value.slice(4).toString("hex")}`);
 
-    return errorCode.toNumber();
+    return errorCode;
   }
 
   public getSelector(): string | undefined {

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

@@ -1,12 +1,16 @@
-import { Common } from "@ignored/common";
-import * as rlp from "@ignored/rlp";
-import { AccessListEIP2930Transaction } from "@ignored/tx";
+import { Common } from "@nomicfoundation/ethereumjs-common";
+import * as rlp from "@nomicfoundation/ethereumjs-rlp";
+import { AccessListEIP2930Transaction } from "@nomicfoundation/ethereumjs-tx";
 import {
   AccessListEIP2930TxData,
   AccessListEIP2930ValuesArray,
   TxOptions,
-} from "@ignored/tx/dist/types";
-import { Address, arrToBufArr, bufferToInt } from "@ignored/util";
+} from "@nomicfoundation/ethereumjs-tx/dist/types";
+import {
+  Address,
+  arrToBufArr,
+  bufferToInt,
+} from "@nomicfoundation/ethereumjs-util";
 
 import {
   InternalError,

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

@@ -1,11 +1,15 @@
-import * as rlp from "@ignored/rlp";
-import { FeeMarketEIP1559Transaction } from "@ignored/tx";
+import * as rlp from "@nomicfoundation/ethereumjs-rlp";
+import { FeeMarketEIP1559Transaction } from "@nomicfoundation/ethereumjs-tx";
 import {
   FeeMarketEIP1559TxData,
   FeeMarketEIP1559ValuesArray,
   TxOptions,
-} from "@ignored/tx/dist/types";
-import { Address, arrToBufArr, bufferToInt } from "@ignored/util";
+} from "@nomicfoundation/ethereumjs-tx/dist/types";
+import {
+  Address,
+  arrToBufArr,
+  bufferToInt,
+} from "@nomicfoundation/ethereumjs-util";
 
 import {
   InternalError,

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

@@ -1,7 +1,7 @@
-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 { Common } from "@nomicfoundation/ethereumjs-common";
+import * as rlp from "@nomicfoundation/ethereumjs-rlp";
+import { Transaction, TxData, TxOptions } from "@nomicfoundation/ethereumjs-tx";
+import { Address, arrToBufArr } from "@nomicfoundation/ethereumjs-util";
 
 import {
   InternalError,

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

@@ -1,13 +1,16 @@
-import { Common } from "@ignored/common";
-import { FeeMarketEIP1559Transaction, TxOptions } from "@ignored/tx";
-import { Address } from "@ignored/util";
+import { Common } from "@nomicfoundation/ethereumjs-common";
+import {
+  FeeMarketEIP1559Transaction,
+  TxOptions,
+} from "@nomicfoundation/ethereumjs-tx";
+import { Address } from "@nomicfoundation/ethereumjs-util";
 
 import {
   FeeMarketEIP1559TxData,
   FeeMarketEIP1559ValuesArray,
-} from "@ignored/tx/src/types";
+} from "@nomicfoundation/ethereumjs-tx/src/types";
 import { InternalError } from "../../../core/providers/errors";
-import { BigIntUtils } from "../../../util/bigint";
+import * as BigIntUtils from "../../../util/bigint";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 

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

@@ -1,14 +1,14 @@
-import { Common } from "@ignored/common";
+import { Common } from "@nomicfoundation/ethereumjs-common";
 import {
   AccessListEIP2930Transaction,
   AccessListEIP2930TxData,
   AccessListEIP2930ValuesArray,
   TxOptions,
-} from "@ignored/tx";
-import { Address } from "@ignored/util";
+} from "@nomicfoundation/ethereumjs-tx";
+import { Address } from "@nomicfoundation/ethereumjs-util";
 
 import { InternalError } from "../../../core/providers/errors";
-import { BigIntUtils } from "../../../util/bigint";
+import * as BigIntUtils from "../../../util/bigint";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 

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

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

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

@@ -1,5 +1,5 @@
-import { Block } from "@ignored/block";
-import { BlockchainInterface } from "@ignored/blockchain";
+import { Block } from "@nomicfoundation/ethereumjs-block";
+import { BlockchainInterface } from "@nomicfoundation/ethereumjs-blockchain";
 
 import { FilterParams } from "../node-types";
 import { RpcLogOutput, RpcReceiptOutput } from "../output";

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

@@ -1,4 +1,9 @@
-import { Account, Address, privateToAddress, toBuffer } from "@ignored/util";
+import {
+  Account,
+  Address,
+  privateToAddress,
+  toBuffer,
+} from "@nomicfoundation/ethereumjs-util";
 
 import { GenesisAccount } from "../node-types";
 

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

@@ -1,4 +1,4 @@
-import { Common } from "@ignored/common";
+import { Common } from "@nomicfoundation/ethereumjs-common";
 
 import { LocalNodeConfig } from "../node-types";
 

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

@@ -1,12 +1,16 @@
-import { SecureTrie as Trie } from "@ignored/trie";
-import { Account, intToBuffer, setLengthLeft } from "@ignored/util";
+import { Trie } from "@nomicfoundation/ethereumjs-trie";
+import {
+  Account,
+  intToBuffer,
+  setLengthLeft,
+} from "@nomicfoundation/ethereumjs-util";
 
 import { GenesisAccount } from "../node-types";
 
 import { makeAccount } from "./makeAccount";
 
 export async function makeStateTrie(genesisAccounts: GenesisAccount[]) {
-  const stateTrie = new Trie();
+  const stateTrie = new Trie({ useKeyHashing: true });
 
   for (const acc of genesisAccounts) {
     const { address, account } = makeAccount(acc);

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

@@ -1,7 +1,7 @@
-import { Block, HeaderData } from "@ignored/block";
-import { Common } from "@ignored/common";
-import { SecureTrie } from "@ignored/trie";
-import { bufferToHex } from "@ignored/util";
+import { Block, HeaderData } from "@nomicfoundation/ethereumjs-block";
+import { Common } from "@nomicfoundation/ethereumjs-common";
+import { Trie } from "@nomicfoundation/ethereumjs-trie";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
 
 import { dateToTimestampSeconds } from "../../../util/date";
 import { hardforkGte, HardforkName } from "../../../util/hardforks";
@@ -13,7 +13,7 @@ export async function putGenesisBlock(
   blockchain: HardhatBlockchain,
   common: Common,
   { initialDate, blockGasLimit }: LocalNodeConfig,
-  stateTrie: SecureTrie,
+  stateTrie: Trie,
   hardfork: HardforkName,
   initialMixHash: Buffer,
   initialBaseFee?: bigint
@@ -31,7 +31,7 @@ export async function putGenesisBlock(
     difficulty: isPostMerge ? 0 : 1,
     nonce: isPostMerge ? "0x0000000000000000" : "0x0000000000000042",
     extraData: "0x1234",
-    stateRoot: bufferToHex(stateTrie.root),
+    stateRoot: bufferToHex(stateTrie.root()),
   };
 
   if (isPostMerge) {

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

@@ -1,29 +1,29 @@
-import type EthereumjsUtilT from "@ignored/util";
-import type EthereumCryptographyKeccakT from "ethereum-cryptography/keccak";
+import type EthereumjsUtilT from "@nomicfoundation/ethereumjs-util";
+import type * as UtilKeccakT from "../../../util/keccak";
 
 export class RandomBufferGenerator {
-  private constructor(private _nextValue: Uint8Array) {}
+  private constructor(private _nextValue: Buffer) {}
 
   public static create(seed: string): RandomBufferGenerator {
-    const { bufArrToArr } = require("@ignored/util") as typeof EthereumjsUtilT;
-    const { keccak256 } =
-      require("ethereum-cryptography/keccak") as typeof EthereumCryptographyKeccakT;
+    const { keccak256 } = require("../../../util/keccak") as typeof UtilKeccakT;
 
-    const nextValue = keccak256(bufArrToArr(Buffer.from(seed)));
+    const nextValue = keccak256(Buffer.from(seed));
 
     return new RandomBufferGenerator(nextValue);
   }
 
   public next(): Buffer {
-    const { arrToBufArr } = require("@ignored/util") as typeof EthereumjsUtilT;
-    const { keccak256 } =
-      require("ethereum-cryptography/keccak") as typeof EthereumCryptographyKeccakT;
+    const { keccak256 } = require("../../../util/keccak") as typeof UtilKeccakT;
 
     const valueToReturn = this._nextValue;
 
     this._nextValue = keccak256(this._nextValue);
 
-    return arrToBufArr(valueToReturn);
+    return valueToReturn;
+  }
+
+  public setNext(nextValue: Buffer) {
+    this._nextValue = Buffer.from(nextValue);
   }
 
   public clone(): RandomBufferGenerator {
@@ -32,7 +32,8 @@ export class RandomBufferGenerator {
 }
 
 export const randomHash = () => {
-  const { bufferToHex } = require("@ignored/util") as typeof EthereumjsUtilT;
+  const { bufferToHex } =
+    require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
   return bufferToHex(randomHashBuffer());
 };
 
@@ -42,12 +43,14 @@ export const randomHashBuffer = (): Buffer => {
 };
 
 export const randomAddress = () => {
-  const { Address } = require("@ignored/util") as typeof EthereumjsUtilT;
+  const { Address } =
+    require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
   return new Address(randomAddressBuffer());
 };
 
 export const randomAddressString = () => {
-  const { bufferToHex } = require("@ignored/util") as typeof EthereumjsUtilT;
+  const { bufferToHex } =
+    require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
   return bufferToHex(randomAddressBuffer());
 };
 

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

@@ -1,5 +1,5 @@
 import { InternalError } from "../../../core/providers/errors";
-import { BigIntUtils } from "../../../util/bigint";
+import * as BigIntUtils from "../../../util/bigint";
 import { SenderTransactions, SerializedTransaction } from "../PoolState";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */