hardhat 2.20.0 → 2.21.0-dev.0

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

@@ -1,3 +1,5 @@
+import type { MessageTrace } from "../hardhat-network/stack-traces/message-trace";
+
 import debug from "debug";
 
 import {
@@ -20,7 +22,6 @@ import {
   ScopesMap,
 } from "../../types";
 import { Artifacts } from "../artifacts";
-import { MessageTrace } from "../hardhat-network/stack-traces/message-trace";
 
 import { getHardhatVersion } from "../util/packageInfo";
 import { analyzeModuleNotFoundError } from "./config/config-loading";

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

@@ -23,8 +23,7 @@ import { rpcTransactionReceipt } from "../../core/jsonrpc/types/output/receipt";
 import { rpcTransaction } from "../../core/jsonrpc/types/output/transaction";
 import { HttpProvider } from "../../core/providers/http";
 import { createNonCryptographicHashBasedIdentifier } from "../../util/hash";
-import { nullable, optional } from "../../util/io-ts";
-import { FeeHistory } from "../provider/node-types";
+import { nullable } from "../../util/io-ts";
 
 export class JsonRpcClient {
   private _cache: Map<string, any> = new Map();
@@ -225,32 +224,6 @@ export class JsonRpcClient {
     };
   }
 
-  // This is part of a temporary fix to https://github.com/NomicFoundation/hardhat/issues/2380
-  // This method caches each request instead of caching each block's fee info individually, which is not ideal
-  public async getFeeHistory(
-    blockCount: bigint,
-    newestBlock: bigint | "pending",
-    rewardPercentiles: number[]
-  ): Promise<FeeHistory> {
-    return this._perform(
-      "eth_feeHistory",
-      [
-        numberToRpcQuantity(blockCount),
-        newestBlock === "pending"
-          ? "pending"
-          : numberToRpcQuantity(newestBlock),
-        rewardPercentiles,
-      ],
-      t.type({
-        oldestBlock: rpcQuantity,
-        baseFeePerGas: t.array(rpcQuantity),
-        gasUsedRatio: t.array(t.number),
-        reward: optional(t.array(t.array(rpcQuantity))),
-      }),
-      (res) => res.oldestBlock + BigInt(res.baseFeePerGas.length)
-    );
-  }
-
   public async getLatestBlockNumber(): Promise<bigint> {
     return this._perform(
       "eth_blockNumber",

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

@@ -246,7 +246,15 @@ const _handleError = (error: any): JsonRpcResponse => {
     txHash = error.transactionHash;
   }
   if (error.data !== undefined) {
-    returnData = error.data;
+    if (error.data?.data !== undefined) {
+      returnData = error.data.data;
+    } else {
+      returnData = error.data;
+    }
+
+    if (txHash === undefined && error.data?.transactionHash !== undefined) {
+      txHash = error.data.transactionHash;
+    }
   }
 
   // In case of non-hardhat error, treat it as internal and associate the appropriate error code.