hardhat 2.9.2 → 2.9.4

package/src/common/bigInt.ts

@@ -0,0 +1,106 @@
+import type { BigNumber as EthersBigNumberType } from "ethers";
+// eslint-disable-next-line import/no-extraneous-dependencies
+import type { BigNumber as BigNumberJsType } from "bignumber.js";
+// eslint-disable-next-line import/no-extraneous-dependencies
+import type { default as BNType } from "bn.js";
+
+import { HardhatError } from "../internal/core/errors";
+import { ERRORS } from "../internal/core/errors-list";
+
+export function normalizeToBigInt(
+  source:
+    | number
+    | bigint
+    | BNType
+    | EthersBigNumberType
+    | BigNumberJsType
+    | string
+): bigint {
+  switch (typeof source) {
+    case "object":
+      if (isBigNumber(source)) {
+        return BigInt(source.toString());
+      } else {
+        throw new HardhatError(ERRORS.GENERAL.INVALID_BIG_NUMBER, {
+          message: `Value ${JSON.stringify(
+            source
+          )} is of type "object" but is not an instanceof one of the known big number object types.`,
+        });
+      }
+    case "number":
+      if (!Number.isInteger(source)) {
+        throw new HardhatError(ERRORS.GENERAL.INVALID_BIG_NUMBER, {
+          message: `${source} is not an integer`,
+        });
+      }
+      if (!Number.isSafeInteger(source)) {
+        throw new HardhatError(ERRORS.GENERAL.INVALID_BIG_NUMBER, {
+          message: `Integer ${source} is unsafe. Consider using ${source}n instead. For more details, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isSafeInteger`,
+        });
+      }
+    // `break;` intentionally omitted. fallthrough desired.
+    case "string":
+    case "bigint":
+      return BigInt(source);
+    default:
+      const _exhaustiveCheck: never = source;
+      throw new HardhatError(ERRORS.GENERAL.INVALID_BIG_NUMBER, {
+        message: `Unsupported type ${typeof source}`,
+      });
+  }
+}
+
+export function isBigNumber(source: any): boolean {
+  return (
+    typeof source === "bigint" ||
+    isEthersBigNumber(source) ||
+    isBN(source) ||
+    isBigNumberJsBigNumber(source)
+  );
+}
+
+function isBN(n: any) {
+  try {
+    // eslint-disable-next-line import/no-extraneous-dependencies
+    const BN: typeof BNType = require("bn.js");
+    return BN.isBN(n);
+  } catch (e) {
+    return false;
+  }
+}
+
+function isEthersBigNumber(n: any) {
+  try {
+    const BigNumber: typeof EthersBigNumberType =
+      // eslint-disable-next-line import/no-extraneous-dependencies
+      require("ethers").ethers.BigNumber;
+    return BigNumber.isBigNumber(n);
+  } catch (e) {
+    return false;
+  }
+}
+
+function isBigNumberJsBigNumber(n: any) {
+  try {
+    // eslint-disable-next-line import/no-extraneous-dependencies
+    const BigNumber: typeof BigNumberJsType = require("bignumber.js").BigNumber;
+    return BigNumber.isBigNumber(n);
+  } catch (e) {
+    return false;
+  }
+}
+
+export function formatNumberType(
+  n: string | bigint | BNType | EthersBigNumberType | BigNumberJsType
+): string {
+  if (typeof n === "object") {
+    if (isBN(n)) {
+      return "BN";
+    } else if (isEthersBigNumber(n)) {
+      return "ethers.BigNumber";
+    } else if (isBigNumberJsBigNumber(n)) {
+      return "bignumber.js";
+    }
+  }
+  return typeof n;
+}

package/src/common/index.ts

@@ -0,0 +1,2 @@
+export * from "./bigInt";
+export { CustomError } from "../internal/core/errors";

package/src/internal/artifacts.ts

@@ -428,7 +428,7 @@ export class Artifacts implements IArtifacts {
     return paths.map((p) => this._getFullyQualifiedNameFromPath(p)).sort();
   }
 
