@nomicfoundation/edr 0.12.0-next.31 → 0.12.0-next.33

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/index.d.ts

@@ -264,9 +264,29 @@ export interface IntervalRange {
 /** Configuration for the provider's miner. */
 export interface MiningConfig {
   autoMine: boolean
+  /**
+   * The block gas limit to use for mining a block.
+   *
+   * When not set, enforcement of the block gas limit is disabled in the mem
+   * pool, miner, and REVM.
+   */
+  blockGasLimit?: bigint
   interval?: bigint | IntervalRange
   memPool: MemPoolConfig
 }
+/** Configuration for a locally mined blockchain. */
+export interface LocalConfig {
+  /**
+   * The blob gas used for the genesis block, introduced in [EIP-4844].
+   *
+   * [EIP-4844]: https://eips.ethereum.org/EIPS/eip-4844
+   */
+  genesisBlobGas?: BlobGas
+  /** The block gas limit of the genesis block. */
+  genesisBlockGasLimit: bigint
+  /** The date, in seconds since the Unix epoch, of the genesis block. */
+  genesisBlockTime?: bigint
+}
 /** Configuration for runtime observability. */
 export interface ObservabilityConfig {
   /** If present, configures runtime observability to collect code coverage. */
@@ -302,17 +322,15 @@ export interface ProviderConfig {
    * will be used.
    */
   baseFeeConfig?: Array<BaseFeeParamActivation>
-  /** The gas limit of each block */
-  blockGasLimit: bigint
   /** The chain ID of the blockchain */
   chainId: bigint
   /** The address of the coinbase */
   coinbase: Uint8Array
   /**
-   * The configuration for forking a blockchain. If not provided, a local
-   * blockchain will be created
+   * The default transaction gas limit to use for RPC call and transaction
+   * requests that do not specify a `gas` value.
    */
-  fork?: ForkConfig
+  defaultTransactionGasLimit: bigint
   /** The genesis state of the blockchain */
   genesisState: Array<AccountOverride>
   /** The hardfork of the blockchain */
@@ -322,10 +340,6 @@ export interface ProviderConfig {
    * transactions and later
    */
   initialBaseFeePerGas?: bigint
-  /** The initial blob gas of the blockchain. Required for EIP-4844 */
-  initialBlobGas?: BlobGas
-  /** The initial date of the blockchain, in seconds since the Unix epoch */
-  initialDate?: bigint
   /**
    * The initial parent beacon block root of the blockchain. Required for
    * EIP-4788
@@ -335,6 +349,8 @@ export interface ProviderConfig {
   minGasPrice: bigint
   /** The configuration for the miner */
   mining: MiningConfig
+  /** The network configuration for the provider. */
+  network: ForkConfig | LocalConfig
   /** The network ID of the blockchain */
   networkId: bigint
   /** The configuration for the provider's observability */
@@ -346,11 +362,17 @@ export interface ProviderConfig {
   /**
    * Transaction gas cap, introduced in [EIP-7825].
    *
-   * When not set, will default to value defined by the used hardfork
+   * Integer values should be larger than zero.
+   *
+   * When `false`, enforcement of the transaction gas cap is disabled and
+   * transactions with any `gas` value are accepted by the mempool and
+   * executed without REVM's transaction gas cap check.
+   *
+   * When not set, a hardfork-specific default value will be used.
    *
    * [EIP-7825]: https://eips.ethereum.org/EIPS/eip-7825
    */
-  transactionGasCap?: bigint
+  transactionGasCap?: bigint | false
 }
 /** Tracing config for Solidity stack trace generation. */
 export interface TracingConfigWithBuffers {
@@ -460,11 +482,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. */
@@ -718,10 +742,20 @@ export interface SolidityTestRunnerConfigArgs {
    */
   disableBlockGasLimit?: boolean
   /**
-   * Whether to enable the EIP-7825 (Osaka) transaction gas limit cap.
+   * Transaction gas cap, introduced in [EIP-7825].
+   *
+   * When not set, defaults to the value defined by the used hardfork.
+   *
+   * [EIP-7825]: https://eips.ethereum.org/EIPS/eip-7825
+   */
+  transactionGasCap?: bigint
+  /**
+   * Whether to disable the [EIP-7825] transaction gas cap.
    * Defaults to false.
+   *
+   * [EIP-7825]: https://eips.ethereum.org/EIPS/eip-7825
    */
-  enableTxGasLimitCap?: boolean
+  disableTransactionGasCap?: boolean
   /**
    * The memory limit of the EVM in bytes.
    * Defaults to `33_554_432` (2^25 = 32MiB).
@@ -795,6 +829,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 {

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.31",
+  "version": "0.12.0-next.33",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",
@@ -31,12 +31,13 @@
   },
   "exports": {
     ".": "./index.js",
-    "./solidity-tests": "./dist/src/ts/solidity_tests.js"
+    "./coverage": "./dist/src/ts/coverage.js"
   },
   "files": [
     "index.js",
     "index.d.ts",
-    "src/"
+    "dist/src/",
+    "coverage.sol"
   ],
   "license": "MIT",
   "main": "index.js",
@@ -58,13 +59,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.31",
-    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.31",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.31",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.31",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.31",
-    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.31",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.31"
+    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.33",
+    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.33",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.33",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.33",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.33",
+    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.33",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.33"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/account.rs

@@ -1,124 +0,0 @@
-use derive_more::Debug;
-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;
-
-use crate::{
-    cast::TryCast,
-    serde::{
-        serialize_bigint_as_struct, serialize_optional_bigint_as_struct,
-        serialize_optional_uint8array_as_hex, serialize_uint8array_as_hex,
-    },
-};
-
-/// Specification of overrides for an account and its storage.
-#[napi(object)]
-#[derive(Clone, Debug, serde::Serialize)]
-pub struct AccountOverride {
-    /// The account's address
-    #[debug("{}", hex::encode(address))]
-    #[serde(serialize_with = "serialize_uint8array_as_hex")]
-    pub address: Uint8Array,
-    /// If present, the overwriting balance.
-    #[serde(serialize_with = "serialize_optional_bigint_as_struct")]
-    pub balance: Option<BigInt>,
-    /// If present, the overwriting nonce.
-    #[serde(serialize_with = "serialize_optional_bigint_as_struct")]
-    pub nonce: Option<BigInt>,
-    /// If present, the overwriting code.
-    #[debug("{:?}", code.as_ref().map(hex::encode))]
-    #[serde(serialize_with = "serialize_optional_uint8array_as_hex")]
-    pub code: Option<Uint8Array>,
-    /// BEWARE: This field is not supported yet. See <https://github.com/NomicFoundation/edr/issues/911>
-    ///
-    /// If present, the overwriting storage.
-    pub storage: Option<Vec<StorageSlot>>,
-}
-
-impl TryFrom<AccountOverride> for (Address, edr_provider::AccountOverride) {
-    type Error = napi::Error;
-
-    fn try_from(value: AccountOverride) -> Result<Self, Self::Error> {
-        let AccountOverride {
-            address,
-            balance,
-            nonce,
-            code,
-            storage,
-        } = value;
-        let storage = storage
-            .map(|storage| {
-                storage
-                    .into_iter()
-                    .map(|StorageSlot { index, value }| {
-                        let value = value.try_cast()?;
-                        let slot = EvmStorageSlot::new(value, 0);
-
-                        let index: U256 = index.try_cast()?;
-                        Ok((index, slot))
-                    })
-                    .collect::<napi::Result<_>>()
-            })
-            .transpose()?;
-
-        let account_override = edr_provider::AccountOverride {
-            balance: balance.map(TryCast::try_cast).transpose()?,
-            nonce: nonce.map(TryCast::try_cast).transpose()?,
-            code: code.map(TryCast::try_cast).transpose()?,
-            storage,
-        };
-
-        let address: Address = address.try_cast()?;
-
-        Ok((address, account_override))
-    }
-}
-
-impl TryFrom<AccountOverride> for Predeploy {
-    type Error = napi::Error;
-
-    fn try_from(value: AccountOverride) -> Result<Self, Self::Error> {
-        let (address, account_override) = value.try_into()?;
-
-        let storage = account_override.storage.unwrap_or_else(HashMap::default);
-        let balance = account_override.balance.unwrap_or(U256::ZERO);
-        let nonce = account_override.nonce.unwrap_or(0);
-        let code = account_override.code.ok_or_else(|| {
-            napi::Error::from_reason(format!("Predeploy with address '{address}' must have code"))
-        })?;
-
-        if code.is_empty() {
-            return Err(napi::Error::from_reason(
-                "Predeploy with address '{address}' must have non-empty code",
-            ));
-        }
-        let code_hash = code.hash_slow();
-
-        let account_info = AccountInfo {
-            balance,
-            nonce,
-            code_hash,
-            code: Some(code),
-        };
-
-        Ok(Self {
-            address,
-            account_info,
-            storage,
-        })
-    }
-}
-
-/// A description of a storage slot's state.
-#[napi(object)]
-#[derive(Clone, Debug, serde::Serialize)]
-pub struct StorageSlot {
-    /// The storage slot's index
-    #[serde(serialize_with = "serialize_bigint_as_struct")]
-    pub index: BigInt,
-    /// The storage slot's value
-    #[serde(serialize_with = "serialize_bigint_as_struct")]
-    pub value: BigInt,
-}

package/src/block.rs

@@ -1,28 +0,0 @@
-use napi::bindgen_prelude::BigInt;
-use napi_derive::napi;
-
-use crate::cast::TryCast;
-
-/// Information about the blob gas used in a block.
-#[napi(object)]
-pub struct BlobGas {
-    /// The total amount of blob gas consumed by the transactions within the
-    /// block.
-    pub gas_used: BigInt,
-    /// The running total of blob gas consumed in excess of the target, prior to
-    /// the block. Blocks with above-target blob gas consumption increase this
-    /// value, blocks with below-target blob gas consumption decrease it
-    /// (bounded at 0).
-    pub excess_gas: BigInt,
-}
-
-impl TryFrom<BlobGas> for edr_block_header::BlobGas {
-    type Error = napi::Error;
-
-    fn try_from(value: BlobGas) -> Result<Self, Self::Error> {
-        Ok(Self {
-            gas_used: BigInt::try_cast(value.gas_used)?,
-            excess_gas: BigInt::try_cast(value.excess_gas)?,
-        })
-    }
-}

package/src/call_override.rs

@@ -1,116 +0,0 @@
-use std::sync::mpsc::channel;
-
-use edr_primitives::{Address, Bytes};
-use napi::{
-    bindgen_prelude::{Promise, Uint8Array},
-    threadsafe_function::{
-        ErrorStrategy, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
-    },
-    tokio::runtime,
-    Env, JsFunction, Status,
-};
-use napi_derive::napi;
-
-use crate::cast::TryCast;
-
-/// The result of executing a call override.
-#[napi(object)]
-pub struct CallOverrideResult {
-    pub result: Uint8Array,
-    pub should_revert: bool,
-}
-
-impl TryCast<Option<edr_provider::CallOverrideResult>> for Option<CallOverrideResult> {
-    type Error = napi::Error;
-
-    fn try_cast(self) -> Result<Option<edr_provider::CallOverrideResult>, Self::Error> {
-        match self {
-            None => Ok(None),
-            Some(result) => Ok(Some(edr_provider::CallOverrideResult {
-                output: Bytes::copy_from_slice(&result.result),
-                should_revert: result.should_revert,
-            })),
-        }
-    }
-}
-
-struct CallOverrideCall {
-    contract_address: Address,
-    data: Bytes,
-}
-
-#[derive(Clone)]
-pub struct CallOverrideCallback {
-    call_override_callback_fn: ThreadsafeFunction<CallOverrideCall, ErrorStrategy::Fatal>,
-    runtime: runtime::Handle,
-}
-
-impl CallOverrideCallback {
-    pub fn new(
-        env: &Env,
-        call_override_callback: JsFunction,
-        runtime: runtime::Handle,
-    ) -> napi::Result<Self> {
-        let mut call_override_callback_fn = call_override_callback.create_threadsafe_function(
-            0,
-            |ctx: ThreadSafeCallContext<CallOverrideCall>| {
-                let address = ctx
-                    .env
-                    .create_arraybuffer_with_data(ctx.value.contract_address.to_vec())?
-                    .into_raw();
-
-                let data = ctx
-                    .env
-                    .create_arraybuffer_with_data(ctx.value.data.to_vec())?
-                    .into_raw();
-
-                Ok(vec![address, data])
-            },
-        )?;
-
-        // Maintain a weak reference to the function to avoid blocking the event loop
-        // from exiting.
-        call_override_callback_fn.unref(env)?;
-
-        Ok(Self {
-            call_override_callback_fn,
-            runtime,
-        })
-    }
-
-    pub fn call_override(
-        &self,
-        contract_address: Address,
-        data: Bytes,
-    ) -> Option<edr_provider::CallOverrideResult> {
-        let (sender, receiver) = channel();
-
-        let runtime = self.runtime.clone();
-        let status = self.call_override_callback_fn.call_with_return_value(
-            CallOverrideCall {
-                contract_address,
-                data,
-            },
-            ThreadsafeFunctionCallMode::Blocking,
-            move |result: Promise<Option<CallOverrideResult>>| {
-                runtime.spawn(async move {
-                    let result = result.await?.try_cast();
-                    sender.send(result).map_err(|_error| {
-                        napi::Error::new(
-                            Status::GenericFailure,
-                            "Failed to send result from call_override_callback",
-                        )
-                    })
-                });
-                Ok(())
-            },
-        );
-
-        assert_eq!(status, Status::Ok, "Call override callback failed");
-
-        receiver
-            .recv()
-            .unwrap()
-            .expect("Failed call to call_override_callback")
-    }
-}