@nomicfoundation/edr 0.12.0-next.23 → 0.12.0-next.24

package/index.d.ts

@@ -587,6 +587,20 @@ export interface LinkReference {
   start: number
   length: number
 }
+/**Error codes that can be returned by cheatcodes in Solidity tests. */
+export enum CheatcodeErrorCode {
+  /**The specified cheatcode is not supported. */
+  UnsupportedCheatcode = 'UnsupportedCheatcode',
+  /**The specified cheatcode is missing. */
+  MissingCheatcode = 'MissingCheatcode'
+}
+/**Error returned by a cheatcode in Solidity tests. */
+export interface CheatcodeErrorDetails {
+  /**The error code representing the type of cheatcode error. */
+  code: CheatcodeErrorCode
+  /**The name of the cheatcode that caused the error. */
+  cheatcode: string
+}
 /**
  * Solidity test runner configuration arguments exposed through the ffi.
  * Docs based on <https://book.getfoundry.sh/reference/config/testing>.
@@ -646,6 +660,8 @@ export interface SolidityTestRunnerConfigArgs {
    * Defaults to `31337`.
    */
   chainId?: bigint
+  /** The hardfork to use for EVM execution. */
+  hardfork: string
   /**
    * The gas limit for each test case.
    * Defaults to `9_223_372_036_854_775_807` (`i64::MAX`).
@@ -686,6 +702,11 @@ export interface SolidityTestRunnerConfigArgs {
    * Defaults to false.
    */
   disableBlockGasLimit?: boolean
+  /**
+   * Whether to enable the EIP-7825 (Osaka) transaction gas limit cap.
+   * Defaults to false.
+   */
+  enableTxGasLimitCap?: boolean
   /**
    * The memory limit of the EVM in bytes.
    * Defaults to `33_554_432` (2^25 = 32MiB).
@@ -1457,6 +1478,7 @@ export interface CheatcodeErrorStackTraceEntry {
   type: StackTraceEntryType.CHEATCODE_ERROR
   message: string
   sourceReference: SourceReference
+  details?: CheatcodeErrorDetails
 }
 export interface TracingMessage {
   /** Sender address */

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, 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, getLatestSupportedSolcVersion } = 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, 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, getLatestSupportedSolcVersion } = nativeBinding
 
 module.exports.GENERIC_CHAIN_TYPE = GENERIC_CHAIN_TYPE
 module.exports.genericChainProviderFactory = genericChainProviderFactory
@@ -369,6 +369,7 @@ module.exports.Response = Response
 module.exports.Provider = Provider
 module.exports.SuccessReason = SuccessReason
 module.exports.ExceptionalHalt = ExceptionalHalt
+module.exports.CheatcodeErrorCode = CheatcodeErrorCode
 module.exports.CachedChains = CachedChains
 module.exports.CachedEndpoints = CachedEndpoints
 module.exports.FsAccessPermission = FsAccessPermission

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.12.0-next.23",
+  "version": "0.12.0-next.24",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",
@@ -58,13 +58,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.23",
-    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.23",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.23",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.23",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.23",
-    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.23",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.23"
+    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.24",
+    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.24",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.24",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.24",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.24",
+    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.24",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.24"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/solidity_tests/cheatcode_errors.rs

@@ -0,0 +1,37 @@
+use napi_derive::napi;
+use serde::Serialize;
+
+#[napi(string_enum)]
+#[derive(Serialize)]
+#[doc = "Error codes that can be returned by cheatcodes in Solidity tests."]
+pub enum CheatcodeErrorCode {
+    #[doc = "The specified cheatcode is not supported."]
+    UnsupportedCheatcode,
+    #[doc = "The specified cheatcode is missing."]
+    MissingCheatcode,
+}
+
+#[napi(object)]
+#[derive(Clone, Serialize)]
+#[doc = "Error returned by a cheatcode in Solidity tests."]
+pub struct CheatcodeErrorDetails {
+    #[doc = "The error code representing the type of cheatcode error."]
+    pub code: CheatcodeErrorCode,
+    #[doc = "The name of the cheatcode that caused the error."]
+    pub cheatcode: String,
+}
+
+impl From<edr_solidity::return_data::CheatcodeErrorCode> for CheatcodeErrorCode {
+    fn from(value: edr_solidity::return_data::CheatcodeErrorCode) -> Self {
+        match value {
+            edr_solidity::return_data::CheatcodeErrorCode::UnsupportedCheatcode => {
+                CheatcodeErrorCode::UnsupportedCheatcode
+            }
+            // __Invalid is generated by alloy_sol_types for invalid encoded values.
+            edr_solidity::return_data::CheatcodeErrorCode::MissingCheatcode
+            | edr_solidity::return_data::CheatcodeErrorCode::__Invalid => {
+                CheatcodeErrorCode::MissingCheatcode
+            }
+        }
+    }
+}

package/src/solidity_tests/config.rs