-  private _formatSuggestions(names: string[], contractName?: string): string {
+  private _formatSuggestions(names: string[], contractName: string): string {
     switch (names.length) {
       case 0:
         return "";
@@ -456,7 +456,7 @@ Please replace "${contractName}" for the correct contract name wherever you are
 
     throw new HardhatError(ERRORS.ARTIFACTS.NOT_FOUND, {
       contractName: fullyQualifiedName,
-      suggestion: this._formatSuggestions(similarNames),
+      suggestion: this._formatSuggestions(similarNames, fullyQualifiedName),
     });
   }
 
@@ -501,6 +501,7 @@ Please replace "${contractName}" for the correct contract name wherever you are
   ): string[] {
     const outputNames = [];
     const groups = similarNames.reduce((obj, cur) => {
+      // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
       obj[cur] = obj[cur] ? obj[cur] + 1 : 1;
       return obj;
     }, {} as { [k: string]: number });

package/src/internal/cli/HelpPrinter.ts

@@ -112,11 +112,11 @@ export class HelpPrinter {
 
     for (const name of Object.keys(paramDefinitions).sort()) {
       const definition = paramDefinitions[name];
-      const { defaultValue, isFlag } = definition;
+      const { isFlag, isOptional } = definition;
 
       paramsList += " ";
 
-      if (defaultValue !== undefined) {
+      if (isOptional) {
         paramsList += "[";
       }
 
@@ -126,7 +126,7 @@ export class HelpPrinter {
         paramsList += ` ${this._getParamValueDescription(definition)}`;
       }
 
-      if (defaultValue !== undefined) {
+      if (isOptional) {
         paramsList += "]";
       }
     }
@@ -140,11 +140,11 @@ export class HelpPrinter {
     let paramsList = "";
 
     for (const definition of positionalParamDefinitions) {
-      const { defaultValue, isVariadic, name } = definition;
+      const { isOptional, isVariadic, name } = definition;
 
       paramsList += " ";
 
-      if (defaultValue !== undefined) {
+      if (isOptional) {
         paramsList += "[";
       }
 
@@ -154,7 +154,7 @@ export class HelpPrinter {
 
       paramsList += name;
 
-      if (defaultValue !== undefined) {
+      if (isOptional) {
         paramsList += "]";
       }
     }

package/src/internal/cli/analytics.ts

@@ -1,8 +1,9 @@
+import type { request as RequestT } from "undici";
+
 import AbortController from "abort-controller";
 import debug from "debug";
 import os from "os";
 import qs from "qs";
-import { request } from "undici";
 import { v4 as uuid } from "uuid";
 
 import * as builtinTaskNames from "../../builtin-tasks/task-names";
@@ -157,6 +158,8 @@ export class Analytics {
   }
 
   private _sendHit(hit: RawAnalytics): [AbortAnalytics, Promise<void>] {
+    const { request } = require("undici") as { request: typeof RequestT };
+
     log(`Sending hit for ${hit.dp}`);
 
     const controller = new AbortController();

package/src/internal/cli/cli.ts

@@ -94,6 +94,12 @@ async function main() {
 
     showStackTraces = hardhatArguments.showStackTraces;
 
+    // --version is a special case
+    if (hardhatArguments.version) {
+      await printVersionMessage(packageJson);
+      return;
+    }
+
     if (hardhatArguments.config === undefined && !isCwdInsideProject()) {
       if (
         process.stdout.isTTY === true ||
@@ -118,12 +124,6 @@ async function main() {
       }
     }
 
-    // --version is a special case
-    if (hardhatArguments.version) {
-      await printVersionMessage(packageJson);
-      return;
-    }
-
     if (!isHardhatInstalledLocallyOrLinked()) {
       throw new HardhatError(ERRORS.GENERAL.NON_LOCAL_INSTALLATION);
     }
@@ -139,10 +139,13 @@ async function main() {
 
     const ctx = HardhatContext.createHardhatContext();
 
-    const config = loadConfigAndTasks(hardhatArguments, {
-      showEmptyConfigWarning,
-      showSolidityConfigWarnings,
-    });
+    const { resolvedConfig, userConfig } = loadConfigAndTasks(
+      hardhatArguments,
+      {
+        showEmptyConfigWarning,
+        showSolidityConfigWarnings,
+      }
+    );
 
     let telemetryConsent: boolean | undefined = hasConsentedTelemetry();
 
@@ -162,7 +165,7 @@ async function main() {
 
     const analytics = await Analytics.getInstance(telemetryConsent);
 
-    Reporter.setConfigPath(config.paths.configFile);
+    Reporter.setConfigPath(resolvedConfig.paths.configFile);
     if (telemetryConsent === true) {
       Reporter.setEnabled(true);
     }
@@ -200,11 +203,12 @@ async function main() {
     }
 
     const env = new Environment(
-      config,
+      resolvedConfig,
       hardhatArguments,
       taskDefinitions,
       envExtenders,
-      ctx.experimentalHardhatNetworkMessageTraceHooks
+      ctx.experimentalHardhatNetworkMessageTraceHooks,
+      userConfig
     );
 
     ctx.setHardhatRuntimeEnvironment(env);

package/src/internal/cli/project-creation.ts

@@ -47,7 +47,7 @@ const BASIC_SAMPLE_PROJECT_DEPENDENCIES: Dependencies = {
 const ADVANCED_SAMPLE_PROJECT_DEPENDENCIES: Dependencies = {
   ...BASIC_SAMPLE_PROJECT_DEPENDENCIES,
   "@nomiclabs/hardhat-etherscan": "^3.0.0",
-  dotenv: "^10.0.0",
+  dotenv: "^16.0.0",
   eslint: "^7.29.0",
   "eslint-config-prettier": "^8.3.0",
   "eslint-config-standard": "^16.0.3",

package/src/internal/core/config/config-loading.ts

@@ -6,7 +6,11 @@ import fsExtra from "fs-extra";
 import path from "path";
 import semver from "semver";
 
-import { HardhatArguments, HardhatConfig } from "../../../types";
+import {
+  HardhatArguments,
+  HardhatConfig,
+  HardhatUserConfig,
+} from "../../../types";
 import { HardhatContext } from "../../context";
 import { SUPPORTED_SOLIDITY_VERSION_RANGE } from "../../hardhat-network/stack-traces/solidityTracer";
 import { findClosestPackageJson } from "../../util/packageInfo";
@@ -49,7 +53,7 @@ export function loadConfigAndTasks(
     showEmptyConfigWarning: false,
     showSolidityConfigWarnings: false,
   }
-): HardhatConfig {
+): { resolvedConfig: HardhatConfig; userConfig: HardhatUserConfig } {
   let configPath =
     hardhatArguments !== undefined ? hardhatArguments.config : undefined;
 
@@ -109,7 +113,7 @@ export function loadConfigAndTasks(
     checkUnsupportedRemappings(resolved);
   }
 
-  return resolved;
+  return { resolvedConfig: resolved, userConfig: frozenUserConfig };
 }
 
 function deepFreezeUserConfig(

package/src/internal/core/errors-list.ts

@@ -68,7 +68,7 @@ Please upgrade your version of Node.js and try again.`,
       number: 3,
       message: "%operation% is not supported in Hardhat.",
       title: "Unsupported operation",
-      description: `You are tying to perform an unsupported operation. 
+      description: `You are trying to perform an unsupported operation. 
 
 Unless you are creating a task or plugin, this is probably a bug. 
 
@@ -229,6 +229,14 @@ Either try using a new directory, or remove the files listed above.`,
 Either try using a new directory name, or remove the conflicting files.`,
       shouldBeReported: false,
     },
+    INVALID_BIG_NUMBER: {
+      number: 17,
+      message: "The input value cannot be normalized to a BigInt: %message%",
+      title: "Invalid big number",
+      description:
+        "Hardhat attempted to convert the input value to a BigInt, but no known conversion method was applicable to the given value.",
+      shouldBeReported: false,
+    },
   },
   NETWORK: {
     CONFIG_NOT_FOUND: {
@@ -655,7 +663,7 @@ Please double check how you invoked Hardhat or ran your task.`,
       number: 312,
       title: "Subtask run from the command line",
       message: "Trying to run the %name% subtask from the CLI",
-      description: `You tried to run an subtask from the command line.
+      description: `You tried to run a subtask from the command line.
       
 This is not supported. Please run the help task to see the available options.`,
       shouldBeReported: false,
@@ -722,7 +730,7 @@ You must always use slashes (/) in Solidity imports.`,
       title: "Invalid import: trying to use an unsupported protocol",
       description: `A Solidity file is trying to import a file using an unsupported protocol, like http.
       
-You can only import files thar are available locally or installed through npm.`,
+You can only import files that are available locally or installed through npm.`,
       shouldBeReported: false,
     },
     INVALID_IMPORT_ABSOLUTE_PATH: {

package/src/internal/core/providers/http.ts

@@ -1,5 +1,6 @@
+import type { Dispatcher, Pool as PoolT } from "undici";
+
 import { EventEmitter } from "events";
-import { Dispatcher, Pool } from "undici";
 
 import { EIP1193Provider, RequestArguments } from "../../../types";
 import {
@@ -44,6 +45,9 @@ export class HttpProvider extends EventEmitter implements EIP1193Provider {
     client: Dispatcher | undefined = undefined
   ) {
     super();
+
+    const { Pool } = require("undici") as { Pool: typeof PoolT };
+
     const url = new URL(this._url);
     this._path = url.pathname;
     this._authHeader =
@@ -171,7 +175,7 @@ export class HttpProvider extends EventEmitter implements EIP1193Provider {
             : this._timeout,
         headers: {
           "Content-Type": "application/json",
-          "User-Agent": `hardhat ${hardhatVersion}`,
+          "User-Agent": `hardhat ${hardhatVersion ?? "(unknown version)"}`,
           Authorization: this._authHeader,
           ...this._extraHeaders,
         },

package/src/internal/core/runtime-environment.ts

@@ -7,6 +7,7 @@ import {
   HardhatArguments,
   HardhatConfig,
   HardhatRuntimeEnvironment,
+  HardhatUserConfig,
   Network,
   ParamDefinition,
   RunSuperFunction,
@@ -56,7 +57,8 @@ export class Environment implements HardhatRuntimeEnvironment {
     public readonly hardhatArguments: HardhatArguments,
     public readonly tasks: TasksMap,
     extenders: EnvironmentExtender[] = [],
-    experimentalHardhatNetworkMessageTraceHooks: ExperimentalHardhatNetworkMessageTraceHook[] = []
+    experimentalHardhatNetworkMessageTraceHooks: ExperimentalHardhatNetworkMessageTraceHook[] = [],
+    public readonly userConfig: HardhatUserConfig = {}
   ) {
     log("Creating HardhatRuntimeEnvironment");
 

package/src/internal/hardhat-network/jsonrpc/handler.ts

@@ -235,10 +235,16 @@ const _readWsRequest = (msg: string): JsonRpcRequest => {
 };
 
 const _handleError = (error: any): JsonRpcResponse => {
+  // extract the relevant fields from the error before wrapping it
   let txHash: string | undefined;
+  let returnData: string | undefined;
+
   if (error.transactionHash !== undefined) {
     txHash = error.transactionHash;
   }
+  if (error.data !== undefined) {
+    returnData = error.data;
+  }
 
   // In case of non-hardhat error, treat it as internal and associate the appropriate error code.
   if (!ProviderError.isProviderError(error)) {
@@ -254,10 +260,16 @@ const _handleError = (error: any): JsonRpcResponse => {
     },
   };
 
+  response.error.data = {
+    message: error.message,
+  };
+
   if (txHash !== undefined) {
-    response.error.data = {
-      txHash,
-    };
+    response.error.data.txHash = txHash;
+  }
+
+  if (returnData !== undefined) {
+    response.error.data.data = returnData;
   }
 
   return response;

package/src/internal/hardhat-network/jsonrpc/server.ts

@@ -1,9 +1,9 @@
+import type { Client as ClientT } from "undici";
 import type WsT from "ws";
 
 import debug from "debug";
 import http, { Server } from "http";
 import { AddressInfo } from "net";
-import { Client } from "undici";
 
 import {
   EIP1193Provider,
@@ -44,6 +44,7 @@ export class JsonRpcServer implements IJsonRpcServer {
   }
 
   public getProvider = (name = "json-rpc"): EIP1193Provider => {
+    const { Client } = require("undici") as { Client: typeof ClientT };
     const { address, port } = this._httpServer.address() as AddressInfo;
 
     const dispatcher = new Client(`http://${address}:${port}/`, {

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

@@ -86,14 +86,16 @@ export abstract class BlockchainBase {
     count: BN,
     interval: BN,
     previousBlockStateRoot: Buffer,
-    previousBlockTotalDifficulty: BN
+    previousBlockTotalDifficulty: BN,
+    previousBlockBaseFeePerGas: BN | undefined
   ) {
     this._data.reserveBlocks(
       this.getLatestBlockNumber().addn(1),
       count,
       interval,
       previousBlockStateRoot,
-      previousBlockTotalDifficulty
+      previousBlockTotalDifficulty,
+      previousBlockBaseFeePerGas
     );
   }
 

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

@@ -15,6 +15,7 @@ interface Reservation {
   interval: BN;
   previousBlockStateRoot: Buffer;
   previousBlockTotalDifficulty: BN;
+  previousBlockBaseFeePerGas: BN | undefined;
 }
 
 export class BlockchainData {
@@ -33,7 +34,8 @@ export class BlockchainData {
     count: BN,
     interval: BN,
     previousBlockStateRoot: Buffer,
-    previousBlockTotalDifficulty: BN
+    previousBlockTotalDifficulty: BN,
+    previousBlockBaseFeePerGas: BN | undefined
   ) {
     const reservation: Reservation = {
       first,
@@ -41,6 +43,7 @@ export class BlockchainData {
       interval,
       previousBlockStateRoot,
       previousBlockTotalDifficulty,
+      previousBlockBaseFeePerGas,
     };
     this._blockReservations.push(reservation);
   }
@@ -188,7 +191,7 @@ export class BlockchainData {
     const reservationIndex = this._findBlockReservation(blockNumber);
     assertHardhatInvariant(
       reservationIndex !== -1,
-      `No reservation to fill for block number ${blockNumber}`
+      `No reservation to fill for block number ${blockNumber.toString()}`
     );
 
     // capture the timestamp before removing the reservation:
@@ -217,6 +220,7 @@ export class BlockchainData {
           header: {
             number: blockNumber,
             stateRoot: oldReservation.previousBlockStateRoot,
+            baseFeePerGas: oldReservation.previousBlockBaseFeePerGas,
             timestamp,
           },
         },

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

@@ -36,13 +36,15 @@ export class HardhatBlockchain
     count: BN,
     interval: BN,
     previousBlockStateRoot: Buffer,
-    previousBlockTotalDifficulty: BN
+    previousBlockTotalDifficulty: BN,
+    previousBlockBaseFeePerGas: BN | undefined
   ) {
     super.reserveBlocks(
       count,
       interval,
       previousBlockStateRoot,
-      previousBlockTotalDifficulty
+      previousBlockTotalDifficulty,
+      previousBlockBaseFeePerGas
     );
     this._length = this._length + count.toNumber();
   }

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

@@ -62,7 +62,9 @@ function getOrderedTransactionHeap(
       );
     default:
       // eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
-      throw new InvalidInputError(`Invalid mempool order: ${mempoolOrder}`);
+      throw new InvalidInputError(
+        `Invalid mempool order: ${mempoolOrder as any}`
+      );
   }
 }
 

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

@@ -445,7 +445,7 @@ export class TxPool {
 
     if (txMaxUpfrontCost.gt(senderBalance)) {
       throw new InvalidInputError(
-        `sender doesn't have enough funds to send tx. The max upfront cost is: ${txMaxUpfrontCost}` +
+        `sender doesn't have enough funds to send tx. The max upfront cost is: ${txMaxUpfrontCost.toString()}` +
           ` and the sender's account only has: ${senderBalance.toString()}`
       );
     }
@@ -461,7 +461,7 @@ export class TxPool {
 
     if (gasLimit.lt(baseFee)) {
       throw new InvalidInputError(
-        `Transaction requires at least ${baseFee} gas but got ${gasLimit}`
+        `Transaction requires at least ${baseFee.toString()} gas but got ${gasLimit.toString()}`
       );
     }
 
@@ -469,7 +469,7 @@ export class TxPool {
 
     if (gasLimit.gt(blockGasLimit)) {
       throw new InvalidInputError(
-        `Transaction gas limit is ${gasLimit} and exceeds block gas limit of ${blockGasLimit}`
+        `Transaction gas limit is ${gasLimit.toString()} and exceeds block gas limit of ${blockGasLimit.toString()}`
       );
     }
   }

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

@@ -97,13 +97,15 @@ export class ForkBlockchain
     count: BN,
     interval: BN,
     previousBlockStateRoot: Buffer,
-    previousBlockTotalDifficulty: BN
+    previousBlockTotalDifficulty: BN,
+    previousBlockBaseFeePerGas: BN | undefined
   ) {
     super.reserveBlocks(
       count,
       interval,
       previousBlockStateRoot,
-      previousBlockTotalDifficulty
+      previousBlockTotalDifficulty,
+      previousBlockBaseFeePerGas
     );
     this._latestBlockNumber = this._latestBlockNumber.add(count);
   }
@@ -293,7 +295,9 @@ export class ForkBlockchain
           rpcToTxData(transaction) as FeeMarketEIP1559TxData
         );
       } else {
-        throw new InternalError(`Unknown transaction type ${transaction.type}`);
+        throw new InternalError(
+          `Unknown transaction type ${transaction.type.toString()}`
+        );
       }
 
       block.transactions.push(tx);