@nomicfoundation/edr 0.12.0-next.30 → 0.12.0-next.32

package/coverage.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.4.22 <0.9.0;
+
+library __NomicFoundationCoverage {
+  address constant COVERAGE_ADDRESS =
+    0xc0bEc0BEc0BeC0bEC0beC0bEC0bEC0beC0beC0BE;
+
+  function _sendHitImplementation(uint256 coverageId) private view {
+    address coverageAddress = COVERAGE_ADDRESS;
+    /// @solidity memory-safe-assembly
+    assembly {
+      let ptr := mload(0x40)           // Get free memory pointer
+      mstore(ptr, coverageId)          // Store coverageId at free memory
+      pop(
+        staticcall(
+          gas(),
+          coverageAddress,
+          ptr,
+          32,                          // Size of uint256 is 32 bytes
+          0,
+          0
+        )
+      )
+    }
+  }
+
+  function _castToPure(
+    function(uint256) internal view fnIn
+  ) private pure returns (function(uint256) pure fnOut) {
+    assembly {
+      fnOut := fnIn
+    }
+  }
+
+  function sendHit(uint256 coverageId) internal pure {
+    _castToPure(_sendHitImplementation)(coverageId);
+  }
+}

package/dist/src/ts/coverage.d.ts

@@ -0,0 +1,6 @@
+export interface CoverageLib {
+    content: string;
+    filename: string;
+}
+export declare function getCoverageLibrary(): CoverageLib;
+//# sourceMappingURL=coverage.d.ts.map

package/dist/src/ts/coverage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coverage.d.ts","sourceRoot":"","sources":["../../../src/ts/coverage.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,kBAAkB,IAAI,WAAW,CAYhD"}

package/dist/src/ts/coverage.js

@@ -0,0 +1,51 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCoverageLibrary = getCoverageLibrary;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const edr_1 = require("@nomicfoundation/edr");
+function getCoverageLibrary() {
+    const packageRoot = path.dirname(require.resolve("@nomicfoundation/edr"));
+    const sourcePath = path.join(packageRoot, "coverage.sol");
+    if (!fs.existsSync(sourcePath)) {
+        throw new Error(`Coverage library file not found at ${sourcePath}. It should be bundled with @nomicfoundation/edr.`);
+    }
+    return {
+        content: fs.readFileSync(sourcePath, "utf-8"),
+        filename: edr_1.COVERAGE_LIBRARY_FILE_NAME,
+    };
+}
+//# sourceMappingURL=coverage.js.map

package/dist/src/ts/coverage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../../src/ts/coverage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,gDAYC;AAtBD,uCAAyB;AACzB,2CAA6B;AAE7B,8CAAkE;AAOlE,SAAgB,kBAAkB;IAChC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,sCAAsC,UAAU,mDAAmD,CACpG,CAAC;IACJ,CAAC;IACD,OAAO;QACL,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC;QAC7C,QAAQ,EAAE,gCAA0B;KACrC,CAAC;AACJ,CAAC"}

package/dist/src/ts/solidity_tests.d.ts

@@ -0,0 +1,17 @@
+import { StandardTestKind, FuzzTestKind, InvariantTestKind } from "../../index";
+export declare enum SortOrder {
+    Ascending = 0,
+    Descending = 1
+}
+export interface GasUsageFilter {
+    minThreshold?: bigint;
+    maxThreshold?: bigint;
+}
+export declare function extractGasUsage(testResults: {
+    name: string;
+    kind: StandardTestKind | FuzzTestKind | InvariantTestKind;
+}[], filter?: GasUsageFilter, ordering?: SortOrder): {
+    name: string;
+    gas: bigint;
+}[];
+//# sourceMappingURL=solidity_tests.d.ts.map

package/dist/src/ts/solidity_tests.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solidity_tests.d.ts","sourceRoot":"","sources":["../../../src/ts/solidity_tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhF,oBAAY,SAAS;IACnB,SAAS,IAAA;IACT,UAAU,IAAA;CACX;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,eAAe,CAC7B,WAAW,EAAE;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,GAAG,YAAY,GAAG,iBAAiB,CAAC;CAC3D,EAAE,EACH,MAAM,CAAC,EAAE,cAAc,EACvB,QAAQ,CAAC,EAAE,SAAS,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CA0BjC"}

