@nomicfoundation/edr 0.4.0 → 0.4.2

package/Cargo.toml

@@ -20,6 +20,7 @@ edr_defaults = { version = "0.3.5", path = "../edr_defaults" }
 edr_evm = { version = "0.3.5", path = "../edr_evm", features = ["tracing"]}
 edr_eth = { version = "0.3.5", path = "../edr_eth" }
 edr_provider = { version = "0.3.5", path = "../edr_provider" }
+edr_rpc_eth = { version = "0.3.5", path = "../edr_rpc_eth" }
 serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
 thiserror = { version = "1.0.37", default-features = false }
 tracing = { version = "0.1.37", default-features = false, features = ["std"] }
@@ -52,3 +53,6 @@ scenarios = ["rand"]
 
 [profile.release]
 lto = true
+
+[lints]
+workspace = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -46,13 +46,13 @@
     "node": ">= 18"
   },
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.4.0",
-    "@nomicfoundation/edr-darwin-x64": "0.4.0",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.4.0",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.4.0",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.4.0",
-    "@nomicfoundation/edr-linux-x64-musl": "0.4.0",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.4.0"
+    "@nomicfoundation/edr-darwin-arm64": "0.4.2",
+    "@nomicfoundation/edr-darwin-x64": "0.4.2",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.4.2",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.4.2",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.4.2",
+    "@nomicfoundation/edr-linux-x64-musl": "0.4.2",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.4.2"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/logger.rs

@@ -1,12 +1,17 @@
 use std::{fmt::Display, sync::mpsc::channel};
 
 use ansi_term::{Color, Style};
-use edr_eth::{transaction::Transaction, Bytes, B256, U256};
+use edr_eth::{
+    transaction::{self, Transaction},
+    Bytes, B256, U256,
+};
 use edr_evm::{
     blockchain::BlockchainError,
+    chain_spec::L1ChainSpec,
     precompile::{self, Precompiles},
     trace::{AfterMessage, TraceMessage},
-    ExecutableTransaction, ExecutionResult, SyncBlock,
+    transaction::SignedTransaction as _,
+    ExecutionResult, SyncBlock,
 };
 use edr_provider::{ProviderError, TransactionFailure};
 use itertools::izip;
