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

package/src/solidity_tests/l1.rs

@@ -8,7 +8,7 @@ use edr_napi_core::solidity::{
 use edr_solidity::artifacts::ArtifactId;
 use edr_solidity_tests::{
     contracts::ContractsByArtifact, decode::RevertDecoder, evm_context::L1EvmBuilder,
-    multi_runner::TestContract, revm::context::TxEnv, MultiContractRunner,
+    multi_runner::TestContract, MultiContractRunner,
 };
 use napi::tokio;
 use napi_derive::napi;
@@ -33,14 +33,14 @@ impl SyncTestRunnerFactory for L1TestRunnerFactory {
         let runner = tokio::task::block_in_place(|| {
             runtime
                 .block_on(MultiContractRunner::<
-                    edr_eth::l1::BlockEnv,
+                    edr_chain_l1::BlockEnv,
                     (),
                     L1EvmBuilder,
-                    edr_eth::l1::HaltReason,
-                    edr_eth::l1::SpecId,
+                    edr_chain_l1::HaltReason,
+                    edr_chain_l1::Hardfork,
                     _,
-                    edr_eth::l1::InvalidTransaction,
-                    TxEnv,
+                    edr_chain_l1::InvalidTransaction,
+                    edr_chain_l1::TxEnv,
                 >::new(
                     config.try_into()?,
                     contracts,

package/src/solidity_tests/op.rs

@@ -34,14 +34,14 @@ impl SyncTestRunnerFactory for OpTestRunnerFactory {
         let runner = tokio::task::block_in_place(|| {
             runtime
                 .block_on(MultiContractRunner::<
-                    edr_eth::l1::BlockEnv,
+                    edr_op::BlockEnv,
                     _,
                     OpEvmBuilder,
-                    edr_op::OpHaltReason,
-                    edr_op::OpSpecId,
+                    edr_op::HaltReason,
+                    edr_op::Hardfork,
                     _,
                     edr_op::transaction::InvalidTransaction,
-                    edr_op::transaction::OpTxEnv<edr_eth::l1::TxEnv>,
+                    edr_op::transaction::OpTxEnv<edr_chain_l1::TxEnv>,
                 >::new(
                     config.try_into()?,
                     contracts,

package/src/solidity_tests/runner.rs

@@ -1,6 +1,6 @@
 use std::sync::{Mutex, OnceLock};
 
-use edr_eth::spec::HaltReasonTrait;
+use edr_evm_spec::HaltReasonTrait;
 use edr_napi_core::solidity::config::TracingConfigWithBuffers;
 use edr_solidity::{
     artifacts::BuildInfoConfigWithBuffers,

package/src/trace/exit.rs

@@ -3,6 +3,7 @@
 
 use std::fmt;
 
+use edr_evm_spec::EvmHaltReason;
 use napi_derive::napi;
 
 #[napi]
@@ -50,20 +51,20 @@ impl fmt::Display for ExitCode {
 }
 
 #[allow(clippy::fallible_impl_from)] // naively ported for now
-impl From<edr_solidity::exit_code::ExitCode<edr_eth::l1::HaltReason>> for ExitCode {
-    fn from(code: edr_solidity::exit_code::ExitCode<edr_eth::l1::HaltReason>) -> Self {
+impl From<edr_solidity::exit_code::ExitCode<EvmHaltReason>> for ExitCode {
+    fn from(code: edr_solidity::exit_code::ExitCode<EvmHaltReason>) -> Self {
         use edr_solidity::exit_code::ExitCode;
 
         match code {
             ExitCode::Success => Self::SUCCESS,
             ExitCode::Revert => Self::REVERT,
-            ExitCode::Halt(edr_eth::l1::HaltReason::OutOfGas(_)) => Self::OUT_OF_GAS,
-            ExitCode::Halt(edr_eth::l1::HaltReason::OpcodeNotFound | edr_eth::l1::HaltReason::InvalidFEOpcode
+            ExitCode::Halt(EvmHaltReason::OutOfGas(_)) => Self::OUT_OF_GAS,
+            ExitCode::Halt(EvmHaltReason::OpcodeNotFound | EvmHaltReason::InvalidFEOpcode
               // Returned when an opcode is not implemented for the hardfork
-              | edr_eth::l1::HaltReason::NotActivated) => Self::INVALID_OPCODE,
-            ExitCode::Halt(edr_eth::l1::HaltReason::StackUnderflow) => Self::STACK_UNDERFLOW,
-            ExitCode::Halt(edr_eth::l1::HaltReason::CreateContractSizeLimit) => Self::CODESIZE_EXCEEDS_MAXIMUM,
-            ExitCode::Halt(edr_eth::l1::HaltReason::CreateCollision) => Self::CREATE_COLLISION,
+              | EvmHaltReason::NotActivated) => Self::INVALID_OPCODE,
+            ExitCode::Halt(EvmHaltReason::StackUnderflow) => Self::STACK_UNDERFLOW,
+            ExitCode::Halt(EvmHaltReason::CreateContractSizeLimit) => Self::CODESIZE_EXCEEDS_MAXIMUM,
+            ExitCode::Halt(EvmHaltReason::CreateCollision) => Self::CREATE_COLLISION,
             _ => Self::UNKNOWN_HALT_REASON,
         }
     }

package/src/trace/return_data.rs

@@ -57,10 +57,17 @@ impl ReturnData {
             return Ok(String::new());
         }
 
+        if !self.is_error_return_data() {
+            return Err(napi::Error::new(
+                napi::Status::InvalidArg,
+                "VM Exception while processing transaction: Expected return data to be a Error(string)",
+            ));
+        }
+
         let result = Error::abi_decode(&self.value[..]).map_err(|_err| {
             napi::Error::new(
                 napi::Status::InvalidArg,
-                "Expected return data to be a Error(string) and contain a valid string",
+                "VM Exception while processing transaction: Expected return data to contain a valid string",
             )
         })?;
 
@@ -69,10 +76,17 @@ impl ReturnData {
 
     #[napi(catch_unwind)]
     pub fn decode_panic(&self) -> napi::Result<BigInt> {
+        if !self.is_panic_return_data() {
+            return Err(napi::Error::new(
+                napi::Status::InvalidArg,
+                "VM Exception while processing transaction: Expected return data to be a Panic(uint256)",
+            ));
+        }
+
         let result = Panic::abi_decode(&self.value[..]).map_err(|_err| {
             napi::Error::new(
                 napi::Status::InvalidArg,
-                "Expected return data to be a Error(string) and contain a valid string",
+                "VM Exception while processing transaction: Expected return data to contain a valid uint256",
             )
         })?;
 

package/src/trace.rs

@@ -7,8 +7,9 @@
 
 use std::sync::Arc;
 
-use edr_eth::{bytecode::opcode::OpCode, l1};
+use edr_eth::bytecode::opcode::OpCode;
 use edr_evm::trace::BeforeMessage;
+use edr_evm_spec::EvmHaltReason;
 use napi::bindgen_prelude::{BigInt, Either3, Uint8Array};
 use napi_derive::napi;
 
@@ -161,11 +162,11 @@ pub struct TracingMessageResult {
 #[napi]
 #[derive(Clone)]
 pub struct RawTrace {
-    inner: Arc<edr_evm::trace::Trace<l1::HaltReason>>,
+    inner: Arc<edr_evm::trace::Trace<EvmHaltReason>>,
 }
 
-impl From<Arc<edr_evm::trace::Trace<l1::HaltReason>>> for RawTrace {
-    fn from(value: Arc<edr_evm::trace::Trace<l1::HaltReason>>) -> Self {
+impl From<Arc<edr_evm::trace::Trace<EvmHaltReason>>> for RawTrace {
+    fn from(value: Arc<edr_evm::trace::Trace<EvmHaltReason>>) -> Self {
         Self { inner: value }
     }
 }