hardhat 3.0.0-next.4 → 3.0.0-next.6

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # hardhat
 
+## 3.0.0-next.6
+
+### Patch Changes
+
+- 49b0ff8: Relax validations for transaction signing introduced in the previous version by disabling strict mode in `Transaction.prepare` ([#6644](https://github.com/NomicFoundation/hardhat/pull/6644))
+- 8896353: Replace "Contract reverted without a reason string" message with a more detailed failure reason in solidity tests ([#6647](https://github.com/NomicFoundation/hardhat/issues/6647))
+- ca95b8f: Fix supporting different solc versions for libs and contracts in linker
+- ca95b8f: Fuzz and invariant Solidity testing improvements, notably:
+  - Significant performance improvements
+  - Support for afterInvariant function
+  - Support for linked artifacts in get*Code cheatcodes
+  - Various bug fixes
+
+## 3.0.0-next.5
+
+### Patch Changes
+
+- bfb708c: Fix HHE411 with improved error message ([#6604](https://github.com/NomicFoundation/hardhat/pull/6604))
+- 84b625c: Improve internal error handling for nodejs errors ([#5605](https://github.com/NomicFoundation/hardhat/issues/5605))
+- deaaffc: Display skipped and empty `describe` blocks correctly ([#5905](https://github.com/NomicFoundation/hardhat/issues/5905))
+- 43418a0: Replace telemetry consent prompt with a task through which telemetry can be explicitly enabled/disabled ([#6573](https://github.com/NomicFoundation/hardhat/pull/6573))
+- 3f55677: Support chainId values above 2^32 - 1 for local account transactions ([#6603](https://github.com/NomicFoundation/hardhat/issues/6603))
+- 0579708: Upgrade edr-optimism to 0.10.0-alpha.1 and make the hardforks dependent on the chain type ([#6609](https://github.com/NomicFoundation/hardhat/pull/6609))
+
 ## 3.0.0-next.4
 
 ### Patch Changes

package/dist/src/internal/builtin-plugins/coverage/index.d.ts

@@ -1,4 +1,5 @@
 import type { HardhatPlugin } from "../../../types/plugins.js";
+import "./type-extensions.js";
 declare const hardhatPlugin: HardhatPlugin;
 export default hardhatPlugin;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/internal/builtin-plugins/coverage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/coverage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D,QAAA,MAAM,aAAa,EAAE,aAQpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/coverage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,aAYpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/src/internal/builtin-plugins/coverage/index.js

@@ -1,12 +1,18 @@
-import { task } from "../../core/config.js";
+import { ArgumentType } from "../../../types/arguments.js";
+import { globalOption } from "../../core/config.js";
+import "./type-extensions.js";
 const hardhatPlugin = {
     id: "builtin:coverage",
-    tasks: [
-        task("coverage")
-            .setDescription("Not implemented yet - to be available soon")
-            .setAction(import.meta.resolve("./task-action.js"))
-            .build(),
+    tasks: [],
+    globalOptions: [
+        globalOption({
+            name: "coverage",
+            description: "Enables code coverage",
+            type: ArgumentType.BOOLEAN,
+            defaultValue: false,
+        }),
     ],
+    npmPackage: "hardhat",
 };
 export default hardhatPlugin;
 //# sourceMappingURL=index.js.map

package/dist/src/internal/builtin-plugins/coverage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/coverage/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,kBAAkB;IACtB,KAAK,EAAE;QACL,IAAI,CAAC,UAAU,CAAC;aACb,cAAc,CAAC,4CAA4C,CAAC;aAC5D,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;aAClD,KAAK,EAAE;KACX;CACF,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/coverage/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,kBAAkB;IACtB,KAAK,EAAE,EAAE;IACT,aAAa,EAAE;QACb,YAAY,CAAC;YACX,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,uBAAuB;YACpC,IAAI,EAAE,YAAY,CAAC,OAAO;YAC1B,YAAY,EAAE,KAAK;SACpB,CAAC;KACH;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/src/internal/builtin-plugins/coverage/type-extensions.d.ts

@@ -0,0 +1,7 @@
+import "../../../types/global-options.js";
+declare module "../../../types/global-options.js" {
+    interface GlobalOptions {
+        coverage: boolean;
+    }
+}
+//# sourceMappingURL=type-extensions.d.ts.map

package/dist/src/internal/builtin-plugins/coverage/type-extensions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/coverage/type-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAiB,aAAa;QAC5B,QAAQ,EAAE,OAAO,CAAC;KACnB;CACF"}

package/dist/src/internal/builtin-plugins/coverage/type-extensions.js

@@ -0,0 +1,2 @@
+import "../../../types/global-options.js";
+//# sourceMappingURL=type-extensions.js.map

package/dist/src/internal/builtin-plugins/coverage/type-extensions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-extensions.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/coverage/type-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC"}

package/dist/src/internal/builtin-plugins/index.d.ts

@@ -11,5 +11,6 @@ export type * from "./node/index.js";
 export type * from "./flatten/index.js";
 export type * from "./coverage/index.js";
 export type * from "./verify/index.js";
+export type * from "./telemetry/index.js";
 export declare const builtinPlugins: HardhatPlugin[];
 //# sourceMappingURL=index.d.ts.map

package/dist/src/internal/builtin-plugins/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/internal/builtin-plugins/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAiB5D,mBAAmB,sBAAsB,CAAC;AAC1C,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,0BAA0B,CAAC;AAC9C,mBAAmB,4BAA4B,CAAC;AAChD,mBAAmB,kBAAkB,CAAC;AACtC,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,gBAAgB,CAAC;AACpC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,mBAAmB,CAAC;AAIvC,eAAO,MAAM,cAAc,EAAE,aAAa,EAazC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/internal/builtin-plugins/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAkB5D,mBAAmB,sBAAsB,CAAC;AAC1C,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,0BAA0B,CAAC;AAC9C,mBAAmB,4BAA4B,CAAC;AAChD,mBAAmB,kBAAkB,CAAC;AACtC,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,gBAAgB,CAAC;AACpC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,sBAAsB,CAAC;AAI1C,eAAO,MAAM,cAAc,EAAE,aAAa,EAczC,CAAC"}

package/dist/src/internal/builtin-plugins/index.js

@@ -8,6 +8,7 @@ import node from "./node/index.js";
 import run from "./run/index.js";
 import solidity from "./solidity/index.js";
 import solidityTest from "./solidity-test/index.js";
+import telemetry from "./telemetry/index.js";
 import test from "./test/index.js";
 import verify from "./verify/index.js";
 // This array should be kept in order, respecting the dependencies between the
@@ -25,5 +26,6 @@ export const builtinPlugins = [
     flatten,
     coverage,
     verify,
+    telemetry,
 ];
 //# sourceMappingURL=index.js.map

package/dist/src/internal/builtin-plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/internal/builtin-plugins/index.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAiBvC,8EAA8E;AAC9E,WAAW;AACX,MAAM,CAAC,MAAM,cAAc,GAAoB;IAC7C,SAAS;IACT,QAAQ;IACR,IAAI;IACJ,YAAY;IACZ,cAAc;IACd,KAAK;IACL,OAAO;IACP,GAAG;IACH,IAAI;IACJ,OAAO;IACP,QAAQ;IACR,MAAM;CACP,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/internal/builtin-plugins/index.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAkBvC,8EAA8E;AAC9E,WAAW;AACX,MAAM,CAAC,MAAM,cAAc,GAAoB;IAC7C,SAAS;IACT,QAAQ;IACR,IAAI;IACJ,YAAY;IACZ,cAAc;IACd,KAAK;IACL,OAAO;IACP,GAAG;IACH,IAAI;IACJ,OAAO;IACP,QAAQ;IACR,MAAM;IACN,SAAS;CACV,CAAC"}

package/dist/src/internal/builtin-plugins/network-manager/base-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-provider.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/base-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,6BAA6B,CAAC;AAErC,OAAO,YAAY,MAAM,aAAa,CAAC;AAKvC,8BAAsB,YACpB,SAAQ,YACR,YAAW,gBAAgB;aAEX,OAAO,CACrB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;aAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAE/B,IAAI,CACT,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAIxC,SAAS,CACd,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,eAAe,KAAK,IAAI,GAC/D,IAAI;CA2CR"}
+{"version":3,"file":"base-provider.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/base-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,6BAA6B,CAAC;AAErC,OAAO,YAAY,MAAM,aAAa,CAAC;AAKvC,8BAAsB,YACpB,SAAQ,YACR,YAAW,gBAAgB;aAEX,OAAO,CACrB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;aAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAE/B,IAAI,CACT,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAIxC,SAAS,CACd,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,eAAe,KAAK,IAAI,GAC/D,IAAI;CAsCR"}

package/dist/src/internal/builtin-plugins/network-manager/base-provider.js

@@ -1,6 +1,6 @@
 import EventEmitter from "node:events";
 import util from "node:util";
-import { ensureError } from "@nomicfoundation/hardhat-utils/error";
+import { ensureNodeErrnoExceptionError } from "@nomicfoundation/hardhat-utils/error";
 export class BaseProvider extends EventEmitter {
     send(method, params) {
         return this.request({ method, params });
@@ -20,10 +20,7 @@ export class BaseProvider extends EventEmitter {
                 };
             }
             catch (error) {
-                ensureError(error);
-                if (!("code" in error) || error.code === undefined) {
-                    throw error;
-                }
+                ensureNodeErrnoExceptionError(error);
                 /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                 -- Allow string interpolation of unknown `error.code`. It will be converted
                 to a number, and we will handle NaN cases appropriately afterwards. */

package/dist/src/internal/builtin-plugins/network-manager/base-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-provider.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/base-provider.ts"],"names":[],"mappings":"AAQA,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,MAAM,OAAgB,YACpB,SAAQ,YAAY;IAQb,IAAI,CACT,MAAc,EACd,MAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEM,SAAS,CACd,cAA8B,EAC9B,QAAgE;QAEhE,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;YACtC,IAAI,eAAgC,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;oBAChC,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,MAAM,EAAE,cAAc,CAAC,MAAM;iBAC9B,CAAC,CAAC;gBACH,eAAe,GAAG;oBAChB,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,cAAc,CAAC,EAAE;oBACrB,MAAM;iBACP,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,WAAW,CAAC,KAAK,CAAC,CAAC;gBAEnB,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACnD,MAAM,KAAK,CAAC;gBACd,CAAC;gBAED;;sFAEsE;gBACtE,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChD,eAAe,GAAG;oBAChB,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,cAAc,CAAC,EAAE;oBACrB,KAAK,EAAE;wBACL,IAAI,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;wBACxC,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,IAAI,EAAE;4BACJ,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,IAAI,EAAE,KAAK,CAAC,IAAI;yBACjB;qBACF;iBACF,CAAC;YACJ,CAAC;YAED,OAAO,eAAe,CAAC;QACzB,CAAC,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;CACF"}
+{"version":3,"file":"base-provider.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/base-provider.ts"],"names":[],"mappings":"AAQA,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAErF,MAAM,OAAgB,YACpB,SAAQ,YAAY;IAQb,IAAI,CACT,MAAc,EACd,MAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEM,SAAS,CACd,cAA8B,EAC9B,QAAgE;QAEhE,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;YACtC,IAAI,eAAgC,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;oBAChC,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,MAAM,EAAE,cAAc,CAAC,MAAM;iBAC9B,CAAC,CAAC;gBACH,eAAe,GAAG;oBAChB,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,cAAc,CAAC,EAAE;oBACrB,MAAM;iBACP,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,6BAA6B,CAAC,KAAK,CAAC,CAAC;gBACrC;;sFAEsE;gBACtE,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChD,eAAe,GAAG;oBAChB,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,cAAc,CAAC,EAAE;oBACrB,KAAK,EAAE;wBACL,IAAI,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;wBACxC,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,IAAI,EAAE;4BACJ,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,IAAI,EAAE,KAAK,CAAC,IAAI;yBACjB;qBACF;iBACF,CAAC;YACJ,CAAC;YAED,OAAO,eAAe,CAAC;QACzB,CAAC,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;CACF"}

package/dist/src/internal/builtin-plugins/network-manager/config-resolution.d.ts

@@ -1,4 +1,5 @@
 import type { ConfigurationVariableResolver, EdrNetworkAccountsConfig, EdrNetworkAccountsUserConfig, EdrNetworkChainsConfig, EdrNetworkChainsUserConfig, EdrNetworkConfig, EdrNetworkForkingConfig, EdrNetworkForkingUserConfig, EdrNetworkMiningConfig, EdrNetworkMiningUserConfig, EdrNetworkUserConfig, GasConfig, GasUserConfig, HttpNetworkAccountsConfig, HttpNetworkAccountsUserConfig, HttpNetworkConfig, HttpNetworkUserConfig } from "../../../types/config.js";
+import type { ChainType } from "../../../types/network.js";
 export declare function resolveHttpNetwork(networkConfig: HttpNetworkUserConfig, resolveConfigurationVariable: ConfigurationVariableResolver): HttpNetworkConfig;
 export declare function resolveEdrNetwork(networkConfig: EdrNetworkUserConfig, cachePath: string, resolveConfigurationVariable: ConfigurationVariableResolver): EdrNetworkConfig;
 export declare function resolveGasConfig(value?: GasUserConfig): GasConfig;
@@ -8,6 +9,6 @@ export declare function resolveForkingConfig(forkingUserConfig: EdrNetworkForkin
 export declare function resolveMiningConfig(miningUserConfig?: EdrNetworkMiningUserConfig | undefined): EdrNetworkMiningConfig;
 export declare function resolveCoinbase(coinbase?: string | undefined): Uint8Array;
 export declare function resolveChains(chains: EdrNetworkChainsUserConfig | undefined): EdrNetworkChainsConfig;
-export declare function resolveHardfork(hardfork: string | undefined, _enableTransientStorage: boolean | undefined): string;
+export declare function resolveHardfork(hardfork: string | undefined, chainType: ChainType | undefined, _enableTransientStorage: boolean | undefined): string;
 export declare function resolveInitialBaseFeePerGas(initialBaseFeePerGas: bigint | number | undefined): bigint | undefined;
 //# sourceMappingURL=config-resolution.d.ts.map

package/dist/src/internal/builtin-plugins/network-manager/config-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-resolution.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/config-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,wBAAwB,EACxB,4BAA4B,EAE5B,sBAAsB,EACtB,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,yBAAyB,EACzB,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAiBlC,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,qBAAqB,EACpC,4BAA4B,EAAE,6BAA6B,GAC1D,iBAAiB,CAiBnB;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,oBAAoB,EACnC,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,6BAA6B,GAC1D,gBAAgB,CA4ClB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,GAAE,aAAsB,GAAG,SAAS,CAEzE;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,6BAA6B,GAAG,SAAoB,EAC9D,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,CAyB3B;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EACJ,4BAA4B,GAC5B,SAAyD,EAC7D,4BAA4B,EAAE,6BAA6B,GAC1D,wBAAwB,CA4B1B;AAED,wBAAgB,oBAAoB,CAClC,iBAAiB,EAAE,2BAA2B,GAAG,SAAS,EAC1D,QAAQ,EAAE,MAAM,EAChB,4BAA4B,EAAE,6BAA6B,GAC1D,uBAAuB,GAAG,SAAS,CAerC;AAED,wBAAgB,mBAAmB,CACjC,gBAAgB,GAAE,0BAA0B,GAAG,SAAc,GAC5D,sBAAsB,CAUxB;AAED,wBAAgB,eAAe,CAC7B,QAAQ,GAAE,MAAM,GAAG,SAAwC,GAC1D,UAAU,CAEZ;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,0BAA0B,GAAG,SAAS,GAC7C,sBAAsB,CAqIxB;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,uBAAuB,EAAE,OAAO,GAAG,SAAS,GAC3C,MAAM,CAMR;AAED,wBAAgB,2BAA2B,CACzC,oBAAoB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAChD,MAAM,GAAG,SAAS,CAIpB"}
+{"version":3,"file":"config-resolution.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/config-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,wBAAwB,EACxB,4BAA4B,EAE5B,sBAAsB,EACtB,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,yBAAyB,EACzB,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA2B3D,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,qBAAqB,EACpC,4BAA4B,EAAE,6BAA6B,GAC1D,iBAAiB,CAiBnB;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,oBAAoB,EACnC,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,6BAA6B,GAC1D,gBAAgB,CA6ClB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,GAAE,aAAsB,GAAG,SAAS,CAEzE;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,6BAA6B,GAAG,SAAoB,EAC9D,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,CAyB3B;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EACJ,4BAA4B,GAC5B,SAAyD,EAC7D,4BAA4B,EAAE,6BAA6B,GAC1D,wBAAwB,CA4B1B;AAED,wBAAgB,oBAAoB,CAClC,iBAAiB,EAAE,2BAA2B,GAAG,SAAS,EAC1D,QAAQ,EAAE,MAAM,EAChB,4BAA4B,EAAE,6BAA6B,GAC1D,uBAAuB,GAAG,SAAS,CAerC;AAED,wBAAgB,mBAAmB,CACjC,gBAAgB,GAAE,0BAA0B,GAAG,SAAc,GAC5D,sBAAsB,CAUxB;AAED,wBAAgB,eAAe,CAC7B,QAAQ,GAAE,MAAM,GAAG,SAAwC,GAC1D,UAAU,CAEZ;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,0BAA0B,GAAG,SAAS,GAC7C,sBAAsB,CAqIxB;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,EAAE,SAAS,GAAG,SAA8B,EACrD,uBAAuB,EAAE,OAAO,GAAG,SAAS,GAC3C,MAAM,CAMR;AAED,wBAAgB,2BAA2B,CACzC,oBAAoB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAChD,MAAM,GAAG,SAAS,CAIpB"}

package/dist/src/internal/builtin-plugins/network-manager/config-resolution.js

@@ -1,8 +1,9 @@
 import path from "node:path";
 import { hexStringToBytes, normalizeHexString, } from "@nomicfoundation/hardhat-utils/hex";
+import { L1_CHAIN_TYPE, OPTIMISM_CHAIN_TYPE, GENERIC_CHAIN_TYPE, } from "../../constants.js";
 import { DEFAULT_HD_ACCOUNTS_CONFIG_PARAMS } from "./accounts/constants.js";
 import { DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS, EDR_NETWORK_DEFAULT_COINBASE, } from "./edr/edr-provider.js";
-import { HardforkName, LATEST_HARDFORK } from "./edr/types/hardfork.js";
+import { getCurrentHardfork, L1HardforkName, OpHardforkName, } from "./edr/types/hardfork.js";
 import { isHttpNetworkHdAccountsUserConfig } from "./type-validation.js";
 export function resolveHttpNetwork(networkConfig, resolveConfigurationVariable) {
     return {
@@ -37,7 +38,7 @@ export function resolveEdrNetwork(networkConfig, cachePath, resolveConfiguration
         enableRip7212: networkConfig.enableRip7212 ?? false,
         enableTransientStorage: networkConfig.enableTransientStorage ?? false,
         forking: resolveForkingConfig(networkConfig.forking, cachePath, resolveConfigurationVariable),
-        hardfork: resolveHardfork(networkConfig.hardfork, networkConfig.enableTransientStorage),
+        hardfork: resolveHardfork(networkConfig.hardfork, networkConfig.chainType, networkConfig.enableTransientStorage),
         initialBaseFeePerGas: resolveInitialBaseFeePerGas(networkConfig.initialBaseFeePerGas),
         initialDate: networkConfig.initialDate ?? new Date(),
         loggingEnabled: networkConfig.loggingEnabled ?? false,
@@ -122,117 +123,116 @@ export function resolveCoinbase(coinbase = EDR_NETWORK_DEFAULT_COINBASE) {
     return hexStringToBytes(coinbase);
 }
 export function resolveChains(chains) {
+    /**
+     * Block numbers / timestamps were taken from:
+     *
+     * L1 / Generic:
+     * https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/chains.ts
+     * Op:
+     * https://github.com/ethereum-optimism/superchain-registry/tree/main/superchain/configs/mainnet
+     *
+     * To find hardfork activation blocks by timestamp, use:
+     * https://api-TESTNET.etherscan.io/api?module=block&action=getblocknobytime&timestamp=TIMESTAMP&closest=before&apikey=APIKEY
+     */
     const resolvedChains = new Map([
         [
-            // block numbers below were taken from https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/chains
             1, // mainnet
             {
+                chainType: L1_CHAIN_TYPE,
                 hardforkHistory: new Map([
-                    [HardforkName.FRONTIER, 0],
-                    [HardforkName.HOMESTEAD, 1_150_000],
-                    [HardforkName.DAO, 1_920_000],
-                    [HardforkName.TANGERINE_WHISTLE, 2_463_000],
-                    [HardforkName.SPURIOUS_DRAGON, 2_675_000],
-                    [HardforkName.BYZANTIUM, 4_370_000],
-                    [HardforkName.CONSTANTINOPLE, 7_280_000],
-                    [HardforkName.PETERSBURG, 7_280_000],
-                    [HardforkName.ISTANBUL, 9_069_000],
-                    [HardforkName.MUIR_GLACIER, 9_200_000],
-                    [HardforkName.BERLIN, 1_2244_000],
-                    [HardforkName.LONDON, 12_965_000],
-                    [HardforkName.ARROW_GLACIER, 13_773_000],
-                    [HardforkName.GRAY_GLACIER, 15_050_000],
-                    [HardforkName.MERGE, 15_537_394],
-                    [HardforkName.SHANGHAI, 17_034_870],
-                    [HardforkName.CANCUN, 19_426_589],
+                    [L1HardforkName.FRONTIER, 0],
+                    [L1HardforkName.HOMESTEAD, 1_150_000],
+                    [L1HardforkName.DAO, 1_920_000],
+                    [L1HardforkName.TANGERINE_WHISTLE, 2_463_000],
+                    [L1HardforkName.SPURIOUS_DRAGON, 2_675_000],
+                    [L1HardforkName.BYZANTIUM, 4_370_000],
+                    [L1HardforkName.CONSTANTINOPLE, 7_280_000],
+                    [L1HardforkName.PETERSBURG, 7_280_000],
+                    [L1HardforkName.ISTANBUL, 9_069_000],
+                    [L1HardforkName.MUIR_GLACIER, 9_200_000],
+                    [L1HardforkName.BERLIN, 1_2244_000],
+                    [L1HardforkName.LONDON, 12_965_000],
+                    [L1HardforkName.ARROW_GLACIER, 13_773_000],
+                    [L1HardforkName.GRAY_GLACIER, 15_050_000],
+                    [L1HardforkName.MERGE, 15_537_394],
+                    [L1HardforkName.SHANGHAI, 17_034_870],
+                    [L1HardforkName.CANCUN, 19_426_589],
                 ]),
             },
         ],
         [
-            3, // ropsten
+            5, // goerli
             {
+                chainType: L1_CHAIN_TYPE,
                 hardforkHistory: new Map([
-                    [HardforkName.BYZANTIUM, 1700000],
-                    [HardforkName.CONSTANTINOPLE, 4230000],
-                    [HardforkName.PETERSBURG, 4939394],
-                    [HardforkName.ISTANBUL, 6485846],
-                    [HardforkName.MUIR_GLACIER, 7117117],
-                    [HardforkName.BERLIN, 9812189],
-                    [HardforkName.LONDON, 10499401],
+                    [L1HardforkName.ISTANBUL, 1_561_651],
+                    [L1HardforkName.BERLIN, 4_460_644],
+                    [L1HardforkName.LONDON, 5_062_605],
                 ]),
             },
         ],
         [
-            4, // rinkeby
+            17000, // holesky
             {
+                chainType: L1_CHAIN_TYPE,
                 hardforkHistory: new Map([
-                    [HardforkName.BYZANTIUM, 1035301],
-                    [HardforkName.CONSTANTINOPLE, 3660663],
-                    [HardforkName.PETERSBURG, 4321234],
-                    [HardforkName.ISTANBUL, 5435345],
-                    [HardforkName.BERLIN, 8290928],
-                    [HardforkName.LONDON, 8897988],
+                    [L1HardforkName.MERGE, 0],
+                    [L1HardforkName.SHANGHAI, 6_698],
+                    [L1HardforkName.CANCUN, 894_732],
                 ]),
             },
         ],
         [
-            5, // goerli
+            560048, // hoodi
             {
+                chainType: L1_CHAIN_TYPE,
                 hardforkHistory: new Map([
-                    [HardforkName.ISTANBUL, 1561651],
-                    [HardforkName.BERLIN, 4460644],
-                    [HardforkName.LONDON, 5062605],
+                    [L1HardforkName.MERGE, 0],
+                    [L1HardforkName.SHANGHAI, 0],
+                    [L1HardforkName.CANCUN, 0],
                 ]),
             },
         ],
         [
-            42, // kovan
+            11155111, // sepolia
             {
+                chainType: L1_CHAIN_TYPE,
                 hardforkHistory: new Map([
-                    [HardforkName.BYZANTIUM, 5067000],
-                    [HardforkName.CONSTANTINOPLE, 9200000],
-                    [HardforkName.PETERSBURG, 10255201],
-                    [HardforkName.ISTANBUL, 14111141],
-                    [HardforkName.BERLIN, 24770900],
-                    [HardforkName.LONDON, 26741100],
+                    [L1HardforkName.GRAY_GLACIER, 0],
+                    [L1HardforkName.MERGE, 1_450_409],
+                    [L1HardforkName.SHANGHAI, 2_990_908],
+                    [L1HardforkName.CANCUN, 5_187_023],
                 ]),
             },
         ],
         [
-            11155111, // sepolia
+            10, // op mainnet
             {
+                chainType: OPTIMISM_CHAIN_TYPE,
                 hardforkHistory: new Map([
-                    [HardforkName.GRAY_GLACIER, 0],
-                    [HardforkName.MERGE, 1_450_409],
-                    [HardforkName.SHANGHAI, 2_990_908],
-                    [HardforkName.CANCUN, 5_187_023],
+                    [OpHardforkName.BEDROCK, 105_235_063],
+                    [OpHardforkName.REGOLITH, 105_235_063],
+                    [OpHardforkName.CANYON, 114_696_812],
+                    [OpHardforkName.ECOTONE, 117_387_812],
+                    [OpHardforkName.FJORD, 122_514_212],
+                    [OpHardforkName.GRANITE, 125_235_812],
+                    [OpHardforkName.HOLOCENE, 130_423_412],
                 ]),
             },
         ],
-        // TODO: the rest of this config is a temporary workaround,
-        // see https://github.com/NomicFoundation/edr/issues/522
-        [
-            10, // optimism mainnet
-            {
-                hardforkHistory: new Map([[HardforkName.SHANGHAI, 0]]),
-            },
-        ],
-        [
-            11155420, // optimism sepolia
-            {
-                hardforkHistory: new Map([[HardforkName.SHANGHAI, 0]]),
-            },
-        ],
         [
-            42161, // arbitrum one
+            11155420, // op sepolia
             {
-                hardforkHistory: new Map([[HardforkName.SHANGHAI, 0]]),
-            },
-        ],
-        [
-            421614, // arbitrum sepolia
-            {
-                hardforkHistory: new Map([[HardforkName.SHANGHAI, 0]]),
+                chainType: OPTIMISM_CHAIN_TYPE,
+                hardforkHistory: new Map([
+                    [OpHardforkName.BEDROCK, 0],
+                    [OpHardforkName.REGOLITH, 0],
+                    [OpHardforkName.CANYON, 4_089_330],
+                    [OpHardforkName.ECOTONE, 8_366_130],
+                    [OpHardforkName.FJORD, 12_597_930],
+                    [OpHardforkName.GRANITE, 15_837_930],
+                    [OpHardforkName.HOLOCENE, 20_415_330],
+                ]),
             },
         ],
     ]);
@@ -241,6 +241,7 @@ export function resolveChains(chains) {
     }
     chains.forEach((chainConfig, chainId) => {
         const resolvedChainConfig = {
+            chainType: chainConfig.chainType ?? GENERIC_CHAIN_TYPE,
             hardforkHistory: new Map(),
         };
         if (chainConfig.hardforkHistory !== undefined) {
@@ -252,11 +253,11 @@ export function resolveChains(chains) {
     });
     return resolvedChains;
 }
-export function resolveHardfork(hardfork, _enableTransientStorage) {
+export function resolveHardfork(hardfork, chainType = GENERIC_CHAIN_TYPE, _enableTransientStorage) {
     if (hardfork !== undefined) {
         return hardfork;
     }
-    return LATEST_HARDFORK;
+    return getCurrentHardfork(chainType);
 }
 export function resolveInitialBaseFeePerGas(initialBaseFeePerGas) {
     return initialBaseFeePerGas !== undefined

package/dist/src/internal/builtin-plugins/network-manager/config-resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-resolution.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/config-resolution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config-resolution.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/config-resolution.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/network-manager/edr/edr-context.js

@@ -1,11 +1,11 @@
-import { EdrContext, GENERIC_CHAIN_TYPE, genericChainProviderFactory, L1_CHAIN_TYPE, l1ProviderFactory, OPTIMISM_CHAIN_TYPE, optimismProviderFactory, } from "@ignored/edr-optimism";
+import { EdrContext, GENERIC_CHAIN_TYPE, genericChainProviderFactory, L1_CHAIN_TYPE, l1ProviderFactory, OP_CHAIN_TYPE, opProviderFactory, } from "@ignored/edr-optimism";
 let _globalEdrContext;
 export async function getGlobalEdrContext() {
     if (_globalEdrContext === undefined) {
         _globalEdrContext = new EdrContext();
         await _globalEdrContext.registerProviderFactory(GENERIC_CHAIN_TYPE, genericChainProviderFactory());
         await _globalEdrContext.registerProviderFactory(L1_CHAIN_TYPE, l1ProviderFactory());
-        await _globalEdrContext.registerProviderFactory(OPTIMISM_CHAIN_TYPE, optimismProviderFactory());
+        await _globalEdrContext.registerProviderFactory(OP_CHAIN_TYPE, opProviderFactory());
     }
     return _globalEdrContext;
 }

package/dist/src/internal/builtin-plugins/network-manager/edr/edr-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"edr-context.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,2BAA2B,EAC3B,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAE/B,IAAI,iBAAyC,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,iBAAiB,GAAG,IAAI,UAAU,EAAE,CAAC;QACrC,MAAM,iBAAiB,CAAC,uBAAuB,CAC7C,kBAAkB,EAClB,2BAA2B,EAAE,CAC9B,CAAC;QACF,MAAM,iBAAiB,CAAC,uBAAuB,CAC7C,aAAa,EACb,iBAAiB,EAAE,CACpB,CAAC;QACF,MAAM,iBAAiB,CAAC,uBAAuB,CAC7C,mBAAmB,EACnB,uBAAuB,EAAE,CAC1B,CAAC;IACJ,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"edr-context.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,2BAA2B,EAC3B,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAE/B,IAAI,iBAAyC,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,iBAAiB,GAAG,IAAI,UAAU,EAAE,CAAC;QACrC,MAAM,iBAAiB,CAAC,uBAAuB,CAC7C,kBAAkB,EAClB,2BAA2B,EAAE,CAC9B,CAAC;QACF,MAAM,iBAAiB,CAAC,uBAAuB,CAC7C,aAAa,EACb,iBAAiB,EAAE,CACpB,CAAC;QACF,MAAM,iBAAiB,CAAC,uBAAuB,CAC7C,aAAa,EACb,iBAAiB,EAAE,CACpB,CAAC;IACJ,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}

package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.d.ts

@@ -1,6 +1,7 @@
 import type { LoggerConfig } from "./types/logger.js";
 import type { EdrNetworkConfig, EdrNetworkHDAccountsConfig } from "../../../../types/config.js";
 import type { RequestArguments, SuccessfulJsonRpcResponse } from "../../../../types/providers.js";
+import type { RequireField } from "../../../../types/utils.js";
 import type { DefaultHDAccountsConfigParams } from "../accounts/constants.js";
 import type { JsonRpcRequestWrapperFunction } from "../network-manager.js";
 import type { SubscriptionEvent, TracingConfigWithBuffers } from "@ignored/edr-optimism";
@@ -16,7 +17,7 @@ export declare const DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS: EdrNetworkDe
 export declare function isDefaultEdrNetworkHDAccountsConfig(accounts: EdrNetworkHDAccountsConfig): Promise<boolean>;
 export declare const EDR_NETWORK_DEFAULT_PRIVATE_KEYS: string[];
 interface EdrProviderConfig {
-    networkConfig: EdrNetworkConfig;
+    networkConfig: RequireField<EdrNetworkConfig, "chainType">;
     loggerConfig?: LoggerConfig;
     tracingConfig?: TracingConfigWithBuffers;
     jsonRpcRequestWrapper?: JsonRpcRequestWrapperFunction;

package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edr-provider.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAIV,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EACV,iBAAiB,EAIjB,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAoB/B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA8BnD,eAAO,MAAM,4BAA4B,+CACK,CAAC;AAE/C,UAAU,uCACR,SAAQ,6BAA6B;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,oBAAoB,gEAC8B,CAAC;AAChE,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AACpE,eAAO,MAAM,6CAA6C,EAAE,uCAKzD,CAAC;AAEJ,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,eAAO,MAAM,gCAAgC,EAAE,MAAM,EAqBpD,CAAC;AAEF,UAAU,iBAAiB;IACzB,aAAa,EAAE,gBAAgB,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,qBAAqB,CAAC,EAAE,6BAA6B,CAAC;CACvD;AAED,qBAAa,WAAY,SAAQ,YAAY;;IAM3C;;OAEG;WACiB,MAAM,CAAC,EACzB,aAAa,EACb,YAAiC,EACjC,aAAkB,EAClB,qBAAqB,GACtB,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IA6C3C;;;;;;OAMG;IACH,OAAO;IAUM,OAAO,CAClB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IA+DlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyD5B,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAkD3D"}
+{"version":3,"file":"edr-provider.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAIV,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EACV,iBAAiB,EAIjB,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAoB/B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA8BnD,eAAO,MAAM,4BAA4B,+CACK,CAAC;AAE/C,UAAU,uCACR,SAAQ,6BAA6B;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,oBAAoB,gEAC8B,CAAC;AAChE,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AACpE,eAAO,MAAM,6CAA6C,EAAE,uCAKzD,CAAC;AAEJ,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,eAAO,MAAM,gCAAgC,EAAE,MAAM,EAqBpD,CAAC;AAEF,UAAU,iBAAiB;IACzB,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAC3D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,qBAAqB,CAAC,EAAE,6BAA6B,CAAC;CACvD;AAED,qBAAa,WAAY,SAAQ,YAAY;;IAM3C;;OAEG;WACiB,MAAM,CAAC,EACzB,aAAa,EACb,YAAiC,EACjC,aAAkB,EAClB,qBAAqB,GACtB,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IA6C3C;;;;;;OAMG;IACH,OAAO;IAUM,OAAO,CAClB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IA+DlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyD5B,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAkD3D"}

package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js

@@ -1,4 +1,4 @@
-import { optimismGenesisState, optimismHardforkFromString, l1GenesisState, l1HardforkFromString, } from "@ignored/edr-optimism";
+import { opGenesisState, opHardforkFromString, l1GenesisState, l1HardforkFromString, } from "@ignored/edr-optimism";
 import { assertHardhatInvariant, HardhatError, } from "@nomicfoundation/hardhat-errors";
 import { toSeconds } from "@nomicfoundation/hardhat-utils/date";
 import { ensureError } from "@nomicfoundation/hardhat-utils/error";
@@ -230,13 +230,12 @@ export class EdrProvider extends BaseProvider {
     }
 }
 async function getProviderConfig(networkConfig) {
+    const specId = hardhatHardforkToEdrSpecId(networkConfig.hardfork, networkConfig.chainType);
     const genesisState = networkConfig.forking !== undefined
         ? [] // TODO: Add support for overriding remote fork state when the local fork is different
         : networkConfig.chainType === "optimism"
-            ? optimismGenesisState(optimismHardforkFromString(
-            // TODO: Optimism conversion is not implemented yet
-            hardhatHardforkToEdrSpecId(networkConfig.hardfork)))
-            : l1GenesisState(l1HardforkFromString(hardhatHardforkToEdrSpecId(networkConfig.hardfork)));
+            ? opGenesisState(opHardforkFromString(specId))
+            : l1GenesisState(l1HardforkFromString(specId));
     return {
         allowBlocksWithSameTimestamp: networkConfig.allowBlocksWithSameTimestamp,
         allowUnlimitedContractSize: networkConfig.allowUnlimitedContractSize,
@@ -245,13 +244,13 @@ async function getProviderConfig(networkConfig) {
         blockGasLimit: networkConfig.blockGasLimit,
         cacheDir: networkConfig.forking?.cacheDir,
         chainId: BigInt(networkConfig.chainId),
-        chains: hardhatChainsToEdrChains(networkConfig.chains),
+        chains: hardhatChainsToEdrChains(networkConfig.chains, networkConfig.chainType),
         // TODO: remove this cast when EDR updates the interface to accept Uint8Array
         coinbase: Buffer.from(networkConfig.coinbase),
         enableRip7212: networkConfig.enableRip7212,
         fork: await hardhatForkingConfigToEdrForkConfig(networkConfig.forking),
         genesisState,
-        hardfork: hardhatHardforkToEdrSpecId(networkConfig.hardfork),
+        hardfork: specId,
         initialBaseFeePerGas: networkConfig.initialBaseFeePerGas,
         initialDate: BigInt(toSeconds(networkConfig.initialDate)),
         minGasPrice: networkConfig.minGasPrice,