@nomicfoundation/edr 0.3.7-rc.0 → 0.3.8

package/LICENSE

@@ -1 +1,21 @@
-SEE LICENSE IN EACH PACKAGE'S LICENSE FILE
+MIT License
+
+Copyright (c) 2021 Nomic Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.3.7-rc.0",
+  "version": "0.3.8",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -17,11 +17,15 @@
   "napi": {
     "name": "edr",
     "triples": {
+      "defaults": false,
       "additional": [
         "aarch64-apple-darwin",
+        "x86_64-apple-darwin",
         "aarch64-unknown-linux-gnu",
         "aarch64-unknown-linux-musl",
-        "x86_64-unknown-linux-musl"
+        "x86_64-unknown-linux-gnu",
+        "x86_64-unknown-linux-musl",
+        "x86_64-pc-windows-msvc"
       ]
     }
   },
@@ -41,14 +45,14 @@
   "engines": {
     "node": ">= 18"
   },
-  "optionalDependencies": {
-    "@nomicfoundation/edr-win32-x64-msvc": "0.3.7-rc.0",
-    "@nomicfoundation/edr-darwin-x64": "0.3.7-rc.0",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.3.7-rc.0",
-    "@nomicfoundation/edr-darwin-arm64": "0.3.7-rc.0",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.3.7-rc.0",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.3.7-rc.0",
-    "@nomicfoundation/edr-linux-x64-musl": "0.3.7-rc.0"
+  "dependencies": {
+    "@nomicfoundation/edr-darwin-arm64": "0.3.8",
+    "@nomicfoundation/edr-darwin-x64": "0.3.8",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.3.8",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.3.8",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.3.8",
+    "@nomicfoundation/edr-linux-x64-musl": "0.3.8",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.3.8"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/call_override.rs

@@ -2,10 +2,11 @@ use std::sync::mpsc::channel;
 
 use edr_eth::{Address, Bytes};
 use napi::{
-    bindgen_prelude::Buffer,
+    bindgen_prelude::{Buffer, Promise},
     threadsafe_function::{
         ErrorStrategy, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
     },
+    tokio::runtime,
     Env, JsFunction, Status,
 };
 use napi_derive::napi;
@@ -41,10 +42,15 @@ struct CallOverrideCall {
 #[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) -> napi::Result<Self> {
+    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>| {
@@ -68,6 +74,7 @@ impl CallOverrideCallback {
 
         Ok(Self {
             call_override_callback_fn,
+            runtime,
         })
     }
 
@@ -78,21 +85,24 @@ impl CallOverrideCallback {
     ) -> 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: Option<CallOverrideResult>| {
-                let result = result.try_cast();
-
-                sender.send(result).map_err(|_error| {
-                    napi::Error::new(
-                        Status::GenericFailure,
-                        "Failed to send result from call_override_callback",
-                    )
-                })
+            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(())
             },
         );
 

package/src/logger.rs

@@ -1,7 +1,7 @@
 use std::{fmt::Display, sync::mpsc::channel};
 
 use ansi_term::{Color, Style};
-use edr_eth::{Bytes, B256, U256};
+use edr_eth::{transaction::Transaction, Bytes, B256, U256};
 use edr_evm::{
     blockchain::BlockchainError,
     precompile::{self, Precompiles},
@@ -506,7 +506,7 @@ impl LogCollector {
                         result.transaction_traces.iter()
                     )
                     .find(|(block_transaction, _, _)| {
-                        *block_transaction.hash() == *transaction.hash()
+                        *block_transaction.transaction_hash() == *transaction.transaction_hash()
                     })
                     .map(|(_, transaction_result, trace)| (result, transaction_result, trace))
                 })
@@ -514,7 +514,11 @@ impl LogCollector {
 
             if mining_results.len() > 1 {
                 self.log_multiple_blocks_warning();
-                self.log_auto_mined_block_results(spec_id, mining_results, transaction.hash());
+                self.log_auto_mined_block_results(
+                    spec_id,
+                    mining_results,
+                    transaction.transaction_hash(),
+                );
                 self.log_currently_sent_transaction(
                     spec_id,
                     sent_block_result,
@@ -526,7 +530,11 @@ impl LogCollector {
                 let transactions = result.block.transactions();
                 if transactions.len() > 1 {
                     self.log_multiple_transactions_warning();
-                    self.log_auto_mined_block_results(spec_id, mining_results, transaction.hash());
+                    self.log_auto_mined_block_results(
+                        spec_id,
+                        mining_results,
+                        transaction.transaction_hash(),
+                    );
                     self.log_currently_sent_transaction(
                         spec_id,
                         sent_block_result,
@@ -659,7 +667,7 @@ impl LogCollector {
                     transaction_traces
                 ) {
                     let should_highlight_hash =
-                        *transaction.hash() == *transaction_hash_to_highlight;
+                        *transaction.transaction_hash() == *transaction_hash_to_highlight;
                     logger.log_block_transaction(
                         spec_id,
                         transaction,
@@ -706,7 +714,7 @@ impl LogCollector {
         console_log_inputs: &[Bytes],
         should_highlight_hash: bool,
     ) {
-        let transaction_hash = transaction.hash();
+        let transaction_hash = transaction.transaction_hash();
         if should_highlight_hash {
             self.log_with_title(
                 "Transaction",
@@ -1090,7 +1098,7 @@ impl LogCollector {
         self.indented(|logger| {
             logger.log_contract_and_function_name::<false>(spec_id, trace);
 
-            let transaction_hash = transaction.hash();
+            let transaction_hash = transaction.transaction_hash();
             logger.log_with_title("Transaction", transaction_hash);
 
             logger.log_with_title("From", format!("0x{:x}", transaction.caller()));

package/src/provider.rs

@@ -20,6 +20,7 @@ use crate::{
 #[napi]
 pub struct Provider {
     provider: Arc<edr_provider::Provider<LoggerError>>,
+    runtime: runtime::Handle,
     #[cfg(feature = "scenarios")]
     scenario_file: Option<napi::tokio::sync::Mutex<napi::tokio::fs::File>>,
 }
@@ -53,7 +54,7 @@ impl Provider {
                 ))?;
 
             let result = edr_provider::Provider::new(
-                runtime,
+                runtime.clone(),
                 logger,
                 subscriber_callback,
                 config,
@@ -64,6 +65,7 @@ impl Provider {
                 |provider| {
                     Ok(Provider {
                         provider: Arc::new(provider),
+                        runtime,
                         #[cfg(feature = "scenarios")]
                         scenario_file,
                     })
@@ -185,7 +187,8 @@ impl Provider {
     ) -> napi::Result<()> {
         let provider = self.provider.clone();
 
-        let call_override_callback = CallOverrideCallback::new(&env, call_override_callback)?;
+        let call_override_callback =
+            CallOverrideCallback::new(&env, call_override_callback, self.runtime.clone())?;
         let call_override_callback =
             Arc::new(move |address, data| call_override_callback.call_override(address, data));
 

package/src/trace.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use edr_evm::{interpreter::OPCODE_JUMPMAP, trace::BeforeMessage};
+use edr_evm::{interpreter::OpCode, trace::BeforeMessage};
 use napi::{
     bindgen_prelude::{BigInt, Buffer, Either3},
     Env, JsBuffer, JsBufferValue,
@@ -96,9 +96,7 @@ impl TracingStep {
         Self {
             depth: step.depth as u8,
             pc: BigInt::from(step.pc),
-            opcode: OPCODE_JUMPMAP[usize::from(step.opcode)]
-                .unwrap_or("")
-                .to_string(),
+            opcode: OpCode::name_by_op(step.opcode).to_string(),
             stack_top: step.stack_top.map(|v| BigInt {
                 sign_bit: false,
                 words: v.into_limbs().to_vec(),