@nomicfoundation/edr 0.12.0-next.5 → 0.12.0-next.7

package/index.d.ts

@@ -162,6 +162,20 @@ export const FJORD: string
 export const GRANITE: string
 export const HOLOCENE: string
 export const ISTHMUS: string
+/** Configuration for EIP-1559 parameters */
+export interface BaseFeeParamActivation {
+  activation: BaseFeeActivationByBlockNumber | BaseFeeActivationByHardfork
+  maxChangeDenominator: bigint
+  elasticityMultiplier: bigint
+}
+export interface BaseFeeActivationByBlockNumber {
+  /** The block number at which the `base_fee_params` is activated */
+  blockNumber: bigint
+}
+export interface BaseFeeActivationByHardfork {
+  /** The hardfork at which the `base_fee_params` is activated */
+  hardfork: string
+}
 /** Specification of a chain with possible overrides. */
 export interface ChainOverride {
   /** The chain ID */
@@ -255,6 +269,17 @@ export interface ProviderConfig {
   bailOnCallFailure: boolean
   /** Whether to return an `Err` when a `eth_sendTransaction` fails */
   bailOnTransactionFailure: boolean
+  /**
+   * EIP-1559 base fee parameters activations to be used to calculate the
+   * block base fee.
+   *
+   * Provide an ordered list of `base_fee_params` to be
+   * used starting from the specified activation point (hardfork or block
+   * number).
+   * If not provided, the default values from the chain spec
+   * will be used.
+   */
+  baseFeeConfig?: Array<BaseFeeParamActivation>
   /** The gas limit of each block */
   blockGasLimit: bigint
   /** The chain ID of the blockchain */
@@ -619,7 +644,7 @@ export interface SolidityTestRunnerConfigArgs {
   disableBlockGasLimit?: boolean
   /**
    * The memory limit of the EVM in bytes.
-   * Defaults to 33_554_432 (2^25 = 32MiB).
+   * Defaults to `33_554_432` (2^25 = 32MiB).
    */
   memoryLimit?: bigint
   /**
@@ -664,6 +689,8 @@ export interface SolidityTestRunnerConfigArgs {
    * config value is set, then the fuzz config value will be used.
    */
   invariant?: InvariantConfigArgs
+  /** Whether to collect stack traces. */
+  collectStackTraces?: CollectStackTraces
   /**
    * Controls which test results should include execution traces. Defaults to
    * None.
@@ -840,6 +867,19 @@ export interface AddressLabel {
   /** The label to assign to the address */
   label: string
 }
+/** A type that controls when stack traces are collected. */
+export enum CollectStackTraces {
+  /** Always collects stack traces, adding performance overhead. */
+  Always = 0,
+  /**
+   * Only collects stack traces upon failure, re-executing the test. This
+   * minimizes performance overhead.
+   *
+   * Not all tests can be re-executed since certain cheatcodes contain
+   * non-deterministic side-effects.
+   */
+  OnFailure = 1
+}
 /**
  * Configuration for [`SolidityTestRunnerConfigArgs::include_traces`] that
  * controls execution trace decoding and inclusion in test results.
@@ -923,21 +963,21 @@ export enum TestStatus {
   /**Test skipped */
   Skipped = 'Skipped'
 }
-/** See [edr_solidity_tests::result::TestKind::Standard] */
+/** See [`edr_solidity_tests::result::TestKind::Standard`] */
 export interface StandardTestKind {
   /** The gas consumed by the test. */
   readonly consumedGas: bigint
 }
-/** See [edr_solidity_tests::result::TestKind::Fuzz] */
+/** See [`edr_solidity_tests::result::TestKind::Fuzz`] */
 export interface FuzzTestKind {
-  /** See [edr_solidity_tests::result::TestKind::Fuzz] */
+  /** See [`edr_solidity_tests::result::TestKind::Fuzz`] */
   readonly runs: bigint
-  /** See [edr_solidity_tests::result::TestKind::Fuzz] */
+  /** See [`edr_solidity_tests::result::TestKind::Fuzz`] */
   readonly meanGas: bigint
-  /** See [edr_solidity_tests::result::TestKind::Fuzz] */
+  /** See [`edr_solidity_tests::result::TestKind::Fuzz`] */
   readonly medianGas: bigint
 }
-/** See [edr_solidity_tests::fuzz::FuzzCase] */
+/** See [`edr_solidity_tests::fuzz::FuzzCase`] */
 export interface FuzzCase {
   /** The calldata used for this fuzz test */
   readonly calldata: Uint8Array
@@ -946,13 +986,13 @@ export interface FuzzCase {
   /** The initial gas stipend for the transaction */
   readonly stipend: bigint
 }
-/** See [edr_solidity_tests::result::TestKind::Invariant] */
+/** See [`edr_solidity_tests::result::TestKind::Invariant`] */
 export interface InvariantTestKind {
-  /** See [edr_solidity_tests::result::TestKind::Invariant] */
+  /** See [`edr_solidity_tests::result::TestKind::Invariant`] */
   readonly runs: bigint
-  /** See [edr_solidity_tests::result::TestKind::Invariant] */
+  /** See [`edr_solidity_tests::result::TestKind::Invariant`] */
   readonly calls: bigint
-  /** See [edr_solidity_tests::result::TestKind::Invariant] */
+  /** See [`edr_solidity_tests::result::TestKind::Invariant`] */
   readonly reverts: bigint
 }
 /**
@@ -965,19 +1005,19 @@ export interface CounterExampleSequence {
   /** The shrunk counterexample sequence. */
   sequence: Array<BaseCounterExample>
 }
-/** See [edr_solidity_tests::fuzz::BaseCounterExample] */
+/** See [`edr_solidity_tests::fuzz::BaseCounterExample`] */
 export interface BaseCounterExample {
-  /** See [edr_solidity_tests::fuzz::BaseCounterExample::sender] */
+  /** See [`edr_solidity_tests::fuzz::BaseCounterExample::sender`] */
   readonly sender?: Uint8Array
-  /** See [edr_solidity_tests::fuzz::BaseCounterExample::addr] */
+  /** See [`edr_solidity_tests::fuzz::BaseCounterExample::addr`] */
   readonly address?: Uint8Array
-  /** See [edr_solidity_tests::fuzz::BaseCounterExample::calldata] */
+  /** See [`edr_solidity_tests::fuzz::BaseCounterExample::calldata`] */
   readonly calldata: Uint8Array
-  /** See [edr_solidity_tests::fuzz::BaseCounterExample::contract_name] */
+  /** See [`edr_solidity_tests::fuzz::BaseCounterExample::contract_name`] */
   readonly contractName?: string
-  /** See [edr_solidity_tests::fuzz::BaseCounterExample::signature] */
+  /** See [`edr_solidity_tests::fuzz::BaseCounterExample::signature`] */
   readonly signature?: string
-  /** See [edr_solidity_tests::fuzz::BaseCounterExample::args] */
+  /** See [`edr_solidity_tests::fuzz::BaseCounterExample::args`] */
   readonly args?: string
 }
 /**
@@ -1326,7 +1366,7 @@ export declare class EdrContext {
   /**Creates a new [`EdrContext`] instance. Should only be called once! */
   constructor()
   /**Constructs a new provider with the provided configuration. */
-  createProvider(chainType: string, providerConfig: ProviderConfig, loggerConfig: LoggerConfig, subscriptionConfig: SubscriptionConfig, tracingConfig: TracingConfigWithBuffers): Promise<Provider>
+  createProvider(chainType: string, providerConfig: ProviderConfig, loggerConfig: LoggerConfig, subscriptionConfig: SubscriptionConfig, contractDecoder: ContractDecoder): Promise<Provider>
   /**Registers a new provider factory for the provided chain type. */
   registerProviderFactory(chainType: string, factory: ProviderFactory): Promise<void>
   registerSolidityTestRunnerFactory(chainType: string, factory: SolidityTestRunnerFactory): Promise<void>
@@ -1340,6 +1380,12 @@ export declare class EdrContext {
    */
   runSolidityTests(chainType: string, artifacts: Array<Artifact>, testSuites: Array<ArtifactId>, configArgs: SolidityTestRunnerConfigArgs, tracingConfig: TracingConfigWithBuffers, onTestSuiteCompletedCallback: (result: SuiteResult) => void): Promise<void>
 }
+export declare class ContractDecoder {
+  /**Creates an empty instance. */
+  constructor()
+  /**Creates a new instance with the provided configuration. */
+  static withContracts(config: TracingConfigWithBuffers): ContractDecoder
+}
 export declare class Precompile {
   /** Returns the address of the precompile. */
   get address(): Uint8Array
@@ -1360,7 +1406,9 @@ export declare class Provider {
    *
    *For internal use only. Support for this method may be removed in the future.
    */
-  addCompilationResult(solcVersion: string, compilerInput: any, compilerOutput: any): Promise<boolean>
+  addCompilationResult(solcVersion: string, compilerInput: any, compilerOutput: any): Promise<void>
+  /**Retrieves the instance's contract decoder. */
+  contractDecoder(): ContractDecoder
   /**Handles a JSON-RPC request and returns a JSON-RPC response. */
   handleRequest(request: string): Promise<Response>
   setCallOverrideCallback(callOverrideCallback: (contract_address: ArrayBuffer, data: ArrayBuffer) => Promise<CallOverrideResult | undefined>): Promise<void>
@@ -1373,35 +1421,35 @@ export declare class Provider {
   setVerboseTracing(verboseTracing: boolean): Promise<void>
 }
 export declare class SolidityTestRunnerFactory { }
-/** See [edr_solidity_tests::result::SuiteResult] */
+/** See [`edr_solidity_tests::result::SuiteResult`] */
 export declare class SuiteResult {
   /**
    * The artifact id can be used to match input to result in the progress
    * callback
    */
   readonly id: ArtifactId
-  /** See [edr_solidity_tests::result::SuiteResult::duration] */
+  /** See [`edr_solidity_tests::result::SuiteResult::duration`] */
   readonly durationNs: bigint
-  /** See [edr_solidity_tests::result::SuiteResult::test_results] */
+  /** See [`edr_solidity_tests::result::SuiteResult::test_results`] */
   readonly testResults: Array<TestResult>
-  /** See [edr_solidity_tests::result::SuiteResult::warnings] */
+  /** See [`edr_solidity_tests::result::SuiteResult::warnings`] */
   readonly warnings: Array<string>
 }
-/** See [edr_solidity_tests::result::TestResult] */
+/** See [`edr_solidity_tests::result::TestResult`] */
 export declare class TestResult {
   /** The name of the test. */
   readonly name: string
-  /** See [edr_solidity_tests::result::TestResult::status] */
+  /** See [`edr_solidity_tests::result::TestResult::status`] */
   readonly status: TestStatus
-  /** See [edr_solidity_tests::result::TestResult::reason] */
+  /** See [`edr_solidity_tests::result::TestResult::reason`] */
   readonly reason?: string
-  /** See [edr_solidity_tests::result::TestResult::counterexample] */
+  /** See [`edr_solidity_tests::result::TestResult::counterexample`] */
   readonly counterexample?: BaseCounterExample | CounterExampleSequence
-  /** See [edr_solidity_tests::result::TestResult::decoded_logs] */
+  /** See [`edr_solidity_tests::result::TestResult::decoded_logs`] */
   readonly decodedLogs: Array<string>
-  /** See [edr_solidity_tests::result::TestResult::kind] */
+  /** See [`edr_solidity_tests::result::TestResult::kind`] */
   readonly kind: StandardTestKind | FuzzTestKind | InvariantTestKind
-  /** See [edr_solidity_tests::result::TestResult::duration] */
+  /** See [`edr_solidity_tests::result::TestResult::duration`] */
   readonly durationNs: bigint
   /**
    * Groups of value snapshot entries (incl. gas).

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, OpHardfork, opHardforkFromString, opHardforkToString, opLatestHardfork, OP_CHAIN_TYPE, opGenesisState, opProviderFactory, BEDROCK, REGOLITH, CANYON, ECOTONE, FJORD, GRANITE, HOLOCENE, ISTHMUS, MineOrdering, EdrContext, addStatementCoverageInstrumentation, Precompile, precompileP256Verify, ProviderFactory, Response, Provider, SuccessReason, ExceptionalHalt, CachedChains, CachedEndpoints, FsAccessPermission, 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, OpHardfork, opHardforkFromString, opHardforkToString, opLatestHardfork, OP_CHAIN_TYPE, opGenesisState, opProviderFactory, BEDROCK, REGOLITH, CANYON, ECOTONE, FJORD, GRANITE, HOLOCENE, ISTHMUS, MineOrdering, EdrContext, ContractDecoder, addStatementCoverageInstrumentation, 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
 
 module.exports.GENERIC_CHAIN_TYPE = GENERIC_CHAIN_TYPE
 module.exports.genericChainProviderFactory = genericChainProviderFactory
@@ -357,6 +357,7 @@ module.exports.HOLOCENE = HOLOCENE
 module.exports.ISTHMUS = ISTHMUS
 module.exports.MineOrdering = MineOrdering
 module.exports.EdrContext = EdrContext
+module.exports.ContractDecoder = ContractDecoder
 module.exports.addStatementCoverageInstrumentation = addStatementCoverageInstrumentation
 module.exports.Precompile = Precompile
 module.exports.precompileP256Verify = precompileP256Verify
@@ -368,6 +369,7 @@ module.exports.ExceptionalHalt = ExceptionalHalt
 module.exports.CachedChains = CachedChains
 module.exports.CachedEndpoints = CachedEndpoints
 module.exports.FsAccessPermission = FsAccessPermission
+module.exports.CollectStackTraces = CollectStackTraces
 module.exports.IncludeTraces = IncludeTraces
 module.exports.SolidityTestRunnerFactory = SolidityTestRunnerFactory
 module.exports.l1SolidityTestRunnerFactory = l1SolidityTestRunnerFactory

package/package.json

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

package/src/chains/generic.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use edr_eth::l1;
 use edr_generic::GenericChainSpec;
 use edr_napi_core::{
     logger::Logger,
@@ -31,7 +30,7 @@ impl SyncProviderFactory for GenericChainProviderFactory {
         )?;
 
         let provider_config =
-            edr_provider::ProviderConfig::<l1::SpecId>::try_from(provider_config)?;
+            edr_provider::ProviderConfig::<edr_chain_l1::Hardfork>::try_from(provider_config)?;
 
         let provider = edr_provider::Provider::<GenericChainSpec>::new(
             runtime.clone(),

package/src/chains/l1.rs

@@ -1,6 +1,6 @@
 use std::{str::FromStr, sync::Arc};
 
-use edr_eth::l1::{self, L1ChainSpec};
+use edr_chain_l1::L1ChainSpec;
 use edr_evm::eips::{
     eip2935::{HISTORY_STORAGE_ADDRESS, HISTORY_STORAGE_UNSUPPORTED_BYTECODE},
     eip4788::{BEACON_ROOTS_ADDRESS, BEACON_ROOTS_BYTECODE},
@@ -35,7 +35,7 @@ impl SyncProviderFactory for L1ProviderFactory {
             Logger::<L1ChainSpec, CurrentTime>::new(logger_config, Arc::clone(&contract_decoder))?;
 
         let provider_config =
-            edr_provider::ProviderConfig::<l1::SpecId>::try_from(provider_config)?;
+            edr_provider::ProviderConfig::<edr_chain_l1::Hardfork>::try_from(provider_config)?;
 
         let provider = edr_provider::Provider::<L1ChainSpec>::new(
             runtime.clone(),
@@ -52,7 +52,7 @@ impl SyncProviderFactory for L1ProviderFactory {
 }
 
 #[napi]
-pub const L1_CHAIN_TYPE: &str = edr_eth::l1::CHAIN_TYPE;
+pub const L1_CHAIN_TYPE: &str = edr_chain_l1::CHAIN_TYPE;
 
 #[napi(catch_unwind)]
 pub fn l1_genesis_state(hardfork: SpecId) -> Vec<AccountOverride> {
@@ -142,25 +142,25 @@ impl FromStr for SpecId {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            edr_eth::l1::hardfork::name::FRONTIER => Ok(SpecId::Frontier),
-            edr_eth::l1::hardfork::name::FRONTIER_THAWING => Ok(SpecId::FrontierThawing),
-            edr_eth::l1::hardfork::name::HOMESTEAD => Ok(SpecId::Homestead),
-            edr_eth::l1::hardfork::name::DAO_FORK => Ok(SpecId::DaoFork),
-            edr_eth::l1::hardfork::name::TANGERINE => Ok(SpecId::Tangerine),
-            edr_eth::l1::hardfork::name::SPURIOUS_DRAGON => Ok(SpecId::SpuriousDragon),
-            edr_eth::l1::hardfork::name::BYZANTIUM => Ok(SpecId::Byzantium),
-            edr_eth::l1::hardfork::name::CONSTANTINOPLE => Ok(SpecId::Constantinople),
-            edr_eth::l1::hardfork::name::PETERSBURG => Ok(SpecId::Petersburg),
-            edr_eth::l1::hardfork::name::ISTANBUL => Ok(SpecId::Istanbul),
-            edr_eth::l1::hardfork::name::MUIR_GLACIER => Ok(SpecId::MuirGlacier),
-            edr_eth::l1::hardfork::name::BERLIN => Ok(SpecId::Berlin),
-            edr_eth::l1::hardfork::name::LONDON => Ok(SpecId::London),
-            edr_eth::l1::hardfork::name::ARROW_GLACIER => Ok(SpecId::ArrowGlacier),
-            edr_eth::l1::hardfork::name::GRAY_GLACIER => Ok(SpecId::GrayGlacier),
-            edr_eth::l1::hardfork::name::MERGE => Ok(SpecId::Merge),
-            edr_eth::l1::hardfork::name::SHANGHAI => Ok(SpecId::Shanghai),
-            edr_eth::l1::hardfork::name::CANCUN => Ok(SpecId::Cancun),
-            edr_eth::l1::hardfork::name::PRAGUE => Ok(SpecId::Prague),
+            edr_chain_l1::hardfork::name::FRONTIER => Ok(SpecId::Frontier),
+            edr_chain_l1::hardfork::name::FRONTIER_THAWING => Ok(SpecId::FrontierThawing),
+            edr_chain_l1::hardfork::name::HOMESTEAD => Ok(SpecId::Homestead),
+            edr_chain_l1::hardfork::name::DAO_FORK => Ok(SpecId::DaoFork),
+            edr_chain_l1::hardfork::name::TANGERINE => Ok(SpecId::Tangerine),
+            edr_chain_l1::hardfork::name::SPURIOUS_DRAGON => Ok(SpecId::SpuriousDragon),
+            edr_chain_l1::hardfork::name::BYZANTIUM => Ok(SpecId::Byzantium),
+            edr_chain_l1::hardfork::name::CONSTANTINOPLE => Ok(SpecId::Constantinople),
+            edr_chain_l1::hardfork::name::PETERSBURG => Ok(SpecId::Petersburg),
+            edr_chain_l1::hardfork::name::ISTANBUL => Ok(SpecId::Istanbul),
+            edr_chain_l1::hardfork::name::MUIR_GLACIER => Ok(SpecId::MuirGlacier),
+            edr_chain_l1::hardfork::name::BERLIN => Ok(SpecId::Berlin),
+            edr_chain_l1::hardfork::name::LONDON => Ok(SpecId::London),
+            edr_chain_l1::hardfork::name::ARROW_GLACIER => Ok(SpecId::ArrowGlacier),
+            edr_chain_l1::hardfork::name::GRAY_GLACIER => Ok(SpecId::GrayGlacier),
+            edr_chain_l1::hardfork::name::MERGE => Ok(SpecId::Merge),
+            edr_chain_l1::hardfork::name::SHANGHAI => Ok(SpecId::Shanghai),
+            edr_chain_l1::hardfork::name::CANCUN => Ok(SpecId::Cancun),
+            edr_chain_l1::hardfork::name::PRAGUE => Ok(SpecId::Prague),
             _ => Err(napi::Error::new(
                 napi::Status::InvalidArg,
                 format!("The provided hardfork `{s}` is not supported."),
@@ -169,28 +169,28 @@ impl FromStr for SpecId {
     }
 }
 
-impl From<SpecId> for edr_eth::l1::SpecId {
+impl From<SpecId> for edr_chain_l1::Hardfork {
     fn from(value: SpecId) -> Self {
         match value {
-            SpecId::Frontier => edr_eth::l1::SpecId::FRONTIER,
-            SpecId::FrontierThawing => edr_eth::l1::SpecId::FRONTIER_THAWING,
-            SpecId::Homestead => edr_eth::l1::SpecId::HOMESTEAD,
-            SpecId::DaoFork => edr_eth::l1::SpecId::DAO_FORK,
-            SpecId::Tangerine => edr_eth::l1::SpecId::TANGERINE,
-            SpecId::SpuriousDragon => edr_eth::l1::SpecId::SPURIOUS_DRAGON,
-            SpecId::Byzantium => edr_eth::l1::SpecId::BYZANTIUM,
-            SpecId::Constantinople => edr_eth::l1::SpecId::CONSTANTINOPLE,
-            SpecId::Petersburg => edr_eth::l1::SpecId::PETERSBURG,
-            SpecId::Istanbul => edr_eth::l1::SpecId::ISTANBUL,
-            SpecId::MuirGlacier => edr_eth::l1::SpecId::MUIR_GLACIER,
-            SpecId::Berlin => edr_eth::l1::SpecId::BERLIN,
-            SpecId::London => edr_eth::l1::SpecId::LONDON,
-            SpecId::ArrowGlacier => edr_eth::l1::SpecId::ARROW_GLACIER,
-            SpecId::GrayGlacier => edr_eth::l1::SpecId::GRAY_GLACIER,
-            SpecId::Merge => edr_eth::l1::SpecId::MERGE,
-            SpecId::Shanghai => edr_eth::l1::SpecId::SHANGHAI,
-            SpecId::Cancun => edr_eth::l1::SpecId::CANCUN,
-            SpecId::Prague => edr_eth::l1::SpecId::PRAGUE,
+            SpecId::Frontier => edr_chain_l1::Hardfork::FRONTIER,
+            SpecId::FrontierThawing => edr_chain_l1::Hardfork::FRONTIER_THAWING,
+            SpecId::Homestead => edr_chain_l1::Hardfork::HOMESTEAD,
+            SpecId::DaoFork => edr_chain_l1::Hardfork::DAO_FORK,
+            SpecId::Tangerine => edr_chain_l1::Hardfork::TANGERINE,
+            SpecId::SpuriousDragon => edr_chain_l1::Hardfork::SPURIOUS_DRAGON,
+            SpecId::Byzantium => edr_chain_l1::Hardfork::BYZANTIUM,
+            SpecId::Constantinople => edr_chain_l1::Hardfork::CONSTANTINOPLE,
+            SpecId::Petersburg => edr_chain_l1::Hardfork::PETERSBURG,
+            SpecId::Istanbul => edr_chain_l1::Hardfork::ISTANBUL,
+            SpecId::MuirGlacier => edr_chain_l1::Hardfork::MUIR_GLACIER,
+            SpecId::Berlin => edr_chain_l1::Hardfork::BERLIN,
+            SpecId::London => edr_chain_l1::Hardfork::LONDON,
+            SpecId::ArrowGlacier => edr_chain_l1::Hardfork::ARROW_GLACIER,
+            SpecId::GrayGlacier => edr_chain_l1::Hardfork::GRAY_GLACIER,
+            SpecId::Merge => edr_chain_l1::Hardfork::MERGE,
+            SpecId::Shanghai => edr_chain_l1::Hardfork::SHANGHAI,
+            SpecId::Cancun => edr_chain_l1::Hardfork::CANCUN,
+            SpecId::Prague => edr_chain_l1::Hardfork::PRAGUE,
         }
     }
 }
@@ -206,25 +206,25 @@ pub fn l1_hardfork_from_string(hardfork: String) -> napi::Result<SpecId> {
 #[napi(catch_unwind)]
 pub fn l1_hardfork_to_string(harfork: SpecId) -> &'static str {
     match harfork {
-        SpecId::Frontier => edr_eth::l1::hardfork::name::FRONTIER,
-        SpecId::FrontierThawing => edr_eth::l1::hardfork::name::FRONTIER_THAWING,
-        SpecId::Homestead => edr_eth::l1::hardfork::name::HOMESTEAD,
-        SpecId::DaoFork => edr_eth::l1::hardfork::name::DAO_FORK,
-        SpecId::Tangerine => edr_eth::l1::hardfork::name::TANGERINE,
-        SpecId::SpuriousDragon => edr_eth::l1::hardfork::name::SPURIOUS_DRAGON,
-        SpecId::Byzantium => edr_eth::l1::hardfork::name::BYZANTIUM,
-        SpecId::Constantinople => edr_eth::l1::hardfork::name::CONSTANTINOPLE,
-        SpecId::Petersburg => edr_eth::l1::hardfork::name::PETERSBURG,
-        SpecId::Istanbul => edr_eth::l1::hardfork::name::ISTANBUL,
-        SpecId::MuirGlacier => edr_eth::l1::hardfork::name::MUIR_GLACIER,
-        SpecId::Berlin => edr_eth::l1::hardfork::name::BERLIN,
-        SpecId::London => edr_eth::l1::hardfork::name::LONDON,
-        SpecId::ArrowGlacier => edr_eth::l1::hardfork::name::ARROW_GLACIER,
-        SpecId::GrayGlacier => edr_eth::l1::hardfork::name::GRAY_GLACIER,
-        SpecId::Merge => edr_eth::l1::hardfork::name::MERGE,
-        SpecId::Shanghai => edr_eth::l1::hardfork::name::SHANGHAI,
-        SpecId::Cancun => edr_eth::l1::hardfork::name::CANCUN,
-        SpecId::Prague => edr_eth::l1::hardfork::name::PRAGUE,
+        SpecId::Frontier => edr_chain_l1::hardfork::name::FRONTIER,
+        SpecId::FrontierThawing => edr_chain_l1::hardfork::name::FRONTIER_THAWING,
+        SpecId::Homestead => edr_chain_l1::hardfork::name::HOMESTEAD,
+        SpecId::DaoFork => edr_chain_l1::hardfork::name::DAO_FORK,
+        SpecId::Tangerine => edr_chain_l1::hardfork::name::TANGERINE,
+        SpecId::SpuriousDragon => edr_chain_l1::hardfork::name::SPURIOUS_DRAGON,
+        SpecId::Byzantium => edr_chain_l1::hardfork::name::BYZANTIUM,
+        SpecId::Constantinople => edr_chain_l1::hardfork::name::CONSTANTINOPLE,
+        SpecId::Petersburg => edr_chain_l1::hardfork::name::PETERSBURG,
+        SpecId::Istanbul => edr_chain_l1::hardfork::name::ISTANBUL,
+        SpecId::MuirGlacier => edr_chain_l1::hardfork::name::MUIR_GLACIER,
+        SpecId::Berlin => edr_chain_l1::hardfork::name::BERLIN,
+        SpecId::London => edr_chain_l1::hardfork::name::LONDON,
+        SpecId::ArrowGlacier => edr_chain_l1::hardfork::name::ARROW_GLACIER,
+        SpecId::GrayGlacier => edr_chain_l1::hardfork::name::GRAY_GLACIER,
+        SpecId::Merge => edr_chain_l1::hardfork::name::MERGE,
+        SpecId::Shanghai => edr_chain_l1::hardfork::name::SHANGHAI,
+        SpecId::Cancun => edr_chain_l1::hardfork::name::CANCUN,
+        SpecId::Prague => edr_chain_l1::hardfork::name::PRAGUE,
     }
 }
 
@@ -240,7 +240,7 @@ macro_rules! export_spec_id {
     ($($variant:ident),*) => {
         $(
             #[napi]
-            pub const $variant: &str = edr_eth::l1::hardfork::name::$variant;
+            pub const $variant: &str = edr_chain_l1::hardfork::name::$variant;
         )*
     };
 }

package/src/chains/op.rs

@@ -6,7 +6,7 @@ use edr_napi_core::{
     provider::{SyncProvider, SyncProviderFactory},
     subscription::subscriber_callback_for_chain_spec,
 };
-use edr_op::{predeploys::GAS_PRICE_ORACLE_ADDRESS, OpChainSpec, OpSpecId};
+use edr_op::{predeploys::GAS_PRICE_ORACLE_ADDRESS, OpChainSpec};
 use edr_provider::time::CurrentTime;
 use edr_solidity::contract_decoder::ContractDecoder;
 use napi::{
@@ -34,7 +34,8 @@ impl SyncProviderFactory for OpProviderFactory {
         let logger =
             Logger::<OpChainSpec, CurrentTime>::new(logger_config, Arc::clone(&contract_decoder))?;
 
-        let provider_config = edr_provider::ProviderConfig::<OpSpecId>::try_from(provider_config)?;
+        let provider_config =
+            edr_provider::ProviderConfig::<edr_op::Hardfork>::try_from(provider_config)?;
 
         let provider = edr_provider::Provider::<OpChainSpec>::new(
             runtime.clone(),
@@ -63,17 +64,17 @@ pub enum OpHardfork {
     Isthmus = 107,
 }
 
-impl From<OpHardfork> for OpSpecId {
+impl From<OpHardfork> for edr_op::Hardfork {
     fn from(hardfork: OpHardfork) -> Self {
         match hardfork {
-            OpHardfork::Bedrock => OpSpecId::BEDROCK,
-            OpHardfork::Regolith => OpSpecId::REGOLITH,
-            OpHardfork::Canyon => OpSpecId::CANYON,
-            OpHardfork::Ecotone => OpSpecId::ECOTONE,
-            OpHardfork::Fjord => OpSpecId::FJORD,
-            OpHardfork::Granite => OpSpecId::GRANITE,
-            OpHardfork::Holocene => OpSpecId::HOLOCENE,
-            OpHardfork::Isthmus => OpSpecId::ISTHMUS,
+            OpHardfork::Bedrock => edr_op::Hardfork::BEDROCK,
+            OpHardfork::Regolith => edr_op::Hardfork::REGOLITH,
+            OpHardfork::Canyon => edr_op::Hardfork::CANYON,
+            OpHardfork::Ecotone => edr_op::Hardfork::ECOTONE,
+            OpHardfork::Fjord => edr_op::Hardfork::FJORD,
+            OpHardfork::Granite => edr_op::Hardfork::GRANITE,
+            OpHardfork::Holocene => edr_op::Hardfork::HOLOCENE,
+            OpHardfork::Isthmus => edr_op::Hardfork::ISTHMUS,
         }
     }
 }
@@ -335,10 +336,10 @@ pub fn op_provider_factory() -> ProviderFactory {
     factory.into()
 }
 
-fn gas_price_oracle_override(hardfork: OpSpecId) -> AccountOverride {
-    if hardfork >= OpSpecId::ISTHMUS {
+fn gas_price_oracle_override(hardfork: edr_op::Hardfork) -> AccountOverride {
+    if hardfork >= edr_op::Hardfork::ISTHMUS {
         gas_price_oracle_isthmus()
-    } else if hardfork >= OpSpecId::FJORD {
+    } else if hardfork >= edr_op::Hardfork::FJORD {
         gas_price_oracle_fjord()
     } else {
         gas_price_oracle_ecotone()