@@ -75,6 +75,8 @@ pub struct SolidityTestRunnerConfigArgs {
     /// Defaults to `31337`.
     #[serde(serialize_with = "serialize_optional_bigint_as_struct")]
     pub chain_id: Option<BigInt>,
+    /// The hardfork to use for EVM execution.
+    pub hardfork: String,
     /// The gas limit for each test case.
     /// Defaults to `9_223_372_036_854_775_807` (`i64::MAX`).
     #[serde(serialize_with = "serialize_optional_bigint_as_struct")]
@@ -107,6 +109,9 @@ pub struct SolidityTestRunnerConfigArgs {
     /// Whether to disable the block gas limit.
     /// Defaults to false.
     pub disable_block_gas_limit: Option<bool>,
+    /// Whether to enable the EIP-7825 (Osaka) transaction gas limit cap.
+    /// Defaults to false.
+    pub enable_tx_gas_limit_cap: Option<bool>,
     /// The memory limit of the EVM in bytes.
     /// Defaults to `33_554_432` (2^25 = 32MiB).
     #[serde(serialize_with = "serialize_optional_bigint_as_struct")]
@@ -184,6 +189,7 @@ impl SolidityTestRunnerConfigArgs {
             initial_balance,
             block_number,
             chain_id,
+            hardfork,
             gas_limit,
             gas_price,
             block_base_fee_per_gas,
@@ -192,6 +198,7 @@ impl SolidityTestRunnerConfigArgs {
             block_difficulty,
             block_gas_limit,
             disable_block_gas_limit,
+            enable_tx_gas_limit_cap,
             memory_limit,
             local_predeploys,
             eth_rpc_url,
@@ -308,6 +315,7 @@ impl SolidityTestRunnerConfigArgs {
             initial_balance: initial_balance.map(TryCast::try_cast).transpose()?,
             block_number: block_number.map(TryCast::try_cast).transpose()?,
             chain_id: chain_id.map(TryCast::try_cast).transpose()?,
+            hardfork,
             gas_limit: gas_limit.map(TryCast::try_cast).transpose()?,
             gas_price: gas_price.map(TryCast::try_cast).transpose()?,
             block_base_fee_per_gas: block_base_fee_per_gas.map(TryCast::try_cast).transpose()?,
@@ -316,6 +324,7 @@ impl SolidityTestRunnerConfigArgs {
             block_difficulty: block_difficulty.map(TryCast::try_cast).transpose()?,
             block_gas_limit: block_gas_limit.map(TryCast::try_cast).transpose()?,
             disable_block_gas_limit,
+            enable_tx_gas_limit_cap,
             memory_limit: memory_limit.map(TryCast::try_cast).transpose()?,
             local_predeploys,
             fork_url: eth_rpc_url,

package/src/solidity_tests.rs

@@ -1,4 +1,5 @@
 pub mod artifact;
+pub mod cheatcode_errors;
 pub mod config;
 pub mod factory;
 pub mod l1;

package/src/trace/solidity_stack_trace.rs

@@ -9,7 +9,9 @@ use napi_derive::napi;
 use serde::{Serialize, Serializer};
 
 use super::model::ContractFunctionType;
-use crate::{cast::TryCast, trace::u256_to_bigint};
+use crate::{
+    cast::TryCast, solidity_tests::cheatcode_errors::CheatcodeErrorDetails, trace::u256_to_bigint,
+};
 
 #[napi]
 #[repr(u8)]
@@ -94,6 +96,15 @@ impl From<edr_solidity::solidity_stack_trace::SourceReference> for SourceReferen
     }
 }
 
+impl From<edr_solidity::return_data::CheatcodeErrorDetails> for CheatcodeErrorDetails {
+    fn from(value: edr_solidity::return_data::CheatcodeErrorDetails) -> Self {
+        Self {
+            code: value.code.into(),
+            cheatcode: value.cheatcode,
+        }
+    }
+}
+
 /// A [`StackTraceEntryType`] constant that is convertible to/from a
 /// `napi_value`.
 ///
@@ -579,6 +590,7 @@ pub struct CheatcodeErrorStackTraceEntry {
     // The parsed cheatcode error message that can be displayed to the user
     pub message: String,
     pub source_reference: SourceReference,
+    pub details: Option<CheatcodeErrorDetails>,
 }
 
 impl From<CheatcodeErrorStackTraceEntry> for SolidityStackTraceEntry {
@@ -684,10 +696,12 @@ impl TryCast<SolidityStackTraceEntry> for edr_solidity::solidity_stack_trace::St
             StackTraceEntry::CheatCodeError {
                 message,
                 source_reference,
+                details,
             } => CheatcodeErrorStackTraceEntry {
                 type_: StackTraceEntryTypeConst,
                 message,
                 source_reference: source_reference.into(),
+                details: details.map(std::convert::Into::into),
             }
             .into(),
             StackTraceEntry::CustomError {