@@ -135,7 +140,7 @@ impl edr_provider::Logger for Logger {
     fn log_call(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
         result: &edr_provider::CallResult,
     ) -> Result<(), Self::LoggerError> {
         self.collector.log_call(spec_id, transaction, result);
@@ -146,7 +151,7 @@ impl edr_provider::Logger for Logger {
     fn log_estimate_gas_failure(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
         failure: &edr_provider::EstimateGasFailure,
     ) -> Result<(), Self::LoggerError> {
         self.collector
@@ -176,7 +181,7 @@ impl edr_provider::Logger for Logger {
     fn log_send_transaction(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &edr_evm::ExecutableTransaction,
+        transaction: &edr_evm::transaction::Signed,
         mining_results: &[edr_provider::DebugMineBlockResult<Self::BlockchainError>],
     ) -> Result<(), Self::LoggerError> {
         self.collector
@@ -335,7 +340,7 @@ impl LogCollector {
     pub fn log_call(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
         result: &edr_provider::CallResult,
     ) {
         let edr_provider::CallResult {
@@ -350,7 +355,7 @@ impl LogCollector {
             logger.log_contract_and_function_name::<true>(spec_id, trace);
 
             logger.log_with_title("From", format!("0x{:x}", transaction.caller()));
-            if let Some(to) = transaction.to() {
+            if let Some(to) = transaction.kind().to() {
                 logger.log_with_title("To", format!("0x{to:x}"));
             }
             if transaction.value() > U256::ZERO {
@@ -370,7 +375,7 @@ impl LogCollector {
     pub fn log_estimate_gas(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
         result: &edr_provider::EstimateGasFailure,
     ) {
         let edr_provider::EstimateGasFailure {
@@ -387,7 +392,7 @@ impl LogCollector {
             );
 
             logger.log_with_title("From", format!("0x{:x}", transaction.caller()));
-            if let Some(to) = transaction.to() {
+            if let Some(to) = transaction.kind().to() {
                 logger.log_with_title("To", format!("0x{to:x}"));
             }
             logger.log_with_title("Value", wei_to_human_readable(transaction.value()));
@@ -491,7 +496,7 @@ impl LogCollector {
     pub fn log_send_transaction(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &edr_evm::ExecutableTransaction,
+        transaction: &edr_evm::transaction::Signed,
         mining_results: &[edr_provider::DebugMineBlockResult<BlockchainError>],
     ) {
         if !mining_results.is_empty() {
@@ -685,20 +690,20 @@ impl LogCollector {
         self.log_empty_line();
     }
 
-    fn log_block_hash(&mut self, block: &dyn SyncBlock<Error = BlockchainError>) {
+    fn log_block_hash(&mut self, block: &dyn SyncBlock<L1ChainSpec, Error = BlockchainError>) {
         let block_hash = block.hash();
 
         self.log(format!("Block: {block_hash}"));
     }
 
-    fn log_block_id(&mut self, block: &dyn SyncBlock<Error = BlockchainError>) {
+    fn log_block_id(&mut self, block: &dyn SyncBlock<L1ChainSpec, Error = BlockchainError>) {
         let block_number = block.header().number;
         let block_hash = block.hash();
 
         self.log(format!("Block #{block_number}: {block_hash}"));
     }
 
-    fn log_block_number(&mut self, block: &dyn SyncBlock<Error = BlockchainError>) {
+    fn log_block_number(&mut self, block: &dyn SyncBlock<L1ChainSpec, Error = BlockchainError>) {
         let block_number = block.header().number;
 
         self.log(format!("Mined block #{block_number}"));
@@ -708,7 +713,7 @@ impl LogCollector {
     fn log_block_transaction(
         &mut self,
         spec_id: edr_eth::SpecId,
-        transaction: &edr_evm::ExecutableTransaction,
+        transaction: &edr_evm::transaction::Signed,
         result: &edr_evm::ExecutionResult,
         trace: &edr_evm::trace::Trace,
         console_log_inputs: &[Bytes],
@@ -727,7 +732,7 @@ impl LogCollector {
         self.indented(|logger| {
             logger.log_contract_and_function_name::<false>(spec_id, trace);
             logger.log_with_title("From", format!("0x{:x}", transaction.caller()));
-            if let Some(to) = transaction.to() {
+            if let Some(to) = transaction.kind().to() {
                 logger.log_with_title("To", format!("0x{to:x}"));
             }
             logger.log_with_title("Value", wei_to_human_readable(transaction.value()));
@@ -881,7 +886,7 @@ impl LogCollector {
         }
     }
 
-    fn log_empty_block(&mut self, block: &dyn SyncBlock<Error = BlockchainError>) {
+    fn log_empty_block(&mut self, block: &dyn SyncBlock<L1ChainSpec, Error = BlockchainError>) {
         let block_header = block.header();
         let block_number = block_header.number;
 
@@ -906,7 +911,7 @@ impl LogCollector {
 
     fn log_hardhat_mined_empty_block(
         &mut self,
-        block: &dyn SyncBlock<Error = BlockchainError>,
+        block: &dyn SyncBlock<L1ChainSpec, Error = BlockchainError>,
         empty_blocks_range_start: Option<u64>,
     ) {
         self.indented(|logger| {
@@ -1054,7 +1059,7 @@ impl LogCollector {
         &mut self,
         spec_id: edr_eth::SpecId,
         block_result: &edr_provider::DebugMineBlockResult<BlockchainError>,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
         transaction_result: &edr_evm::ExecutionResult,
         trace: &edr_evm::trace::Trace,
     ) {
@@ -1076,7 +1081,7 @@ impl LogCollector {
         &mut self,
         spec_id: edr_eth::SpecId,
         result: &edr_provider::DebugMineBlockResult<BlockchainError>,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
     ) {
         let trace = result
             .transaction_traces
@@ -1095,7 +1100,7 @@ impl LogCollector {
         &mut self,
         spec_id: edr_eth::SpecId,
         block_result: &edr_provider::DebugMineBlockResult<BlockchainError>,
-        transaction: &ExecutableTransaction,
+        transaction: &transaction::Signed,
         transaction_result: &edr_evm::ExecutionResult,
         trace: &edr_evm::trace::Trace,
     ) {
@@ -1106,7 +1111,7 @@ impl LogCollector {
             logger.log_with_title("Transaction", transaction_hash);
 
             logger.log_with_title("From", format!("0x{:x}", transaction.caller()));
-            if let Some(to) = transaction.to() {
+            if let Some(to) = transaction.kind().to() {
                 logger.log_with_title("To", format!("0x{to:x}"));
             }
             logger.log_with_title("Value", wei_to_human_readable(transaction.value()));

package/src/provider.rs

@@ -2,8 +2,8 @@ mod config;
 
 use std::sync::Arc;
 
-use edr_eth::remote::jsonrpc;
 use edr_provider::{time::CurrentTime, InvalidRequestReason};
+use edr_rpc_eth::jsonrpc;
 use napi::{tokio::runtime, Env, JsFunction, JsObject, Status};
 use napi_derive::napi;
 

package/src/result.rs

@@ -16,6 +16,7 @@ pub enum SuccessReason {
     Return,
     /// The opcode `SELFDESTRUCT` was called
     SelfDestruct,
+    EofReturnContract,
 }
 
 impl From<edr_evm::SuccessReason> for SuccessReason {
@@ -24,6 +25,7 @@ impl From<edr_evm::SuccessReason> for SuccessReason {
             edr_evm::SuccessReason::Stop => Self::Stop,
             edr_evm::SuccessReason::Return => Self::Return,
             edr_evm::SuccessReason::SelfDestruct => Self::SelfDestruct,
+            edr_evm::SuccessReason::EofReturnContract => Self::EofReturnContract,
         }
     }
 }
@@ -34,6 +36,7 @@ impl From<SuccessReason> for edr_evm::SuccessReason {
             SuccessReason::Stop => Self::Stop,
             SuccessReason::Return => Self::Return,
             SuccessReason::SelfDestruct => Self::SelfDestruct,
+            SuccessReason::EofReturnContract => Self::EofReturnContract,
         }
     }
 }
@@ -82,7 +85,7 @@ pub struct RevertResult {
 pub enum ExceptionalHalt {
     OutOfGas,
     OpcodeNotFound,
-    InvalidFEOpcode,
+    InvalidEFOpcode,
     InvalidJump,
     NotActivated,
     StackUnderflow,
@@ -97,6 +100,12 @@ pub enum ExceptionalHalt {
     CreateContractStartingWithEF,
     /// EIP-3860: Limit and meter initcode. Initcode size limit exceeded.
     CreateInitCodeSizeLimit,
+    /// Aux data overflow, new aux data is larger tha u16 max size.
+    EofAuxDataOverflow,
+    /// Aud data is smaller then already present data size.
+    EofAuxDataTooSmall,
+    /// EOF Subroutine stack overflow
+    EOFFunctionStackOverflow,
 }
 
 impl From<edr_evm::HaltReason> for ExceptionalHalt {
@@ -104,7 +113,7 @@ impl From<edr_evm::HaltReason> for ExceptionalHalt {
         match halt {
             edr_evm::HaltReason::OutOfGas(..) => ExceptionalHalt::OutOfGas,
             edr_evm::HaltReason::OpcodeNotFound => ExceptionalHalt::OpcodeNotFound,
-            edr_evm::HaltReason::InvalidFEOpcode => ExceptionalHalt::InvalidFEOpcode,
+            edr_evm::HaltReason::InvalidEFOpcode => ExceptionalHalt::InvalidEFOpcode,
             edr_evm::HaltReason::InvalidJump => ExceptionalHalt::InvalidJump,
             edr_evm::HaltReason::NotActivated => ExceptionalHalt::NotActivated,
             edr_evm::HaltReason::StackUnderflow => ExceptionalHalt::StackUnderflow,
@@ -122,6 +131,11 @@ impl From<edr_evm::HaltReason> for ExceptionalHalt {
             edr_evm::HaltReason::CreateInitCodeSizeLimit => {
                 ExceptionalHalt::CreateInitCodeSizeLimit
             }
+            edr_evm::HaltReason::EofAuxDataOverflow => ExceptionalHalt::EofAuxDataOverflow,
+            edr_evm::HaltReason::EofAuxDataTooSmall => ExceptionalHalt::EofAuxDataTooSmall,
+            edr_evm::HaltReason::EOFFunctionStackOverflow => {
+                ExceptionalHalt::EOFFunctionStackOverflow
+            }
             edr_evm::HaltReason::OverflowPayment
             | edr_evm::HaltReason::StateChangeDuringStaticCall
             | edr_evm::HaltReason::CallNotAllowedInsideStatic
@@ -138,7 +152,7 @@ impl From<ExceptionalHalt> for edr_evm::HaltReason {
         match value {
             ExceptionalHalt::OutOfGas => Self::OutOfGas(edr_evm::OutOfGasError::Basic),
             ExceptionalHalt::OpcodeNotFound => Self::OpcodeNotFound,
-            ExceptionalHalt::InvalidFEOpcode => Self::InvalidFEOpcode,
+            ExceptionalHalt::InvalidEFOpcode => Self::InvalidEFOpcode,
             ExceptionalHalt::InvalidJump => Self::InvalidJump,
             ExceptionalHalt::NotActivated => Self::NotActivated,
             ExceptionalHalt::StackUnderflow => Self::StackUnderflow,
@@ -150,6 +164,9 @@ impl From<ExceptionalHalt> for edr_evm::HaltReason {
             ExceptionalHalt::CreateContractSizeLimit => Self::CreateContractSizeLimit,
             ExceptionalHalt::CreateContractStartingWithEF => Self::CreateContractStartingWithEF,
             ExceptionalHalt::CreateInitCodeSizeLimit => Self::CreateInitCodeSizeLimit,
+            ExceptionalHalt::EofAuxDataOverflow => Self::EofAuxDataOverflow,
+            ExceptionalHalt::EofAuxDataTooSmall => Self::EofAuxDataTooSmall,
+            ExceptionalHalt::EOFFunctionStackOverflow => Self::EOFFunctionStackOverflow,
         }
     }
 }

package/src/subscribe.rs

@@ -1,4 +1,4 @@
-use edr_eth::{remote::eth, B256};
+use edr_eth::B256;
 use napi::{
     bindgen_prelude::BigInt,
     threadsafe_function::{
@@ -28,7 +28,7 @@ impl SubscriberCallback {
                 let result = match ctx.value.result {
                     edr_provider::SubscriptionEventData::Logs(logs) => ctx.env.to_js_value(&logs),
                     edr_provider::SubscriptionEventData::NewHeads(block) => {
-                        let block = eth::Block::<B256>::from(block);
+                        let block = edr_rpc_eth::Block::<B256>::from(block);
                         ctx.env.to_js_value(&block)
                     }
                     edr_provider::SubscriptionEventData::NewPendingTransactions(tx_hash) => {