@nomicfoundation/edr 0.12.0-next.16 → 0.12.0-next.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.12.0-next.16",
+  "version": "0.12.0-next.18",
   "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.16",
-    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.16",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.16",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.16",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.16",
-    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.16",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.16"
+    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.18",
+    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.18",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.18",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.18",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.18",
+    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.18",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.18"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/chains/l1.rs

@@ -238,7 +238,7 @@ pub fn l1_hardfork_to_string(harfork: SpecId) -> &'static str {
 /// The returned value will be updated after each network upgrade.
 #[napi]
 pub fn l1_hardfork_latest() -> SpecId {
-    SpecId::Prague
+    SpecId::Osaka
 }
 
 macro_rules! export_spec_id {

package/src/chains/op.rs

@@ -136,7 +136,7 @@ pub fn op_hardfork_to_string(hardfork: OpHardfork) -> &'static str {
 /// The returned value will be updated after each network upgrade.
 #[napi(catch_unwind)]
 pub fn op_latest_hardfork() -> OpHardfork {
-    OpHardfork::Holocene
+    OpHardfork::Isthmus
 }
 
 #[napi]

package/src/mock/time.rs

@@ -2,10 +2,10 @@ use std::sync::Arc;
 
 use edr_chain_spec::ChainSpec;
 use edr_chain_spec_block::BlockChainSpec;
+use edr_chain_spec_rpc::RpcBlockChainSpec;
 use edr_generic::GenericChainSpec;
 use edr_napi_core::logger::Logger;
 use edr_primitives::B256;
-use edr_rpc_spec::RpcBlockChainSpec;
 use napi::{bindgen_prelude::BigInt, tokio::runtime, Env, JsObject};
 use napi_derive::napi;
 

package/src/result.rs

@@ -19,17 +19,17 @@ pub enum SuccessReason {
     SelfDestruct,
 }
 
-impl From<edr_evm_spec::result::SuccessReason> for SuccessReason {
-    fn from(eval: edr_evm_spec::result::SuccessReason) -> Self {
+impl From<edr_chain_spec_evm::result::SuccessReason> for SuccessReason {
+    fn from(eval: edr_chain_spec_evm::result::SuccessReason) -> Self {
         match eval {
-            edr_evm_spec::result::SuccessReason::Stop => Self::Stop,
-            edr_evm_spec::result::SuccessReason::Return => Self::Return,
-            edr_evm_spec::result::SuccessReason::SelfDestruct => Self::SelfDestruct,
+            edr_chain_spec_evm::result::SuccessReason::Stop => Self::Stop,
+            edr_chain_spec_evm::result::SuccessReason::Return => Self::Return,
+            edr_chain_spec_evm::result::SuccessReason::SelfDestruct => Self::SelfDestruct,
         }
     }
 }
 
-impl From<SuccessReason> for edr_evm_spec::result::SuccessReason {
+impl From<SuccessReason> for edr_chain_spec_evm::result::SuccessReason {
     fn from(value: SuccessReason) -> Self {
         match value {
             SuccessReason::Stop => Self::Stop,
@@ -159,7 +159,7 @@ impl From<&AfterMessage<EvmHaltReason>> for ExecutionResult {
         } = value;
 
         let result = match execution_result {
-            edr_evm_spec::result::ExecutionResult::Success {
+            edr_chain_spec_evm::result::ExecutionResult::Success {
                 reason,
                 gas_used,
                 gas_refunded,
@@ -174,12 +174,12 @@ impl From<&AfterMessage<EvmHaltReason>> for ExecutionResult {
                     gas_refunded: BigInt::from(*gas_refunded),
                     logs,
                     output: match output {
-                        edr_evm_spec::result::Output::Call(return_value) => {
+                        edr_chain_spec_evm::result::Output::Call(return_value) => {
                             let return_value = Uint8Array::with_data_copied(return_value);
 
                             Either::A(CallOutput { return_value })
                         }
-                        edr_evm_spec::result::Output::Create(return_value, address) => {
+                        edr_chain_spec_evm::result::Output::Create(return_value, address) => {
                             let return_value = Uint8Array::with_data_copied(return_value);
 
                             Either::B(CreateOutput {
@@ -190,7 +190,7 @@ impl From<&AfterMessage<EvmHaltReason>> for ExecutionResult {
                     },
                 })
             }
-            edr_evm_spec::result::ExecutionResult::Revert { gas_used, output } => {
+            edr_chain_spec_evm::result::ExecutionResult::Revert { gas_used, output } => {
                 let output = Uint8Array::with_data_copied(output);
 
                 Either3::B(RevertResult {
@@ -198,7 +198,7 @@ impl From<&AfterMessage<EvmHaltReason>> for ExecutionResult {
                     output,
                 })
             }
-            edr_evm_spec::result::ExecutionResult::Halt { reason, gas_used } => {
+            edr_chain_spec_evm::result::ExecutionResult::Halt { reason, gas_used } => {
                 Either3::C(HaltResult {
                     reason: ExceptionalHalt::from(reason.clone()),
                     gas_used: BigInt::from(*gas_used),