hardhat 2.11.0-dev.0 → 2.11.0

package/src/internal/hardhat-network/stack-traces/consoleLogger.ts

@@ -3,7 +3,7 @@ import {
   bufferToHex,
   bufferToInt,
   fromSigned,
-} from "@ignored/util";
+} from "@nomicfoundation/ethereumjs-util";
 import util from "util";
 
 import {

package/src/internal/hardhat-network/stack-traces/constants.ts

@@ -0,0 +1,2 @@
+export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.16";
+export const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";

package/src/internal/hardhat-network/stack-traces/contracts-identifier.ts

@@ -1,4 +1,4 @@
-import { bufferToHex } from "@ignored/util";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
 
 import {
   normalizeLibraryRuntimeBytecodeIfNecessary,

package/src/internal/hardhat-network/stack-traces/debug.ts

@@ -1,4 +1,4 @@
-import { bufferToHex } from "@ignored/util";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
 
 import {
   CallMessageTrace,

package/src/internal/hardhat-network/stack-traces/error-inferrer.ts

@@ -1,4 +1,4 @@
-import { ERROR } from "@ignored/evm/dist/exceptions";
+import { ERROR } from "@nomicfoundation/ethereumjs-evm/dist/exceptions";
 import { defaultAbiCoder as abi } from "@ethersproject/abi";
 import semver from "semver";
 
@@ -492,7 +492,7 @@ export class ErrorInferrer {
     // if the error comes from a call to a zero-initialized function,
     // we remove the last frame, which represents the call, to avoid
     // having duplicated frames
-    if (errorCode === 0x51) {
+    if (errorCode === 0x51n) {
       stacktrace.splice(-1);
     }
 
@@ -1125,7 +1125,7 @@ export class ErrorInferrer {
   private _instructionWithinFunctionToPanicStackTraceEntry(
     trace: DecodedEvmMessageTrace,
     inst: Instruction,
-    errorCode: number
+    errorCode: bigint
   ): PanicErrorStackTraceEntry {
     return {
       type: StackTraceEntryType.PANIC_ERROR,

package/src/internal/hardhat-network/stack-traces/message-trace.ts

@@ -1,4 +1,4 @@
-import type { EvmError } from "@ignored/evm";
+import type { EvmError } from "@nomicfoundation/ethereumjs-evm";
 
 import type { Bytecode } from "./model";
 

package/src/internal/hardhat-network/stack-traces/model.ts

@@ -1,4 +1,4 @@
-import { bufferToHex } from "@ignored/util";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
 
 import { AbiHelpers } from "../../util/abi-helpers";
 

package/src/internal/hardhat-network/stack-traces/panic-errors.ts

@@ -1,4 +1,4 @@
-export function panicErrorCodeToMessage(errorCode: number): string {
+export function panicErrorCodeToMessage(errorCode: bigint): string {
   const reason = panicErrorCodeToReason(errorCode);
 
   if (reason !== undefined) {
@@ -8,25 +8,25 @@ export function panicErrorCodeToMessage(errorCode: number): string {
   return `reverted with unknown panic code 0x${errorCode.toString(16)}`;
 }
 
-function panicErrorCodeToReason(errorCode: number): string | undefined {
+function panicErrorCodeToReason(errorCode: bigint): string | undefined {
   switch (errorCode) {
-    case 0x1:
+    case 0x1n:
       return "Assertion error";
-    case 0x11:
+    case 0x11n:
       return "Arithmetic operation underflowed or overflowed outside of an unchecked block";
-    case 0x12:
+    case 0x12n:
       return "Division or modulo division by zero";
-    case 0x21:
+    case 0x21n:
       return "Tried to convert a value into an enum, but the value was too big or negative";
-    case 0x22:
+    case 0x22n:
       return "Incorrectly encoded storage byte array";
-    case 0x31:
+    case 0x31n:
       return ".pop() was called on an empty array";
-    case 0x32:
+    case 0x32n:
       return "Array accessed at an out-of-bounds or negative index";
-    case 0x41:
+    case 0x41n:
       return "Too much memory was allocated, or an array was created that is too large";
-    case 0x51:
+    case 0x51n:
       return "Called a zero-initialized variable of internal function type";
   }
 }

package/src/internal/hardhat-network/stack-traces/solidity-errors.ts

@@ -1,4 +1,4 @@
-import { bufferToHex } from "@ignored/util";
+import { bufferToHex } from "@nomicfoundation/ethereumjs-util";
 
 import { panicErrorCodeToMessage } from "./panic-errors";
 import {

package/src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts

@@ -80,7 +80,7 @@ export interface RevertErrorStackTraceEntry {
 
 export interface PanicErrorStackTraceEntry {
   type: StackTraceEntryType.PANIC_ERROR;
-  errorCode: number;
+  errorCode: bigint;
   sourceReference: SourceReference;
 }
 

package/src/internal/hardhat-network/stack-traces/solidityTracer.ts

@@ -1,4 +1,4 @@
-import { ERROR } from "@ignored/evm/dist/exceptions";
+import { ERROR } from "@nomicfoundation/ethereumjs-evm/dist/exceptions";
 import { ReturnData } from "../provider/return-data";
 
 import {
@@ -32,9 +32,6 @@ import {
   StackTraceEntryType,
 } from "./solidity-stack-trace";
 
-export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.16";
-export const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
-
 export class SolidityTracer {
   private _errorInferrer = new ErrorInferrer();
 

package/src/internal/hardhat-network/stack-traces/vm-debug-tracer.ts

@@ -1,20 +1,20 @@
-import { TypedTransaction } from "@ignored/tx";
-import { AfterTxEvent, VM } from "@ignored/vm";
-import { EVM, EVMResult } from "@ignored/evm";
-import { InterpreterStep } from "@ignored/evm/dist/interpreter";
-import { Message } from "@ignored/evm/dist/message";
+import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
+import { AfterTxEvent, VM } from "@nomicfoundation/ethereumjs-vm";
+import { EVMResult } from "@nomicfoundation/ethereumjs-evm";
+import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm/dist/interpreter";
+import { Message } from "@nomicfoundation/ethereumjs-evm/dist/message";
 import {
   Address,
   bufferToBigInt,
   setLengthLeft,
   toBuffer,
-} from "@ignored/util";
+} from "@nomicfoundation/ethereumjs-util";
 
 import { assertHardhatInvariant } from "../../core/errors";
 import { RpcDebugTracingConfig } from "../../core/jsonrpc/types/input/debugTraceTransaction";
 import { InvalidInputError } from "../../core/providers/errors";
 import { RpcDebugTraceOutput, RpcStructLog } from "../provider/output";
-import { BigIntUtils } from "../../util/bigint";
+import * as BigIntUtils from "../../util/bigint";
 
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 
@@ -90,26 +90,40 @@ export class VMDebugTracer {
   }
 
   private _enableTracing(config: RpcDebugTracingConfig) {
-    this._vm.on("beforeTx", this._beforeTxHandler);
-    (this._vm.evm as EVM).on("beforeMessage", this._beforeMessageHandler);
-    (this._vm.evm as EVM).on("step", this._stepHandler);
-    (this._vm.evm as EVM).on("afterMessage", this._afterMessageHandler);
-    this._vm.on("afterTx", this._afterTxHandler);
+    assertHardhatInvariant(
+      this._vm.evm.events !== undefined,
+      "EVM should have an 'events' property"
+    );
+
+    this._vm.events.on("beforeTx", this._beforeTxHandler);
+
+    this._vm.evm.events.on("beforeMessage", this._beforeMessageHandler);
+    this._vm.evm.events.on("step", this._stepHandler);
+    this._vm.evm.events.on("afterMessage", this._afterMessageHandler);
+
+    this._vm.events.on("afterTx", this._afterTxHandler);
+
     this._config = config;
   }
 
   private _disableTracing() {
-    this._vm.removeListener("beforeTx", this._beforeTxHandler);
-    (this._vm.evm as EVM).removeListener(
+    assertHardhatInvariant(
+      this._vm.evm.events !== undefined,
+      "EVM should have an 'events' property"
+    );
+
+    this._vm.events.removeListener("beforeTx", this._beforeTxHandler);
+
+    this._vm.evm.events.removeListener(
       "beforeMessage",
       this._beforeMessageHandler
     );
-    (this._vm.evm as EVM).removeListener("step", this._stepHandler);
-    (this._vm.evm as EVM).removeListener(
+    this._vm.evm.events.removeListener("step", this._stepHandler);
+    this._vm.evm.events.removeListener(
       "afterMessage",
       this._afterMessageHandler
     );
-    this._vm.removeListener("afterTx", this._afterTxHandler);
+    this._vm.events.removeListener("afterTx", this._afterTxHandler);
     this._config = undefined;
   }
 

package/src/internal/hardhat-network/stack-traces/vm-tracer.ts

@@ -1,8 +1,12 @@
-import { EVM, EVMResult, getActivePrecompiles } from "@ignored/evm";
-import { InterpreterStep } from "@ignored/evm/dist/interpreter";
-import { Message } from "@ignored/evm/dist/message";
-import { Address, bufferToBigInt } from "@ignored/util";
-import { VM } from "@ignored/vm";
+import {
+  EVMResult,
+  getActivePrecompiles,
+} from "@nomicfoundation/ethereumjs-evm";
+import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm/dist/interpreter";
+import { Message } from "@nomicfoundation/ethereumjs-evm/dist/message";
+import { Address, bufferToBigInt } from "@nomicfoundation/ethereumjs-util";
+import { VM } from "@nomicfoundation/ethereumjs-vm";
+import { assertHardhatInvariant } from "../../core/errors";
 
 import {
   CallMessageTrace,
@@ -38,9 +42,14 @@ export class VMTracer {
     if (this._enabled) {
       return;
     }
-    (this._vm.evm as EVM).on("beforeMessage", this._beforeMessageHandler);
-    (this._vm.evm as EVM).on("step", this._stepHandler);
-    (this._vm.evm as EVM).on("afterMessage", this._afterMessageHandler);
+    assertHardhatInvariant(
+      this._vm.evm.events !== undefined,
+      "EVM should have an 'events' property"
+    );
+
+    this._vm.evm.events.on("beforeMessage", this._beforeMessageHandler);
+    this._vm.evm.events.on("step", this._stepHandler);
+    this._vm.evm.events.on("afterMessage", this._afterMessageHandler);
     this._enabled = true;
   }
 
@@ -48,12 +57,18 @@ export class VMTracer {
     if (!this._enabled) {
       return;
     }
-    (this._vm.evm as EVM).removeListener(
+
+    assertHardhatInvariant(
+      this._vm.evm.events !== undefined,
+      "EVM should have an 'events' property"
+    );
+
+    this._vm.evm.events.removeListener(
       "beforeMessage",
       this._beforeMessageHandler
     );
-    (this._vm.evm as EVM).removeListener("step", this._stepHandler);
-    (this._vm.evm as EVM).removeListener(
+    this._vm.evm.events.removeListener("step", this._stepHandler);
+    this._vm.evm.events.removeListener(
       "afterMessage",
       this._afterMessageHandler
     );
@@ -111,11 +126,11 @@ export class VMTracer {
 
         trace = createTrace;
       } else {
-        const toAsNumber = bufferToBigInt(message.to.toBuffer());
+        const toAsBigInt = bufferToBigInt(message.to.toBuffer());
 
-        if (toAsNumber > 0 && toAsNumber <= this._maxPrecompileNumber) {
+        if (toAsBigInt > 0 && toAsBigInt <= this._maxPrecompileNumber) {
           const precompileTrace: PrecompileMessageTrace = {
-            precompile: Number(toAsNumber),
+            precompile: Number(toAsBigInt),
             calldata: message.data,
             value: message.value,
             returnData: DUMMY_RETURN_DATA,

package/src/internal/lib/hardhat-lib.ts

@@ -8,13 +8,10 @@ import { ERRORS } from "../core/errors-list";
 import { getEnvHardhatArguments } from "../core/params/env-variables";
 import { HARDHAT_PARAM_DEFINITIONS } from "../core/params/hardhat-params";
 import { Environment } from "../core/runtime-environment";
-import { applyWorkaround } from "../util/antlr-prototype-pollution-workaround";
 
 let ctx: HardhatContext;
 let env: HardhatRuntimeEnvironment;
 
-applyWorkaround();
-
 if (HardhatContext.isCreated()) {
   ctx = HardhatContext.getHardhatContext();
 

package/src/internal/solidity/compilation-job.ts

@@ -17,7 +17,7 @@ import { ResolvedFile } from "./resolver";
 const log = debug("hardhat:core:compilation-job");
 
 // this should have a proper version range when it's fixed
-const SOLC_BUG_9573_VERSIONS = "*";
+const SOLC_BUG_9573_VERSIONS = "<0.8.0";
 
 function isCompilationJobCreationError(
   x:
@@ -55,7 +55,8 @@ export class CompilationJob implements taskTypes.CompilationJob {
   }
 
   public merge(job: taskTypes.CompilationJob): CompilationJob {
-    const { isEqual }: LoDashStatic = require("lodash");
+    const isEqual = require("lodash/isEqual") as LoDashStatic["isEqual"];
+
     assertHardhatInvariant(
       isEqual(this.solidityConfig, job.getSolcConfig()),
       "Merging jobs with different solidity configurations"
@@ -103,8 +104,6 @@ function mergeCompilationJobs(
   jobs: taskTypes.CompilationJob[],
   isMergeable: (job: taskTypes.CompilationJob) => boolean
 ): taskTypes.CompilationJob[] {
-  const { flatten }: LoDashStatic = require("lodash");
-
   const jobsMap: Map<SolcConfig, taskTypes.CompilationJob[]> = new Map();
 
   for (const job of jobs) {
@@ -130,7 +129,8 @@ function mergeCompilationJobs(
     }
   }
 
-  return flatten([...jobsMap.values()]);
+  // Array#flat This method defaults to depth limit 1
+  return [...jobsMap.values()].flat(1_000_000);
 }
 
 /**
@@ -234,15 +234,15 @@ function getCompilerConfigForFile(
   transitiveDependencies: taskTypes.TransitiveDependency[],
   solidityConfig: SolidityConfig
 ): SolcConfig | CompilationJobCreationError {
-  const { uniq }: LoDashStatic = require("lodash");
-
   const transitiveDependenciesVersionPragmas = transitiveDependencies.map(
     ({ dependency }) => dependency.content.versionPragmas
   );
-  const versionRange = uniq([
-    ...file.content.versionPragmas,
-    ...transitiveDependenciesVersionPragmas,
-  ]).join(" ");
+  const versionRange = Array.from(
+    new Set([
+      ...file.content.versionPragmas,
+      ...transitiveDependenciesVersionPragmas,
+    ])
+  ).join(" ");
 
   const overrides = solidityConfig.overrides ?? {};