@nomicfoundation/edr 0.12.0-next.6 → 0.12.0-next.8

package/index.d.ts

@@ -169,11 +169,11 @@ export interface BaseFeeParamActivation {
   elasticityMultiplier: bigint
 }
 export interface BaseFeeActivationByBlockNumber {
-  /** The block number at which the base_fee_params is activated */
+  /** 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 */
+  /** The hardfork at which the `base_fee_params` is activated */
   hardfork: string
 }
 /** Specification of a chain with possible overrides. */
@@ -198,6 +198,16 @@ export interface CodeCoverageConfig {
    */
   onCollectedCoverageCallback: (coverageHits: Uint8Array[]) => Promise<void>
 }
+export interface GasReportConfig {
+  /**
+   * Gas reports are collected after a block is mined or `eth_call` is
+   * executed.
+   *
+   * Exceptions thrown in the callback will be propagated to the original
+   * caller.
+   */
+  onCollectedGasReportCallback: (gasReport: GasReport) => Promise<void>
+}
 /** Configuration for forking a blockchain */
 export interface ForkConfig {
   /**
@@ -258,6 +268,8 @@ export interface MiningConfig {
 export interface ObservabilityConfig {
   /** If present, configures runtime observability to collect code coverage. */
   codeCoverage?: CodeCoverageConfig
+  /** If present, configures runtime observability to collect gas reports. */
+  gasReport?: GasReportConfig
 }
 /** Configuration for a provider */
 export interface ProviderConfig {
@@ -273,7 +285,7 @@ export interface ProviderConfig {
    * 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
+   * 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
@@ -372,6 +384,27 @@ export interface DebugTraceLogItem {
   /** Map of all stored values with keys and values encoded as hex strings. */
   storage?: Record<string, string>
 }
+export interface GasReport {
+  contracts: Record<string, ContractGasReport>
+}
+export interface ContractGasReport {
+  deployments: Array<DeploymentGasReport>
+  functions: Record<string, Array<FunctionGasReport>>
+}
+export enum GasReportExecutionStatus {
+  Success = 0,
+  Revert = 1,
+  Halt = 2
+}
+export interface DeploymentGasReport {
+  gas: bigint
+  size: bigint
+  status: GasReportExecutionStatus
+}
+export interface FunctionGasReport {
+  gas: bigint
+  status: GasReportExecutionStatus
+}
 export interface InstrumentationResult {
   /** The generated source code with coverage instrumentation. */
   readonly source: string
@@ -644,7 +677,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
   /**
@@ -689,6 +722,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.
@@ -701,6 +736,13 @@ export interface SolidityTestRunnerConfigArgs {
    * match the pattern will be executed and reported as a test result.
    */
   testPattern?: string
+  /**
+   * Controls whether to generate a gas report after running the tests.
+   * Enabling this also enables collection of all traces and EVM isolation
+   * mode.
+   * Defaults to false.
+   */
+  generateGasReport?: boolean
 }
 /** Fuzz testing configuration */
 export interface FuzzConfigArgs {
@@ -865,6 +907,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.
@@ -948,21 +1003,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
@@ -971,13 +1026,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
 }
 /**
@@ -990,19 +1045,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
 }
 /**
@@ -1088,6 +1143,11 @@ export interface DecodedTraceParameters {
    */
   arguments: Array<string>
 }
+/** The result of a Solidity test run. */
+export interface SolidityTestResult {
+  /** Gas report, if it was generated. */
+  readonly gasReport?: GasReport
+}
 /** Configuration for subscriptions. */
 export interface SubscriptionConfig {
   /** Callback to be called when a new event is received. */
@@ -1348,22 +1408,43 @@ export interface Withdrawal {
   amount: bigint
 }
 export declare class EdrContext {
-  /**Creates a new [`EdrContext`] instance. Should only be called once! */
+  /** 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>
-  /**Registers a new provider factory for the provided chain type. */
+  /** Constructs a new provider with the provided configuration. */
+  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>
   /**
-   *Executes Solidity tests.
+   * Executes Solidity tests
    *
-   *The function will return as soon as test execution is started.
-   *The progress callback will be called with the results of each test
-   *suite. It is up to the caller to track how many times the callback
-   *is called to know when all tests are done.
-   */
-  runSolidityTests(chainType: string, artifacts: Array<Artifact>, testSuites: Array<ArtifactId>, configArgs: SolidityTestRunnerConfigArgs, tracingConfig: TracingConfigWithBuffers, onTestSuiteCompletedCallback: (result: SuiteResult) => void): Promise<void>
+   * The function will return a promise that resolves to a
+   * [`SolidityTestResult`].
+   *
+   * Arguments:
+   * - `chainType`: the same chain type that was passed to
+   *   `registerProviderFactory`.
+   * - `artifacts`: the project's compilation output artifacts. It's
+   *   important to include include all artifacts here, otherwise cheatcodes
+   *   that access artifacts and other functionality (e.g. auto-linking, gas
+   *   reports) can break.
+   * - `testSuites`: the test suite ids that specify which test suites to
+   *   execute. The test suite artifacts must be present in `artifacts`.
+   * - `configArgs`: solidity test runner configuration. See the struct docs
+   *   for details.
+   * - `tracingConfig`: the build infos used for stack trace generation.
+   *   These are lazily parsed and it's important that they're passed as
+   *   Uint8 arrays for performance.
+   * - `onTestSuiteCompletedCallback`: The progress callback will be called
+   *   with the results of each test suite as soon as it finished executing.
+   */
+  runSolidityTests(chainType: string, artifacts: Array<Artifact>, testSuites: Array<ArtifactId>, configArgs: SolidityTestRunnerConfigArgs, tracingConfig: TracingConfigWithBuffers, onTestSuiteCompletedCallback: (result: SuiteResult) => void): Promise<SolidityTestResult>
+}
+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. */
@@ -1385,7 +1466,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>
@@ -1398,35 +1481,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, GasReportExecutionStatus, 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,8 @@ module.exports.HOLOCENE = HOLOCENE
 module.exports.ISTHMUS = ISTHMUS
 module.exports.MineOrdering = MineOrdering
 module.exports.EdrContext = EdrContext
+module.exports.ContractDecoder = ContractDecoder
+module.exports.GasReportExecutionStatus = GasReportExecutionStatus
 module.exports.addStatementCoverageInstrumentation = addStatementCoverageInstrumentation
 module.exports.Precompile = Precompile
 module.exports.precompileP256Verify = precompileP256Verify
@@ -368,6 +370,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.6",
+  "version": "0.12.0-next.8",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",
@@ -58,15 +58,6 @@
   },
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
-  "optionalDependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.6",
-    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.6",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.6",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.6",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.6",
-    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.6",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.6"
-  },
   "scripts": {
     "artifacts": "napi artifacts",
     "build": "pnpm run build:publish",

package/src/account.rs

@@ -1,6 +1,7 @@
 use derive_more::Debug;
-use edr_eth::{hex, HashMap, U256};
+use edr_primitives::{hex, Address, HashMap, U256};
 use edr_solidity_tests::{backend::Predeploy, revm::state::AccountInfo};
+use edr_state_api::EvmStorageSlot;
 use napi::bindgen_prelude::{BigInt, Uint8Array};
 use napi_derive::napi;
 
@@ -36,7 +37,7 @@ pub struct AccountOverride {
     pub storage: Option<Vec<StorageSlot>>,
 }
 
-impl TryFrom<AccountOverride> for (edr_eth::Address, edr_provider::AccountOverride) {
+impl TryFrom<AccountOverride> for (Address, edr_provider::AccountOverride) {
     type Error = napi::Error;
 
     fn try_from(value: AccountOverride) -> Result<Self, Self::Error> {
@@ -53,9 +54,9 @@ impl TryFrom<AccountOverride> for (edr_eth::Address, edr_provider::AccountOverri
                     .into_iter()
                     .map(|StorageSlot { index, value }| {
                         let value = value.try_cast()?;
-                        let slot = edr_evm::state::EvmStorageSlot::new(value, 0);
+                        let slot = EvmStorageSlot::new(value, 0);
 
-                        let index: edr_eth::U256 = index.try_cast()?;
+                        let index: U256 = index.try_cast()?;
                         Ok((index, slot))
                     })
                     .collect::<napi::Result<_>>()
@@ -69,7 +70,7 @@ impl TryFrom<AccountOverride> for (edr_eth::Address, edr_provider::AccountOverri
             storage,
         };
 
-        let address: edr_eth::Address = address.try_cast()?;
+        let address: Address = address.try_cast()?;
 
         Ok((address, account_override))
     }

package/src/block.rs

@@ -16,7 +16,7 @@ pub struct BlobGas {
     pub excess_gas: BigInt,
 }
 
-impl TryFrom<BlobGas> for edr_eth::block::BlobGas {
+impl TryFrom<BlobGas> for edr_block_header::BlobGas {
     type Error = napi::Error;
 
     fn try_from(value: BlobGas) -> Result<Self, Self::Error> {

package/src/call_override.rs

@@ -1,6 +1,6 @@
 use std::sync::mpsc::channel;
 
-use edr_eth::{Address, Bytes};
+use edr_primitives::{Address, Bytes};
 use napi::{
     bindgen_prelude::{Promise, Uint8Array},
     threadsafe_function::{

package/src/cast.rs

@@ -1,4 +1,4 @@
-use edr_eth::{Address, Bytecode, Bytes, B256, B64, U256};
+use edr_primitives::{Address, Bytecode, Bytes, B256, B64, U256};
 use napi::{
     bindgen_prelude::{BigInt, Uint8Array},
     Status,

package/src/chains/op.rs

@@ -1,12 +1,18 @@
 use std::{str::FromStr, sync::Arc};
 
-use edr_eth::hex;
 use edr_napi_core::{
     logger::Logger,
     provider::{SyncProvider, SyncProviderFactory},
     subscription::subscriber_callback_for_chain_spec,
 };
-use edr_op::{predeploys::GAS_PRICE_ORACLE_ADDRESS, OpChainSpec};
+use edr_op::{
+    predeploys::{
+        gas_price_oracle_code_ecotone, gas_price_oracle_code_fjord, gas_price_oracle_code_isthmus,
+        GAS_PRICE_ORACLE_ADDRESS,
+    },
+    OpChainSpec,
+};
+use edr_primitives::hex;
 use edr_provider::time::CurrentTime;
 use edr_solidity::contract_decoder::ContractDecoder;
 use napi::{
@@ -347,16 +353,11 @@ fn gas_price_oracle_override(hardfork: edr_op::Hardfork) -> AccountOverride {
 }
 
 fn gas_price_oracle_ecotone() -> AccountOverride {
-    let gas_price_oracle_code = hex::decode(include_str!(
-        "../../data/op/predeploys/gas_price_oracle/ecotone.txt"
-    ))
-    .expect("The bytecode for the GasPriceOracle predeploy should be a valid hex string");
-
     AccountOverride {
         address: Uint8Array::with_data_copied(GAS_PRICE_ORACLE_ADDRESS),
         balance: None,
         nonce: None,
-        code: Some(gas_price_oracle_code.into()),
+        code: Some(gas_price_oracle_code_ecotone().into()),
         storage: Some(vec![StorageSlot {
             index: BigInt::from(0u64),
             // bool isEcotone = true
@@ -368,16 +369,11 @@ fn gas_price_oracle_ecotone() -> AccountOverride {
 }
 
 fn gas_price_oracle_fjord() -> AccountOverride {
-    let gas_price_oracle_code = hex::decode(include_str!(
-        "../../data/op/predeploys/gas_price_oracle/fjord.txt"
-    ))
-    .expect("The bytecode for the GasPriceOracle predeploy should be a valid hex string");
-
     AccountOverride {
         address: Uint8Array::with_data_copied(GAS_PRICE_ORACLE_ADDRESS),
         balance: None,
         nonce: None,
-        code: Some(gas_price_oracle_code.into()),
+        code: Some(gas_price_oracle_code_fjord().into()),
         storage: Some(vec![StorageSlot {
             index: BigInt::from(0u64),
             // bool isEcotone = true
@@ -390,16 +386,11 @@ fn gas_price_oracle_fjord() -> AccountOverride {
 }
 
 fn gas_price_oracle_isthmus() -> AccountOverride {
-    let gas_price_oracle_code = hex::decode(include_str!(
-        "../../data/op/predeploys/gas_price_oracle/isthmus.txt"
-    ))
-    .expect("The bytecode for the GasPriceOracle predeploy should be a valid hex string");
-
     AccountOverride {
         address: Uint8Array::with_data_copied(GAS_PRICE_ORACLE_ADDRESS),
         balance: None,
         nonce: None,
-        code: Some(gas_price_oracle_code.into()),
+        code: Some(gas_price_oracle_code_isthmus().into()),
         storage: Some(vec![StorageSlot {
             index: BigInt::from(0u64),
             // bool isEcotone = true