package/dist/src/ts/solidity_tests.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SortOrder = void 0;
+exports.extractGasUsage = extractGasUsage;
+var SortOrder;
+(function (SortOrder) {
+    SortOrder[SortOrder["Ascending"] = 0] = "Ascending";
+    SortOrder[SortOrder["Descending"] = 1] = "Descending";
+})(SortOrder || (exports.SortOrder = SortOrder = {}));
+function extractGasUsage(testResults, filter, ordering) {
+    const gasUsage = [];
+    for (const result of testResults) {
+        // Default to zero gas for invariant tests
+        const gas = "consumedGas" in result.kind
+            ? result.kind.consumedGas
+            : "medianGas" in result.kind
+                ? result.kind.medianGas
+                : BigInt(0);
+        if ((!filter?.minThreshold || gas >= filter.minThreshold) &&
+            (!filter?.maxThreshold || gas <= filter.maxThreshold)) {
+            gasUsage.push({ name: result.name, gas });
+        }
+    }
+    if (ordering === SortOrder.Ascending) {
+        gasUsage.sort((a, b) => (a.gas < b.gas ? -1 : a.gas > b.gas ? 1 : 0));
+    }
+    else if (ordering === SortOrder.Descending) {
+        gasUsage.sort((a, b) => (a.gas > b.gas ? -1 : a.gas < b.gas ? 1 : 0));
+    }
+    return gasUsage;
+}
+//# sourceMappingURL=solidity_tests.js.map

package/dist/src/ts/solidity_tests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solidity_tests.js","sourceRoot":"","sources":["../../../src/ts/solidity_tests.ts"],"names":[],"mappings":";;;AAYA,0CAiCC;AA3CD,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,mDAAS,CAAA;IACT,qDAAU,CAAA;AACZ,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AAOD,SAAgB,eAAe,CAC7B,WAGG,EACH,MAAuB,EACvB,QAAoB;IAEpB,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QACjC,0CAA0C;QAC1C,MAAM,GAAG,GAAG,aAAa,IAAI,MAAM,CAAC,IAAI;YACtC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW;YACzB,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI;gBAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS;gBACvB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAEhB,IACE,CAAC,CAAC,MAAM,EAAE,YAAY,IAAI,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC;YACrD,CAAC,CAAC,MAAM,EAAE,YAAY,IAAI,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,EACrD,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,KAAK,SAAS,CAAC,SAAS,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;SAAM,IAAI,QAAQ,KAAK,SAAS,CAAC,UAAU,EAAE,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/index.d.ts

@@ -460,11 +460,13 @@ export interface InstrumentationMetadata {
    */
   readonly endUtf16: number
 }
+/** The instrumentation coverage library file name. */
+export const COVERAGE_LIBRARY_FILE_NAME: string
 /**
  * Adds per-statement coverage instrumentation to the given Solidity source
  * code.
  */
-export declare function addStatementCoverageInstrumentation(sourceCode: string, sourceId: string, solidityVersion: string, coverageLibraryPath: string): InstrumentationResult
+export declare function addStatementCoverageInstrumentation(sourceCode: string, sourceId: string, solidityVersion: string): InstrumentationResult
 /** Retrieves the latest version of `Solidity` supported for instrumentation. */
 export declare function latestSupportedSolidityVersion(): string
 /** Ethereum execution log. */
