Skip to content

Commit 37e2737

Browse files
authored
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
1 parent 0bba027 commit 37e2737

File tree

10 files changed

+34
-56
lines changed

10 files changed

+34
-56
lines changed

crates/tools/js/benchmark/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"devDependencies": {
1919
"argparse": "^2.0.1",
2020
"chai": "^4.2.0",
21-
"hardhat": "2.22.6",
21+
"hardhat": "2.22.7",
2222
"lodash": "^4.17.11",
2323
"mocha": "^10.0.0",
2424
"tsx": "^4.7.1"

hardhat-tests/integration/smock/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@nomiclabs/hardhat-ethers": "^2.2.3",
1313
"chai": "^4.3.6",
1414
"ethers": "5",
15-
"hardhat": "2.22.6",
15+
"hardhat": "2.22.7",
1616
"mocha": "^10.0.0"
1717
}
1818
}

hardhat-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"ethereumjs-abi": "^0.6.8",
5555
"ethers": "^6.1.0",
5656
"fs-extra": "^7.0.1",
57-
"hardhat": "2.22.6",
57+
"hardhat": "2.22.7",
5858
"mocha": "^10.0.0",
5959
"prettier": "2.4.1",
6060
"rimraf": "^3.0.2",

hardhat-tests/test/internal/hardhat-network/helpers/useProvider.ts

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export function useProvider({
101101
coinbase,
102102
allowBlocksWithSameTimestamp,
103103
enableTransientStorage: false,
104+
enableRip7212: false,
104105
},
105106
{
106107
enabled: loggerEnabled,

hardhat-tests/test/internal/hardhat-network/provider/modules/debug/traceTransaction.ts

+2
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ describe("Debug module", function () {
257257
forkCachePath: FORK_TESTS_CACHE_PATH,
258258
allowBlocksWithSameTimestamp: false,
259259
enableTransientStorage: false,
260+
enableRip7212: false,
260261
},
261262
{
262263
enabled: false,
@@ -382,6 +383,7 @@ describe("Debug module", function () {
382383
forkCachePath: FORK_TESTS_CACHE_PATH,
383384
allowBlocksWithSameTimestamp: false,
384385
enableTransientStorage: false,
386+
enableRip7212: false,
385387
},
386388
{
387389
enabled: false,

hardhat-tests/test/internal/hardhat-network/stack-traces/execution.ts

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export async function instantiateProvider(
5353
coinbase: "0x0000000000000000000000000000000000000000",
5454
initialBaseFeePerGas: 0,
5555
enableTransientStorage: false,
56+
enableRip7212: false,
5657
};
5758

5859
const provider = await EdrProviderWrapper.create(

hardhat-tests/test/internal/hardhat-network/stack-traces/test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { EdrProviderWrapper } from "hardhat/internal/hardhat-network/provider/pr
66
import { ReturnData } from "hardhat/internal/hardhat-network/provider/return-data";
77
import {
88
ConsoleLogs,
9-
consoleLogToString,
9+
ConsoleLogger,
1010
} from "hardhat/internal/hardhat-network/stack-traces/consoleLogger";
1111
import {
1212
printMessageTrace,
@@ -93,7 +93,7 @@ interface DeploymentTransaction {
9393
};
9494
stackTrace?: StackFrameDescription[]; // No stack trace === the tx MUST be successful
9595
imports?: string[]; // Imports needed for successful compilation
96-
consoleLogs?: ConsoleLogs[];
96+
consoleLogs?: ConsoleLogs;
9797
gas?: number;
9898
}
9999

@@ -108,7 +108,7 @@ interface CallTransaction {
108108
// The second one is with function and parms
109109
function?: string; // Default: no data
110110
params?: Array<string | number>; // Default: no param
111-
consoleLogs?: ConsoleLogs[];
111+
consoleLogs?: ConsoleLogs;
112112
gas?: number;
113113
}
114114

@@ -437,7 +437,7 @@ function compareStackTraces(
437437
assert.lengthOf(trace, description.length);
438438
}
439439

440-
function compareConsoleLogs(logs: string[], expectedLogs?: ConsoleLogs[]) {
440+
function compareConsoleLogs(logs: string[], expectedLogs?: ConsoleLogs) {
441441
if (expectedLogs === undefined) {
442442
return;
443443
}
@@ -446,7 +446,7 @@ function compareConsoleLogs(logs: string[], expectedLogs?: ConsoleLogs[]) {
446446

447447
for (let i = 0; i < logs.length; i++) {
448448
const actual = logs[i];
449-
const expected = consoleLogToString(expectedLogs[i]);
449+
const expected = ConsoleLogger.format(expectedLogs[i]);
450450

451451
assert.equal(actual, expected);
452452
}

package.json

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
"pnpm": {
1717
"overrides": {
1818
"hardhat>@nomicfoundation/edr": "workspace:*"
19-
},
20-
"patchedDependencies": {
21-
2219
}
2320
},
2421
"engines": {

patches/[email protected]

-24
This file was deleted.

pnpm-lock.yaml

+22-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)