@nomicfoundation/edr 0.3.5 → 0.3.7-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +12 -11
- package/src/context.rs +3 -2
- package/src/provider.rs +18 -12
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nomicfoundation/edr",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.7-rc.0",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"types": "index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"src/"
|
|
12
12
|
],
|
|
13
13
|
"repository": {
|
|
14
|
-
"url": "https://github.com/NomicFoundation/
|
|
14
|
+
"url": "https://github.com/NomicFoundation/edr.git",
|
|
15
15
|
"type": "git"
|
|
16
16
|
},
|
|
17
17
|
"napi": {
|
|
@@ -35,26 +35,27 @@
|
|
|
35
35
|
"chai": "^4.3.6",
|
|
36
36
|
"chai-as-promised": "^7.1.1",
|
|
37
37
|
"mocha": "^10.0.0",
|
|
38
|
+
"ts-node": "^10.8.0",
|
|
38
39
|
"typescript": "~4.5.2"
|
|
39
40
|
},
|
|
40
41
|
"engines": {
|
|
41
42
|
"node": ">= 18"
|
|
42
43
|
},
|
|
43
44
|
"optionalDependencies": {
|
|
44
|
-
"@nomicfoundation/edr-win32-x64-msvc": "0.3.
|
|
45
|
-
"@nomicfoundation/edr-darwin-x64": "0.3.
|
|
46
|
-
"@nomicfoundation/edr-linux-x64-gnu": "0.3.
|
|
47
|
-
"@nomicfoundation/edr-darwin-arm64": "0.3.
|
|
48
|
-
"@nomicfoundation/edr-linux-arm64-gnu": "0.3.
|
|
49
|
-
"@nomicfoundation/edr-linux-arm64-musl": "0.3.
|
|
50
|
-
"@nomicfoundation/edr-linux-x64-musl": "0.3.
|
|
45
|
+
"@nomicfoundation/edr-win32-x64-msvc": "0.3.7-rc.0",
|
|
46
|
+
"@nomicfoundation/edr-darwin-x64": "0.3.7-rc.0",
|
|
47
|
+
"@nomicfoundation/edr-linux-x64-gnu": "0.3.7-rc.0",
|
|
48
|
+
"@nomicfoundation/edr-darwin-arm64": "0.3.7-rc.0",
|
|
49
|
+
"@nomicfoundation/edr-linux-arm64-gnu": "0.3.7-rc.0",
|
|
50
|
+
"@nomicfoundation/edr-linux-arm64-musl": "0.3.7-rc.0",
|
|
51
|
+
"@nomicfoundation/edr-linux-x64-musl": "0.3.7-rc.0"
|
|
51
52
|
},
|
|
52
53
|
"scripts": {
|
|
53
54
|
"artifacts": "napi artifacts",
|
|
54
55
|
"build": "napi build --platform --release",
|
|
55
56
|
"build:debug": "napi build --platform",
|
|
56
|
-
"build:tracing": "napi build --release --features tracing",
|
|
57
|
-
"build:scenarios": "napi build --release --features scenarios",
|
|
57
|
+
"build:tracing": "napi build --platform --release --features tracing",
|
|
58
|
+
"build:scenarios": "napi build --platform --release --features scenarios",
|
|
58
59
|
"universal": "napi universal",
|
|
59
60
|
"version": "napi version",
|
|
60
61
|
"pretest": "pnpm build",
|
package/src/context.rs
CHANGED
|
@@ -34,6 +34,7 @@ impl EdrContext {
|
|
|
34
34
|
|
|
35
35
|
#[derive(Debug)]
|
|
36
36
|
pub struct Context {
|
|
37
|
+
_subscriber_guard: tracing::subscriber::DefaultGuard,
|
|
37
38
|
#[cfg(feature = "tracing")]
|
|
38
39
|
_tracing_write_guard: tracing_flame::FlushGuard<std::io::BufWriter<std::fs::File>>,
|
|
39
40
|
}
|
|
@@ -63,10 +64,10 @@ impl Context {
|
|
|
63
64
|
#[cfg(feature = "tracing")]
|
|
64
65
|
let subscriber = subscriber.with(flame_layer);
|
|
65
66
|
|
|
66
|
-
tracing::subscriber::
|
|
67
|
-
.expect("Could not set global default tracing subscriber");
|
|
67
|
+
let subscriber_guard = tracing::subscriber::set_default(subscriber);
|
|
68
68
|
|
|
69
69
|
Ok(Self {
|
|
70
|
+
_subscriber_guard: subscriber_guard,
|
|
70
71
|
#[cfg(feature = "tracing")]
|
|
71
72
|
_tracing_write_guard: guard,
|
|
72
73
|
})
|
package/src/provider.rs
CHANGED
|
@@ -3,7 +3,7 @@ mod config;
|
|
|
3
3
|
use std::sync::Arc;
|
|
4
4
|
|
|
5
5
|
use edr_eth::remote::jsonrpc;
|
|
6
|
-
use edr_provider::InvalidRequestReason;
|
|
6
|
+
use edr_provider::{time::CurrentTime, InvalidRequestReason};
|
|
7
7
|
use napi::{tokio::runtime, Env, JsFunction, JsObject, Status};
|
|
8
8
|
use napi_derive::napi;
|
|
9
9
|
|
|
@@ -52,17 +52,23 @@ impl Provider {
|
|
|
52
52
|
edr_provider::Logger::is_enabled(&*logger),
|
|
53
53
|
))?;
|
|
54
54
|
|
|
55
|
-
let result = edr_provider::Provider::new(
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
55
|
+
let result = edr_provider::Provider::new(
|
|
56
|
+
runtime,
|
|
57
|
+
logger,
|
|
58
|
+
subscriber_callback,
|
|
59
|
+
config,
|
|
60
|
+
CurrentTime,
|
|
61
|
+
)
|
|
62
|
+
.map_or_else(
|
|
63
|
+
|error| Err(napi::Error::new(Status::GenericFailure, error.to_string())),
|
|
64
|
+
|provider| {
|
|
65
|
+
Ok(Provider {
|
|
66
|
+
provider: Arc::new(provider),
|
|
67
|
+
#[cfg(feature = "scenarios")]
|
|
68
|
+
scenario_file,
|
|
69
|
+
})
|
|
70
|
+
},
|
|
71
|
+
);
|
|
66
72
|
|
|
67
73
|
deferred.resolve(|_env| result);
|
|
68
74
|
Ok::<_, napi::Error>(())
|