@@ -795,6 +797,40 @@ export interface SolidityTestRunnerConfigArgs {
    * Defaults to none.
    */
   testFunctionOverrides?: Array<TestFunctionOverride>
+  /**
+   * A list of EIP-712 canonical type definitions that can be referenced by
+   * type name in the `eip712HashType` and `eip712HashStruct` cheatcodes.
+   *
+   * Each entry is an independent, self-contained type definition. A
+   * definition that references nested struct types must inline those
+   * struct definitions, per the EIP-712 `encodeType` spec.
+   *
+   * Only the primary (leftmost) type of each entry is registered by name.
+   * Nested struct types referenced inside an entry are *not* registered
+   * under their own names. To look up a nested struct by name from a
+   * cheatcode, add it as a separate top-level entry whose primary type
+   * is the nested struct.
+   *
+   * The type of a struct is encoded as:
+   *
+   * `name ‖ "(" ‖ member₁ ‖ "," ‖ member₂ ‖ "," ‖ … ‖ memberₙ ")"`
+   *
+   * where each member is written as `type ‖ " " ‖ name`.
+   *
+   * Entries that fail to parse cause a startup error listing every bad
+   * entry.
+   *
+   * Example — to make both `Mail` and `Person` reachable by name:
+   *
+   * ```text
+   * "Mail(Person from,Person to,string contents)Person(address wallet,string name)"
+   * "Person(address wallet,string name)"
+   * ```
+   *
+   * With *only* the first entry, `vm.eip712HashType("Mail")` works but
+   * `vm.eip712HashType("Person")` fails with an unknown-type error.
+   */
+  eip712CanonicalTypes?: Array<string>
 }
 /** Fuzz testing configuration */
 export interface FuzzConfigArgs {
@@ -1018,6 +1054,20 @@ export interface TestFunctionConfigOverride {
    * as the test.
    */
   allowInternalExpectRevert?: boolean
+  /**
+   * Whether to enable isolation of calls for the test. In isolation mode all
+   * top-level calls are executed as a separate transaction in a separate
+   * EVM context, enabling more precise gas accounting and transaction
+   * state changes.
+   * Ignored when gas reporting is enabled, as isolation is required for
+   * accurate gas measurements.
+   */
+  isolate?: boolean
+  /**
+   * The EVM version to use for this test, e.g. "Cancun". This will override
+   * the global EVM version.
+   */
+  evmVersion?: string
   /** Configuration override for fuzz testing. */
   fuzz?: FuzzConfigOverride
   /** Configuration override for invariant testing. */

package/index.js

@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { GENERIC_CHAIN_TYPE, genericChainProviderFactory, L1_CHAIN_TYPE, l1GenesisState, l1ProviderFactory, SpecId, l1HardforkFromString, l1HardforkToString, l1HardforkLatest, FRONTIER, FRONTIER_THAWING, HOMESTEAD, DAO_FORK, TANGERINE, SPURIOUS_DRAGON, BYZANTIUM, CONSTANTINOPLE, PETERSBURG, ISTANBUL, MUIR_GLACIER, BERLIN, LONDON, ARROW_GLACIER, GRAY_GLACIER, MERGE, SHANGHAI, CANCUN, PRAGUE, OSAKA, OpHardfork, opHardforkFromString, opHardforkToString, opLatestHardfork, OP_CHAIN_TYPE, opGenesisState, opProviderFactory, BEDROCK, REGOLITH, CANYON, ECOTONE, FJORD, GRANITE, HOLOCENE, ISTHMUS, MineOrdering, EdrContext, ContractDecoder, GasReportExecutionStatus, addStatementCoverageInstrumentation, latestSupportedSolidityVersion, Precompile, precompileP256Verify, ProviderFactory, Response, Provider, SuccessReason, ExceptionalHalt, CheatcodeErrorCode, CachedChains, CachedEndpoints, FsAccessPermission, CollectStackTraces, IncludeTraces, SolidityTestRunnerFactory, l1SolidityTestRunnerFactory, opSolidityTestRunnerFactory, SuiteResult, TestResult, TestStatus, CallKind, LogKind, linkHexStringBytecode, printStackTrace, Exit, ExitCode, BytecodeWrapper, ContractFunctionType, ReturnData, StackTraceEntryType, stackTraceEntryTypeToString, FALLBACK_FUNCTION_NAME, RECEIVE_FUNCTION_NAME, CONSTRUCTOR_FUNCTION_NAME, UNRECOGNIZED_FUNCTION_NAME, UNKNOWN_FUNCTION_NAME, PRECOMPILE_FUNCTION_NAME, UNRECOGNIZED_CONTRACT_NAME, RawTrace } = nativeBinding
+const { GENERIC_CHAIN_TYPE, genericChainProviderFactory, L1_CHAIN_TYPE, l1GenesisState, l1ProviderFactory, SpecId, l1HardforkFromString, l1HardforkToString, l1HardforkLatest, FRONTIER, FRONTIER_THAWING, HOMESTEAD, DAO_FORK, TANGERINE, SPURIOUS_DRAGON, BYZANTIUM, CONSTANTINOPLE, PETERSBURG, ISTANBUL, MUIR_GLACIER, BERLIN, LONDON, ARROW_GLACIER, GRAY_GLACIER, MERGE, SHANGHAI, CANCUN, PRAGUE, OSAKA, OpHardfork, opHardforkFromString, opHardforkToString, opLatestHardfork, OP_CHAIN_TYPE, opGenesisState, opProviderFactory, BEDROCK, REGOLITH, CANYON, ECOTONE, FJORD, GRANITE, HOLOCENE, ISTHMUS, MineOrdering, EdrContext, ContractDecoder, GasReportExecutionStatus, COVERAGE_LIBRARY_FILE_NAME, addStatementCoverageInstrumentation, latestSupportedSolidityVersion, Precompile, precompileP256Verify, ProviderFactory, Response, Provider, SuccessReason, ExceptionalHalt, CheatcodeErrorCode, CachedChains, CachedEndpoints, FsAccessPermission, CollectStackTraces, IncludeTraces, SolidityTestRunnerFactory, l1SolidityTestRunnerFactory, opSolidityTestRunnerFactory, SuiteResult, TestResult, TestStatus, CallKind, LogKind, linkHexStringBytecode, printStackTrace, Exit, ExitCode, BytecodeWrapper, ContractFunctionType, ReturnData, StackTraceEntryType, stackTraceEntryTypeToString, FALLBACK_FUNCTION_NAME, RECEIVE_FUNCTION_NAME, CONSTRUCTOR_FUNCTION_NAME, UNRECOGNIZED_FUNCTION_NAME, UNKNOWN_FUNCTION_NAME, PRECOMPILE_FUNCTION_NAME, UNRECOGNIZED_CONTRACT_NAME, RawTrace } = nativeBinding
 
 module.exports.GENERIC_CHAIN_TYPE = GENERIC_CHAIN_TYPE
 module.exports.genericChainProviderFactory = genericChainProviderFactory
@@ -360,6 +360,7 @@ module.exports.MineOrdering = MineOrdering
 module.exports.EdrContext = EdrContext
 module.exports.ContractDecoder = ContractDecoder
 module.exports.GasReportExecutionStatus = GasReportExecutionStatus
+module.exports.COVERAGE_LIBRARY_FILE_NAME = COVERAGE_LIBRARY_FILE_NAME
 module.exports.addStatementCoverageInstrumentation = addStatementCoverageInstrumentation
 module.exports.latestSupportedSolidityVersion = latestSupportedSolidityVersion
 module.exports.Precompile = Precompile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.12.0-next.30",
+  "version": "0.12.0-next.32",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",
@@ -31,12 +31,15 @@
   },
   "exports": {
     ".": "./index.js",
-    "./solidity-tests": "./dist/src/ts/solidity_tests.js"
+    "./solidity-tests": "./dist/src/ts/solidity_tests.js",
+    "./coverage": "./dist/src/ts/coverage.js"
   },
   "files": [
     "index.js",
     "index.d.ts",
-    "src/"
+    "src/",
+    "dist/src/",
+    "coverage.sol"
   ],
   "license": "MIT",
   "main": "index.js",
@@ -58,13 +61,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.30",
-    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.30",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.30",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.30",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.30",
-    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.30",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.30"
+    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.32",
+    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.32",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.32",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.32",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.32",
+    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.32",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.32"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/instrument.rs

@@ -76,6 +76,10 @@ impl TryFrom<edr_instrument::coverage::InstrumentationMetadata> for Instrumentat
     }
 }
 
