hardhat 2.9.3 → 2.9.4

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);

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

@@ -365,6 +365,9 @@ export class EthModule {
     await this._runHardhatNetworkMessageTraceHooks(trace, true);
 
     if (error !== undefined && this._throwOnCallFailures) {
+      const callReturnData = trace?.returnData.toString("hex") ?? "";
+      (error as any).data = `0x${callReturnData}`;
+
       throw error;
     }
 
@@ -438,6 +441,9 @@ export class EthModule {
         error
       );
 
+      const callReturnData = trace?.returnData.toString("hex") ?? "";
+      (error as any).data = `0x${callReturnData}`;
+
       throw error;
     }
 
@@ -979,8 +985,9 @@ export class EthModule {
         }
 
         if (error.message.includes("The chain ID does not match")) {
+          const chainId = this._common.chainIdBN().toString();
           throw new InvalidArgumentsError(
-            `Trying to send a raw transaction with an invalid chainId. The expected chainId is ${this._common.chainIdBN()}`,
+            `Trying to send a raw transaction with an invalid chainId. The expected chainId is ${chainId}`,
             error
           );
         }
@@ -1015,7 +1022,7 @@ export class EthModule {
       !transactionRequest.chainId.eq(expectedChainId)
     ) {
       throw new InvalidArgumentsError(
-        `Invalid chainId ${transactionRequest.chainId.toString()} provided, expected ${expectedChainId} instead.`
+        `Invalid chainId ${transactionRequest.chainId.toString()} provided, expected ${expectedChainId.toString()} instead.`
       );
     }
 
@@ -1512,12 +1519,13 @@ export class EthModule {
       result = [result];
     }
 
