Skip to content

Commit 3fb0925

Browse files
committed
chore: remove enableRip7212 from EDR config
This was needed in the past but is no longer required. Resolves #6182.
1 parent a3d397d commit 3fb0925

File tree

6 files changed

+1
-42
lines changed

6 files changed

+1
-42
lines changed

v-next/hardhat/src/internal/builtin-plugins/network-manager/config-resolution.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ export function resolveEdrNetwork(
8686
networkConfig.allowUnlimitedContractSize ?? false,
8787
blockGasLimit: BigInt(networkConfig.blockGasLimit ?? 30_000_000n),
8888
coinbase: resolveCoinbase(networkConfig.coinbase),
89-
enableRip7212: networkConfig.enableRip7212 ?? false,
9089
enableTransientStorage: networkConfig.enableTransientStorage ?? false,
9190
forking: resolveForkingConfig(
9291
networkConfig.forking,

v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030
opHardforkFromString,
3131
l1GenesisState,
3232
l1HardforkFromString,
33-
precompileP256Verify,
3433
} from "@ignored/edr-optimism";
3534
import {
3635
assertHardhatInvariant,
@@ -491,8 +490,6 @@ async function getProviderConfig(
491490
codeCoverage: coverageConfig,
492491
},
493492
ownedAccounts: ownedAccounts.map((account) => account.secretKey),
494-
precompileOverrides: networkConfig.enableRip7212
495-
? [precompileP256Verify()]
496-
: [],
493+
precompileOverrides: [],
497494
};
498495
}

v-next/hardhat/src/internal/builtin-plugins/network-manager/type-extensions/config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ declare module "../../../../types/config.js" {
108108
allowUnlimitedContractSize?: boolean;
109109
blockGasLimit?: number | bigint;
110110
coinbase?: string;
111-
enableRip7212?: boolean;
112111
enableTransientStorage?: boolean;
113112
forking?: EdrNetworkForkingUserConfig;
114113
hardfork?: string;
@@ -249,7 +248,6 @@ declare module "../../../../types/config.js" {
249248
allowUnlimitedContractSize: boolean;
250249
blockGasLimit: bigint;
251250
coinbase: Uint8Array;
252-
enableRip7212: boolean;
253251
enableTransientStorage: boolean;
254252
forking?: EdrNetworkForkingConfig;
255253
hardfork: string;

v-next/hardhat/src/internal/builtin-plugins/network-manager/type-validation.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ const edrNetworkUserConfigSchema = z.object({
304304
allowUnlimitedContractSize: z.optional(z.boolean()),
305305
blockGasLimit: z.optional(gasUnitUserConfigSchema),
306306
coinbase: z.optional(z.string()),
307-
enableRip7212: z.optional(z.boolean()),
308307
enableTransientStorage: z.optional(z.boolean()),
309308
forking: z.optional(edrNetworkForkingUserConfigSchema),
310309
hardfork: z.optional(z.string()),

v-next/hardhat/test/internal/builtin-plugins/network-manager/config-resolution.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ describe("config-resolution", () => {
123123
allowBlocksWithSameTimestamp: true,
124124
allowUnlimitedContractSize: true,
125125
blockGasLimit: 20_000_000,
126-
enableRip7212: true,
127126
enableTransientStorage: true,
128127
initialDate: new Date(),
129128
loggingEnabled: true,
@@ -158,7 +157,6 @@ describe("config-resolution", () => {
158157
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- cast for testing
159158
BigInt(userConfig.blockGasLimit as number),
160159
);
161-
assert.equal(edrNetworkConfig.enableRip7212, userConfig.enableRip7212);
162160
assert.equal(
163161
edrNetworkConfig.enableTransientStorage,
164162
userConfig.enableTransientStorage,
@@ -202,7 +200,6 @@ describe("config-resolution", () => {
202200
assert.equal(edrNetworkConfig.allowBlocksWithSameTimestamp, false);
203201
assert.equal(edrNetworkConfig.allowUnlimitedContractSize, false);
204202
assert.equal(edrNetworkConfig.blockGasLimit, 30_000_000n);
205-
assert.equal(edrNetworkConfig.enableRip7212, false);
206203
assert.equal(edrNetworkConfig.enableTransientStorage, false);
207204
const initialDate = new Date(edrNetworkConfig.initialDate);
208205
assert.ok(

v-next/hardhat/test/internal/builtin-plugins/network-manager/network-manager.ts

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,37 +1878,6 @@ describe("NetworkManagerImplementation", () => {
18781878
});
18791879
});
18801880

1881-
describe("enableRip7212", () => {
1882-
describe("edr config", () => {
1883-
it("should validate a valid network config", async () => {
1884-
let validationErrors = await validateNetworkUserConfig(
1885-
edrConfig({ enableRip7212: true }),
1886-
);
1887-
1888-
assertValidationErrors(validationErrors, []);
1889-
1890-
validationErrors = await validateNetworkUserConfig(
1891-
edrConfig({ enableRip7212: false }),
1892-
);
1893-
1894-
assertValidationErrors(validationErrors, []);
1895-
});
1896-
1897-
it("should not validate an invalid network config", async () => {
1898-
const validationErrors = await validateNetworkUserConfig(
1899-
edrConfig({ enableRip7212: "incorrect" }),
1900-
);
1901-
1902-
assertValidationErrors(validationErrors, [
1903-
{
1904-
path: ["networks", "hardhat", "enableRip7212"],
1905-
message: "Expected boolean, received string",
1906-
},
1907-
]);
1908-
});
1909-
});
1910-
});
1911-
19121881
describe("enableTransientStorage", () => {
19131882
describe("edr config", () => {
19141883
it("should validate a valid network config", async () => {

0 commit comments

Comments
 (0)