@nomicfoundation/edr 0.3.4 → 0.3.6

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "edr_napi"
-version = "0.2.0-dev"
+version = "0.3.5"
 edition = "2021"
 
 [lib]
@@ -16,10 +16,10 @@ log = { version = "0.4.20", default-features = false }
 # The `async` feature ensures that a tokio runtime is available
 napi = { version = "2.16.0", default-features = false, features = ["async", "error_anyhow", "napi8", "serde-json"] }
 napi-derive = "2.16.0"
-edr_defaults = { version = "0.2.0-dev", path = "../edr_defaults" }
-edr_evm = { version = "0.2.0-dev", path = "../edr_evm", features = ["tracing"]}
-edr_eth = { version = "0.2.0-dev", path = "../edr_eth" }
-edr_provider = { version = "0.2.0-dev", path = "../edr_provider" }
+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" }
 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"] }
@@ -29,7 +29,7 @@ parking_lot = { version = "0.12.1", default-features = false }
 lazy_static = { version = "1.4.0", features = [] }
 rand = { version = "0.8.4", optional = true }
 serde = { version = "1.0.189", features = ["derive"] }
-mimalloc = { version = "0.1.39", default-features = false }
+mimalloc = { version = "0.1.39", default-features = false, features = ["local_dynamic_tls"] }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 openssl-sys = { version = "0.9.93", features = ["vendored"] }

package/index.js

@@ -224,17 +224,32 @@ switch (platform) {
         }
         break
       case 'arm':
-        localFileExisted = existsSync(
-          join(__dirname, 'edr.linux-arm-gnueabihf.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./edr.linux-arm-gnueabihf.node')
-          } else {
-            nativeBinding = require('@nomicfoundation/edr-linux-arm-gnueabihf')
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'edr.linux-arm-musleabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./edr.linux-arm-musleabihf.node')
+            } else {
+              nativeBinding = require('@nomicfoundation/edr-linux-arm-musleabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'edr.linux-arm-gnueabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./edr.linux-arm-gnueabihf.node')
+            } else {
+              nativeBinding = require('@nomicfoundation/edr-linux-arm-gnueabihf')
+            }
+          } catch (e) {
+            loadError = e
           }
-        } catch (e) {
-          loadError = e
         }
         break
       case 'riscv64':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -11,7 +11,7 @@
     "src/"
   ],
   "repository": {
-    "url": "https://github.com/NomicFoundation/hardhat.git",
+    "url": "https://github.com/NomicFoundation/edr.git",
     "type": "git"
   },
   "napi": {
@@ -19,17 +19,15 @@
     "triples": {
       "additional": [
         "aarch64-apple-darwin",
-        "aarch64-pc-windows-msvc",
         "aarch64-unknown-linux-gnu",
         "aarch64-unknown-linux-musl",
-        "x86_64-unknown-linux-musl",
-        "i686-pc-windows-msvc"
+        "x86_64-unknown-linux-musl"
       ]
     }
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.16.3",
+    "@napi-rs/cli": "^2.18.1",
     "@types/chai": "^4.2.0",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": ">=9.1.0",
@@ -37,28 +35,27 @@
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "mocha": "^10.0.0",
+    "ts-node": "^10.8.0",
     "typescript": "~4.5.2"
   },
   "engines": {
     "node": ">= 18"
   },
   "optionalDependencies": {
-    "@nomicfoundation/edr-win32-x64-msvc": "0.3.4",
-    "@nomicfoundation/edr-darwin-x64": "0.3.4",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.3.4",
-    "@nomicfoundation/edr-darwin-arm64": "0.3.4",
-    "@nomicfoundation/edr-win32-arm64-msvc": "0.3.4",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.3.4",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.3.4",
-    "@nomicfoundation/edr-linux-x64-musl": "0.3.4",
-    "@nomicfoundation/edr-win32-ia32-msvc": "0.3.4"
+    "@nomicfoundation/edr-win32-x64-msvc": "0.3.6",
+    "@nomicfoundation/edr-darwin-x64": "0.3.6",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.3.6",
+    "@nomicfoundation/edr-darwin-arm64": "0.3.6",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.3.6",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.3.6",
+    "@nomicfoundation/edr-linux-x64-musl": "0.3.6"
   },
   "scripts": {
     "artifacts": "napi artifacts",
     "build": "napi build --platform --release",
     "build:debug": "napi build --platform",
-    "build:tracing": "napi build --release --features tracing",
-    "build:scenarios": "napi build --release --features scenarios",
+    "build:tracing": "napi build --platform --release --features tracing",
+    "build:scenarios": "napi build --platform --release --features scenarios",
     "universal": "napi universal",
     "version": "napi version",
     "pretest": "pnpm build",

package/src/context.rs

@@ -34,6 +34,7 @@ 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>>,
 }
@@ -63,10 +64,10 @@ impl Context {
         #[cfg(feature = "tracing")]
         let subscriber = subscriber.with(flame_layer);
 
-        tracing::subscriber::set_global_default(subscriber)
-            .expect("Could not set global default tracing subscriber");
+        let subscriber_guard = tracing::subscriber::set_default(subscriber);
 
         Ok(Self {
+            _subscriber_guard: subscriber_guard,
             #[cfg(feature = "tracing")]
             _tracing_write_guard: guard,
         })

package/src/provider.rs

@@ -3,7 +3,7 @@ mod config;
 use std::sync::Arc;
 
 use edr_eth::remote::jsonrpc;
-use edr_provider::InvalidRequestReason;
+use edr_provider::{time::CurrentTime, InvalidRequestReason};
 use napi::{tokio::runtime, Env, JsFunction, JsObject, Status};
 use napi_derive::napi;
 
@@ -52,17 +52,23 @@ impl Provider {
                     edr_provider::Logger::is_enabled(&*logger),
                 ))?;
 
-            let result = edr_provider::Provider::new(runtime, logger, subscriber_callback, config)
-                .map_or_else(
-                    |error| Err(napi::Error::new(Status::GenericFailure, error.to_string())),
-                    |provider| {
-                        Ok(Provider {
-                            provider: Arc::new(provider),
-                            #[cfg(feature = "scenarios")]
-                            scenario_file,
-                        })
-                    },
-                );
+            let result = edr_provider::Provider::new(
+                runtime,
+                logger,
+                subscriber_callback,
+                config,
+                CurrentTime,
+            )
+            .map_or_else(
+                |error| Err(napi::Error::new(Status::GenericFailure, error.to_string())),
+                |provider| {
+                    Ok(Provider {
+                        provider: Arc::new(provider),
+                        #[cfg(feature = "scenarios")]
+                        scenario_file,
+                    })
+                },
+            );
 
             deferred.resolve(|_env| result);
             Ok::<_, napi::Error>(())