@nomicfoundation/edr 0.6.4 → 0.6.5

package/index.d.ts

@@ -376,7 +376,9 @@ export const enum ExitCode {
   /** Create init code size exceeds limit (runtime). */
   CODESIZE_EXCEEDS_MAXIMUM = 6,
   /** Create collision. */
-  CREATE_COLLISION = 7
+  CREATE_COLLISION = 7,
+  /** Unknown halt reason. */
+  UNKNOWN_HALT_REASON = 8
 }
 export interface EvmStep {
   pc: number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@types/chai": "^4.2.0",
@@ -52,13 +52,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.6.4",
-    "@nomicfoundation/edr-darwin-x64": "0.6.4",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.6.4",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.6.4",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.6.4",
-    "@nomicfoundation/edr-linux-x64-musl": "0.6.4",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.6.4"
+    "@nomicfoundation/edr-darwin-arm64": "0.6.5",
+    "@nomicfoundation/edr-darwin-x64": "0.6.5",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.6.5",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.6.5",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.6.5",
+    "@nomicfoundation/edr-linux-x64-musl": "0.6.5",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.6.5"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/context.rs

@@ -1,5 +1,6 @@
-use std::{io, ops::Deref, sync::Arc};
+use std::{ops::Deref, sync::Arc};
 
+#[cfg(feature = "tracing")]
 use napi::Status;
 use napi_derive::napi;
 use tracing_subscriber::{prelude::*, EnvFilter, Registry};
@@ -23,8 +24,7 @@ impl EdrContext {
     #[doc = "Creates a new [`EdrContext`] instance. Should only be called once!"]
     #[napi(constructor)]
     pub fn new() -> napi::Result<Self> {
-        let context =
-            Context::new().map_err(|e| napi::Error::new(Status::GenericFailure, e.to_string()))?;
+        let context = Context::new()?;
 
         Ok(Self {
             inner: Arc::new(context),
@@ -34,14 +34,13 @@ impl EdrContext {
 
 #[derive(Debug)]
 pub struct Context {
-    _subscriber_guard: tracing::subscriber::DefaultGuard,
     #[cfg(feature = "tracing")]
     _tracing_write_guard: tracing_flame::FlushGuard<std::io::BufWriter<std::fs::File>>,
 }
 
 impl Context {
     /// Creates a new [`Context`] instance. Should only be called once!
-    pub fn new() -> io::Result<Self> {
+    pub fn new() -> napi::Result<Self> {
         let fmt_layer = tracing_subscriber::fmt::layer()
             .with_file(true)
             .with_line_number(true)
@@ -54,8 +53,13 @@ impl Context {
 
         #[cfg(feature = "tracing")]
         let (flame_layer, guard) = {
-            let (flame_layer, guard) =
-                tracing_flame::FlameLayer::with_file("tracing.folded").unwrap();
+            let (flame_layer, guard) = tracing_flame::FlameLayer::with_file("tracing.folded")
+                .map_err(|err| {
+                    napi::Error::new(
+                        Status::GenericFailure,
+                        format!("Failed to create tracing.folded file with error: {err:?}"),
+                    )
+                })?;
 
             let flame_layer = flame_layer.with_empty_samples(false);
             (flame_layer, guard)
@@ -64,10 +68,14 @@ impl Context {
         #[cfg(feature = "tracing")]
         let subscriber = subscriber.with(flame_layer);
 
-        let subscriber_guard = tracing::subscriber::set_default(subscriber);
+        if let Err(error) = tracing::subscriber::set_global_default(subscriber) {
+            println!(
+                "Failed to set global tracing subscriber with error: {error}\n\
+                Please only initialize EdrContext once per process to avoid this error."
+            );
+        }
 
         Ok(Self {
-            _subscriber_guard: subscriber_guard,
             #[cfg(feature = "tracing")]
             _tracing_write_guard: guard,
         })

package/src/trace/exit.rs

@@ -30,6 +30,8 @@ pub enum ExitCode {
     CODESIZE_EXCEEDS_MAXIMUM,
     /// Create collision.
     CREATE_COLLISION,
+    /// Unknown halt reason.
+    UNKNOWN_HALT_REASON,
 }
 
 impl fmt::Display for ExitCode {
@@ -43,6 +45,7 @@ impl fmt::Display for ExitCode {
             ExitCode::STACK_UNDERFLOW => write!(f, "Stack underflow"),
             ExitCode::CODESIZE_EXCEEDS_MAXIMUM => write!(f, "Codesize exceeds maximum"),
             ExitCode::CREATE_COLLISION => write!(f, "Create collision"),
+            ExitCode::UNKNOWN_HALT_REASON => write!(f, "Unknown halt reason"),
         }
     }
 }
@@ -62,7 +65,7 @@ impl From<edr_solidity::message_trace::ExitCode> for ExitCode {
             ExitCode::Halt(HaltReason::StackUnderflow) => Self::STACK_UNDERFLOW,
             ExitCode::Halt(HaltReason::CreateContractSizeLimit) => Self::CODESIZE_EXCEEDS_MAXIMUM,
             ExitCode::Halt(HaltReason::CreateCollision) => Self::CREATE_COLLISION,
-            halt @ ExitCode::Halt(_) => panic!("Unmatched EDR exceptional halt: {halt:?}"),
+            ExitCode::Halt(_) => Self::UNKNOWN_HALT_REASON,
         }
     }
 }