+/// The instrumentation coverage library file name.
+#[napi]
+pub const COVERAGE_LIBRARY_FILE_NAME: &str = coverage::LIBRARY_FILE_NAME;
+
 /// Adds per-statement coverage instrumentation to the given Solidity source
 /// code.
 #[napi(catch_unwind)]
@@ -83,7 +87,6 @@ pub fn add_statement_coverage_instrumentation(
     source_code: String,
     source_id: String,
     solidity_version: String,
-    coverage_library_path: String,
 ) -> napi::Result<InstrumentationResult> {
     let solidity_version = Version::parse(&solidity_version).map_err(|error| {
         napi::Error::new(
@@ -92,13 +95,8 @@ pub fn add_statement_coverage_instrumentation(
         )
     })?;
 
-    let instrumented = coverage::instrument_code(
-        &source_code,
-        &source_id,
-        solidity_version,
-        &coverage_library_path,
-    )
-    .map_err(|error| napi::Error::new(napi::Status::GenericFailure, error))?;
+    let instrumented = coverage::instrument_code(&source_code, &source_id, solidity_version)
+        .map_err(|error| napi::Error::new(napi::Status::GenericFailure, error))?;
 
     instrumented.try_into().map_err(|location| {
         napi::Error::new(

package/src/solidity_tests/config.rs

@@ -167,6 +167,38 @@ pub struct SolidityTestRunnerConfigArgs {
     /// Test function level config overrides.
     /// Defaults to none.
     pub test_function_overrides: Option<Vec<TestFunctionOverride>>,
+    /// A list of EIP-712 canonical type definitions that can be referenced by
+    /// type name in the `eip712HashType` and `eip712HashStruct` cheatcodes.
+    ///
+    /// Each entry is an independent, self-contained type definition. A
+    /// definition that references nested struct types must inline those
+    /// struct definitions, per the EIP-712 `encodeType` spec.
+    ///
+    /// Only the primary (leftmost) type of each entry is registered by name.
+    /// Nested struct types referenced inside an entry are *not* registered
+    /// under their own names. To look up a nested struct by name from a
+    /// cheatcode, add it as a separate top-level entry whose primary type
+    /// is the nested struct.
+    ///
+    /// The type of a struct is encoded as:
+    ///
+    /// `name ‖ "(" ‖ member₁ ‖ "," ‖ member₂ ‖ "," ‖ … ‖ memberₙ ")"`
+    ///
+    /// where each member is written as `type ‖ " " ‖ name`.
+    ///
+    /// Entries that fail to parse cause a startup error listing every bad
+    /// entry.
+    ///
+    /// Example — to make both `Mail` and `Person` reachable by name:
+    ///
+    /// ```text
+    /// "Mail(Person from,Person to,string contents)Person(address wallet,string name)"
+    /// "Person(address wallet,string name)"
+    /// ```
+    ///
+    /// With *only* the first entry, `vm.eip712HashType("Mail")` works but
+    /// `vm.eip712HashType("Person")` fails with an unknown-type error.
+    pub eip712_canonical_types: Option<Vec<String>>,
 }
 
 impl SolidityTestRunnerConfigArgs {
@@ -215,6 +247,7 @@ impl SolidityTestRunnerConfigArgs {
             test_pattern,
             generate_gas_report,
             test_function_overrides,
+            eip712_canonical_types,
         } = self;
 
         let test_pattern = TestFilterConfig {
@@ -294,6 +327,17 @@ impl SolidityTestRunnerConfigArgs {
                 })
                 .transpose()?
                 .unwrap_or_default(),
+            eip712_types_by_name: foundry_cheatcodes::parse_eip712_canonical_types(
+                eip712_canonical_types.unwrap_or_default(),
+            )
+            .map_err(|errors| {
+                let msg = errors
+                    .iter()
+                    .map(ToString::to_string)
+                    .collect::<Vec<_>>()
+                    .join("; ");
+                napi::Error::new(Status::InvalidArg, msg)
+            })?,
         };
 
         let on_collected_coverage_fn = observability.map_or_else(
@@ -876,6 +920,16 @@ pub struct TestFunctionConfigOverride {
     /// Allow expecting reverts with `expectRevert` at the same callstack depth
     /// as the test.
     pub allow_internal_expect_revert: Option<bool>,
+    /// Whether to enable isolation of calls for the test. In isolation mode all
+    /// top-level calls are executed as a separate transaction in a separate
+    /// EVM context, enabling more precise gas accounting and transaction
+    /// state changes.
+    /// Ignored when gas reporting is enabled, as isolation is required for
+    /// accurate gas measurements.
+    pub isolate: Option<bool>,
+    /// The EVM version to use for this test, e.g. "Cancun". This will override
+    /// the global EVM version.
+    pub evm_version: Option<String>,
     /// Configuration override for fuzz testing.
     pub fuzz: Option<FuzzConfigOverride>,
     /// Configuration override for invariant testing.
@@ -886,6 +940,8 @@ impl From<TestFunctionConfigOverride> for edr_solidity_tests::TestFunctionConfig
     fn from(value: TestFunctionConfigOverride) -> Self {
         Self {
             allow_internal_expect_revert: value.allow_internal_expect_revert,
+            isolate: value.isolate,
+            evm_version: value.evm_version,
             fuzz: value.fuzz.map(Into::into),
             invariant: value.invariant.map(Into::into),
         }

package/src/ts/coverage.ts

@@ -0,0 +1,23 @@
+import * as fs from "fs";
+import * as path from "path";
+
+import { COVERAGE_LIBRARY_FILE_NAME } from "@nomicfoundation/edr";
+
+export interface CoverageLib {
+  content: string;
+  filename: string;
+}
+
+export function getCoverageLibrary(): CoverageLib {
+  const packageRoot = path.dirname(require.resolve("@nomicfoundation/edr"));
+  const sourcePath = path.join(packageRoot, "coverage.sol");
+  if (!fs.existsSync(sourcePath)) {
+    throw new Error(
+      `Coverage library file not found at ${sourcePath}. It should be bundled with @nomicfoundation/edr.`,
+    );
+  }
+  return {
+    content: fs.readFileSync(sourcePath, "utf-8"),
+    filename: COVERAGE_LIBRARY_FILE_NAME,
+  };
+}