-    try {
-      await this._handleMineBlockResults(result, tx);
-    } catch (e) {
-      // This is a temporary solution until we improve our internal errors
-      // We need this to be able to return the transaction hash in the JSON-RPC
-      // response when the transaction fails
+    const trace = await this._handleMineBlockResults(result, tx);
+
+    if (trace.error !== undefined && this._throwOnTransactionFailures) {
+      const e = trace.error;
+
+      const returnData = trace.trace?.returnData.toString("hex") ?? "";
+      (e as any).data = `0x${returnData}`;
       (e as any).transactionHash = bufferToRpcData(tx.hash());
 
       throw e;
@@ -1526,10 +1534,13 @@ export class EthModule {
     return bufferToRpcData(tx.hash());
   }
 
+  /**
+   * Returns the trace of the sent tx
+   */
   private async _handleMineBlockResults(
     results: MineBlockResult[],
     sentTx: TypedTransaction
-  ) {
+  ): Promise<GatherTracesResult> {
     const singleTransactionMined =
       results.length === 1 && results[0].block.transactions.length === 1;
 
@@ -1540,10 +1551,7 @@ export class EthModule {
       const trace = results[0].traces[0];
       await this._logSingleTransaction(tx, block, txGasUsed, trace);
 
-      const txError = trace.error;
-      if (txError !== undefined && this._throwOnTransactionFailures) {
-        throw txError;
-      }
+      return trace;
     } else {
       // this happens when automine is enabled, a tx is sent, and there are
       // pending txs in the mempool
@@ -1575,10 +1583,7 @@ export class EthModule {
         );
       }
 
-      const sentTxError = sentTxTrace.error;
-      if (sentTxError !== undefined && this._throwOnTransactionFailures) {
-        throw sentTxError;
-      }
+      return sentTxTrace;
     }
   }
 

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

@@ -90,7 +90,7 @@ export class EvmModule {
     );
     if (increment.lte(new BN(0))) {
       throw new InvalidInputError(
-        `Timestamp ${timestamp} is lower than or equal to previous block's timestamp` +
+        `Timestamp ${timestamp.toString()} is lower than or equal to previous block's timestamp` +
           ` ${new BN(latestBlock.header.timestamp).toNumber()}`
       );
     }
@@ -132,7 +132,7 @@ export class EvmModule {
       );
       if (increment.lte(new BN(0))) {
         throw new InvalidInputError(
-          `Timestamp ${timestamp} is lower than previous block's timestamp` +
+          `Timestamp ${timestamp.toString()} is lower than previous block's timestamp` +
             ` ${new BN(latestBlock.header.timestamp).toNumber()}`
         );
       }

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

@@ -331,7 +331,9 @@ export class ModulesLogger {
     if (isEmpty) {
       this._log(
         `Mined empty block #${blockNumber}${
-          baseFeePerGas !== undefined ? ` with base fee ${baseFeePerGas}` : ""
+          baseFeePerGas !== undefined
+            ? ` with base fee ${baseFeePerGas.toString()}`
+            : ""
         }`
       );
 
@@ -365,7 +367,7 @@ export class ModulesLogger {
 
   private _logBaseFeePerGas(block: Block) {
     if (block.header.baseFeePerGas !== undefined) {
-      this._log(`Base fee: ${block.header.baseFeePerGas}`);
+      this._log(`Base fee: ${block.header.baseFeePerGas.toString()}`);
     }
   }
 
@@ -413,7 +415,9 @@ export class ModulesLogger {
       if (isEmpty) {
         this._print(
           `Mined empty block #${blockNumber}${
-            baseFeePerGas !== undefined ? ` with base fee ${baseFeePerGas}` : ""
+            baseFeePerGas !== undefined
+              ? ` with base fee ${baseFeePerGas.toString()}`
+              : ""
           }`,
           {
             collapseIntervalMinedBlock: true,
@@ -441,7 +445,9 @@ export class ModulesLogger {
 
         this._log(
           `Mined empty block #${blockNumber}${
-            baseFeePerGas !== undefined ? ` with base fee ${baseFeePerGas}` : ""
+            baseFeePerGas !== undefined
+              ? ` with base fee ${baseFeePerGas.toString()}`
+              : ""
           }`,
           {
             collapseHardhatMinedBlock: true,

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

@@ -563,7 +563,8 @@ Hardhat Network's forking functionality only works with blocks from at least spu
       remainingBlockCount.subn(1),
       interval,
       await this._stateManager.getStateRoot(),
-      await this.getBlockTotalDifficulty(latestBlock)
+      await this.getBlockTotalDifficulty(latestBlock),
+      (await this.getLatestBlock()).header.baseFeePerGas
     );
 
     await mineBlock();
@@ -1031,7 +1032,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
     this.setNextBlockTimestamp(snapshot.nextBlockTimestamp);
     this._txPool.revert(snapshot.txPoolSnapshotId);
 
-    if (snapshot.userProvidedNextBlockBaseFeePerGas) {
+    if (snapshot.userProvidedNextBlockBaseFeePerGas !== undefined) {
       this.setUserProvidedNextBlockBaseFeePerGas(
         snapshot.userProvidedNextBlockBaseFeePerGas
       );
@@ -1675,7 +1676,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
     const nextPendingNonce = await this._txPool.getNextPendingNonce(sender);
     const txNonce = new BN(tx.nonce);
 
-    const expectedNonceMsg = `Expected nonce to be ${nextPendingNonce} but got ${txNonce}.`;
+    const expectedNonceMsg = `Expected nonce to be ${nextPendingNonce.toString()} but got ${txNonce.toString()}.`;
     if (txNonce.gt(nextPendingNonce)) {
       throw new InvalidInputError(
         `Nonce too high. ${expectedNonceMsg} Note that transactions can't be queued when automining.`
@@ -1691,7 +1692,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
     );
     if (txPriorityFee.lt(this._minGasPrice)) {
       throw new InvalidInputError(
-        `Transaction gas price is ${txPriorityFee}, which is below the minimum of ${this._minGasPrice}`
+        `Transaction gas price is ${txPriorityFee.toString()}, which is below the minimum of ${this._minGasPrice.toString()}`
       );
     }
 
@@ -1701,13 +1702,13 @@ Hardhat Network's forking functionality only works with blocks from at least spu
       if ("maxFeePerGas" in tx) {
         if (nextBlockGasFee.gt(tx.maxFeePerGas)) {
           throw new InvalidInputError(
-            `Transaction maxFeePerGas (${tx.maxFeePerGas}) is too low for the next block, which has a baseFeePerGas of ${nextBlockGasFee}`
+            `Transaction maxFeePerGas (${tx.maxFeePerGas.toString()}) is too low for the next block, which has a baseFeePerGas of ${nextBlockGasFee.toString()}`
           );
         }
       } else {
         if (nextBlockGasFee.gt(tx.gasPrice)) {
           throw new InvalidInputError(
-            `Transaction gasPrice (${tx.gasPrice}) is too low for the next block, which has a baseFeePerGas of ${nextBlockGasFee}`
+            `Transaction gasPrice (${tx.gasPrice.toString()}) is too low for the next block, which has a baseFeePerGas of ${nextBlockGasFee.toString()}`
           );
         }
       }
@@ -2125,7 +2126,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
     if (block === undefined) {
       // TODO handle this better
       throw new Error(
-        `Block with number ${blockNumberOrPending} doesn't exist. This should never happen.`
+        `Block with number ${blockNumberOrPending.toString()} doesn't exist. This should never happen.`
       );
     }
 
@@ -2545,7 +2546,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
     );
     if (hardfork === undefined || blockNumber.ltn(activationBlock)) {
       throw new InternalError(
-        `Could not find a hardfork to run for block ${blockNumber}, after having looked for one in the HardhatNode's hardfork activation history, which was: ${JSON.stringify(
+        `Could not find a hardfork to run for block ${blockNumber.toString()}, after having looked for one in the HardhatNode's hardfork activation history, which was: ${JSON.stringify(
           hardforkHistory
         )}. For more information, see https://hardhat.org/hardhat-network/reference/#config`
       );

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

@@ -186,7 +186,7 @@ export function getRpcBlock(
     uncles: block.uncleHeaders.map((uh: any) => bufferToRpcData(uh.hash())),
   };
 
-  if (block.header.baseFeePerGas) {
+  if (block.header.baseFeePerGas !== undefined) {
     output.baseFeePerGas = numberToRpcQuantity(block.header.baseFeePerGas);
   }
 

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

@@ -11,7 +11,8 @@ export interface HardhatBlockchainInterface extends BlockchainInterface {
     count: BN,
     interval: BN,
     previousBlockStateRoot: Buffer,
-    previousBlockTotalDifficulty: BN
+    previousBlockTotalDifficulty: BN,
+    previousBlockBaseFeePerGas: BN | undefined
   ): void;
   deleteLaterBlocks(block: Block): void;
   getBlockByTransactionHash(transactionHash: Buffer): Promise<Block | null>;

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

@@ -223,16 +223,6 @@ export class VMDebugTracer {
           ...structLog.storage,
         };
 
-        // sometimes the memSize has the correct value
-        // for the memory length, in those cases we increase
-        // the memory to reflect this
-        if (structLog.memSize > structLog.memory.length) {
-          const wordsToAdd = structLog.memSize - structLog.memory.length;
-          for (let k = 0; k < wordsToAdd; k++) {
-            structLog.memory.push(EMPTY_MEMORY_WORD);
-          }
-        }
-
         if (i === 0) {
           continue;
         }
@@ -411,7 +401,7 @@ export class VMDebugTracer {
       gasCost = constantGas + dynamicGas;
     } else if (step.opcode.name === "CALLCODE") {
       // finding an existing tx that uses CALLCODE or compiling a contract
-      // so that it uses tihs opcode is hard,
+      // so that it uses this opcode is hard,
       // so we just throw
       throw new InvalidInputError(
         "Transactions that use CALLCODE are not supported by Hardhat's debug_traceTransaction"

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

@@ -153,7 +153,9 @@ export async function createCompilationJobsFromConnectedComponent(
 
     if (isCompilationJobCreationError(compilationJobOrError)) {
       log(
-        `'${file.absolutePath}' couldn't be compiled. Reason: '${compilationJobOrError}'`
+        `'${file.absolutePath}' couldn't be compiled. Reason: '${
+          compilationJobOrError as any
+        }'`
       );
       errors.push(compilationJobOrError);
       continue;

package/src/internal/util/download.ts

@@ -47,7 +47,7 @@ export async function download(
     maxRedirections: 10,
     method: "GET",
     headers: {
-      "User-Agent": `hardhat ${hardhatVersion}`,
+      "User-Agent": `hardhat ${hardhatVersion ?? "(unknown version)"}`,
     },
   });
 

package/src/internal/util/lazy.ts

@@ -1,4 +1,4 @@
-import util from "util";
+import util, { InspectOptions } from "util";
 
 import { HardhatError } from "../core/errors";
 import { ERRORS } from "../core/errors-list";
@@ -36,9 +36,17 @@ export function lazyObject<T extends object>(objectCreator: () => T): T {
   return createLazyProxy(
     objectCreator,
     (getRealTarget) => ({
-      [inspect]() {
+      [inspect](
+        depth: number,
+        options: InspectOptions,
+        inspectFn: (
+          object: any,
+          options: InspectOptions
+        ) => string = util.inspect
+      ) {
         const realTarget = getRealTarget();
-        return util.inspect(realTarget);
+        const newOptions = { ...options, depth };
+        return inspectFn(realTarget, newOptions);
       },
     }),
     (object) => {
@@ -64,9 +72,17 @@ export function lazyFunction<T extends Function>(functionCreator: () => T): T {
     (getRealTarget) => {
       function dummyTarget() {}
 
-      (dummyTarget as any)[inspect] = function () {
+      (dummyTarget as any)[inspect] = function (
+        depth: number,
+        options: InspectOptions,
+        inspectFn: (
+          object: any,
+          options: InspectOptions
+        ) => string = util.inspect
+      ) {
         const realTarget = getRealTarget();
-        return util.inspect(realTarget);
+        const newOptions = { ...options, depth };
+        return inspectFn(realTarget, newOptions);
       };
 
       return dummyTarget;

package/src/internal/util/wei-values.ts

@@ -20,7 +20,7 @@ export function weiToHumanReadableString(wei: BN | number): string {
   }
 
   if (wei.lt(new BN(10).pow(new BN(5)))) {
-    return `${wei} wei`;
+    return `${wei.toString()} wei`;
   }
 
   if (wei.lt(new BN(10).pow(new BN(14)))) {

package/src/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../../config/typescript/tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../",
-    "rootDirs": ["."],
-    "composite": true
-  },
-  "include": ["./**/*.ts"],
-  "exclude": []
-}