chore: Bump hardhat to 2.22.7 (#571)

* chore: Bump hardhat to 2.22.7 * fixup: Don't enable RIP-7212 in our tests * Adapt for NomicFoundation/hardhat#5411
NomicFoundation · Jul 31, 2024 · 37e2737 · 37e2737
1 parent 0bba027
commit 37e2737
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 56 deletions.
diff --git a/crates/tools/js/benchmark/package.json b/crates/tools/js/benchmark/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "argparse": "^2.0.1",
     "chai": "^4.2.0",
-    "hardhat": "2.22.6",
+    "hardhat": "2.22.7",
     "lodash": "^4.17.11",
     "mocha": "^10.0.0",
     "tsx": "^4.7.1"

diff --git a/hardhat-tests/integration/smock/package.json b/hardhat-tests/integration/smock/package.json
@@ -12,7 +12,7 @@
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "chai": "^4.3.6",
     "ethers": "5",
-    "hardhat": "2.22.6",
+    "hardhat": "2.22.7",
     "mocha": "^10.0.0"
   }
 }
diff --git a/hardhat-tests/package.json b/hardhat-tests/package.json
@@ -54,7 +54,7 @@
     "ethereumjs-abi": "^0.6.8",
     "ethers": "^6.1.0",
     "fs-extra": "^7.0.1",
-    "hardhat": "2.22.6",
+    "hardhat": "2.22.7",
     "mocha": "^10.0.0",
     "prettier": "2.4.1",
     "rimraf": "^3.0.2",

diff --git a/hardhat-tests/test/internal/hardhat-network/helpers/useProvider.ts b/hardhat-tests/test/internal/hardhat-network/helpers/useProvider.ts
@@ -101,6 +101,7 @@ export function useProvider({
         coinbase,
         allowBlocksWithSameTimestamp,
         enableTransientStorage: false,
+        enableRip7212: false,
       },
       {
         enabled: loggerEnabled,

diff --git a/hardhat-tests/test/internal/hardhat-network/provider/modules/debug/traceTransaction.ts b/hardhat-tests/test/internal/hardhat-network/provider/modules/debug/traceTransaction.ts
@@ -257,6 +257,7 @@ describe("Debug module", function () {
           forkCachePath: FORK_TESTS_CACHE_PATH,
           allowBlocksWithSameTimestamp: false,
           enableTransientStorage: false,
+          enableRip7212: false,
         },
         {
           enabled: false,
@@ -382,6 +383,7 @@ describe("Debug module", function () {
           forkCachePath: FORK_TESTS_CACHE_PATH,
           allowBlocksWithSameTimestamp: false,
           enableTransientStorage: false,
+          enableRip7212: false,
         },
         {
           enabled: false,

diff --git a/hardhat-tests/test/internal/hardhat-network/stack-traces/execution.ts b/hardhat-tests/test/internal/hardhat-network/stack-traces/execution.ts
@@ -53,6 +53,7 @@ export async function instantiateProvider(
     coinbase: "0x0000000000000000000000000000000000000000",
     initialBaseFeePerGas: 0,
     enableTransientStorage: false,
+    enableRip7212: false,
   };
 
   const provider = await EdrProviderWrapper.create(

diff --git a/hardhat-tests/test/internal/hardhat-network/stack-traces/test.ts b/hardhat-tests/test/internal/hardhat-network/stack-traces/test.ts
@@ -6,7 +6,7 @@ import { EdrProviderWrapper } from "hardhat/internal/hardhat-network/provider/pr
 import { ReturnData } from "hardhat/internal/hardhat-network/provider/return-data";
 import {
   ConsoleLogs,
-  consoleLogToString,
+  ConsoleLogger,
 } from "hardhat/internal/hardhat-network/stack-traces/consoleLogger";
 import {
   printMessageTrace,
@@ -93,7 +93,7 @@ interface DeploymentTransaction {
   };
   stackTrace?: StackFrameDescription[]; // No stack trace === the tx MUST be successful
   imports?: string[]; // Imports needed for successful compilation
-  consoleLogs?: ConsoleLogs[];
+  consoleLogs?: ConsoleLogs;
   gas?: number;
 }
 
@@ -108,7 +108,7 @@ interface CallTransaction {
   // The second one is with function and parms
   function?: string; // Default: no data
   params?: Array<string | number>; // Default: no param
-  consoleLogs?: ConsoleLogs[];
+  consoleLogs?: ConsoleLogs;
   gas?: number;
 }
 
@@ -437,7 +437,7 @@ function compareStackTraces(
   assert.lengthOf(trace, description.length);
 }
 
-function compareConsoleLogs(logs: string[], expectedLogs?: ConsoleLogs[]) {
+function compareConsoleLogs(logs: string[], expectedLogs?: ConsoleLogs) {
   if (expectedLogs === undefined) {
     return;
   }
@@ -446,7 +446,7 @@ function compareConsoleLogs(logs: string[], expectedLogs?: ConsoleLogs[]) {
 
   for (let i = 0; i < logs.length; i++) {
     const actual = logs[i];
-    const expected = consoleLogToString(expectedLogs[i]);
+    const expected = ConsoleLogger.format(expectedLogs[i]);
 
     assert.equal(actual, expected);
   }

diff --git a/package.json b/package.json
@@ -16,9 +16,6 @@
   "pnpm": {
     "overrides": {
       "hardhat>@nomicfoundation/edr": "workspace:*"
-    },
-    "patchedDependencies": {
-      "[email protected]": "patches/[email protected]"
     }
   },
   "engines": {

diff --git a/patches/[email protected] b/patches/[email protected]
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml