@nomicfoundation/edr 0.12.0-next.27 → 0.12.0-next.29

package/index.d.ts

@@ -417,6 +417,7 @@ export enum GasReportExecutionStatus {
 export interface DeploymentGasReport {
   gas: bigint
   size: bigint
+  runtimeSize: bigint
   status: GasReportExecutionStatus
 }
 export interface FunctionGasReport {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.12.0-next.27",
+  "version": "0.12.0-next.29",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",
@@ -58,13 +58,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.27",
-    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.27",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.27",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.27",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.27",
-    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.27",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.27"
+    "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.29",
+    "@nomicfoundation/edr-darwin-x64": "0.12.0-next.29",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.29",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.29",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.29",
+    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.29",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.29"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/gas_report.rs

@@ -25,6 +25,7 @@ pub enum GasReportExecutionStatus {
 pub struct DeploymentGasReport {
     pub gas: BigInt,
     pub size: BigInt,
+    pub runtime_size: BigInt,
     pub status: GasReportExecutionStatus,
 }
 
@@ -82,6 +83,7 @@ impl From<edr_gas_report::DeploymentGasReport> for DeploymentGasReport {
         Self {
             gas: BigInt::from(value.gas),
             size: BigInt::from(value.size),
+            runtime_size: BigInt::from(value.runtime_size),
             status: value.status.into(),
         }
     }

package/src/solidity_tests/test_results.rs

@@ -78,7 +78,14 @@ impl SuiteResult {
             test_results: suite_result
                 .test_results
                 .into_iter()
-                .map(|(name, test_result)| TestResult::new(name, test_result, include_traces))
+                .map(|(name, test_result)| {
+                    TestResult::new(
+                        name,
+                        test_result,
+                        &suite_result.setup_traces,
+                        include_traces,
+                    )
+                })
                 .collect(),
             warnings: suite_result.warnings,
         }
@@ -118,7 +125,7 @@ pub struct TestResult {
     pub value_snapshot_groups: Option<Vec<ValueSnapshotGroup>>,
 
     stack_trace_result: Option<Arc<SolidityTestStackTraceResult<String>>>,
-    call_trace_arenas: Vec<(traces::TraceKind, SparsedTraceArena)>,
+    call_trace_arenas: Vec<SparsedTraceArena>,
 }
 
 /// The stack trace result
@@ -221,8 +228,7 @@ impl TestResult {
     pub fn call_traces(&self) -> Vec<CallTrace> {
         self.call_trace_arenas
             .iter()
-            .filter(|(k, _)| *k != traces::TraceKind::Deployment)
-            .map(|(_, a)| CallTrace::from_arena_node(&a.resolve_arena(), 0))
+            .map(|arena| CallTrace::from_arena_node(&arena.resolve_arena(), 0))
             .collect()
     }
 }
@@ -231,6 +237,7 @@ impl TestResult {
     fn new(
         name: String,
         test_result: edr_solidity_tests::result::TestResult<String>,
+        setup_traces: &edr_solidity_tests::traces::SetupTraces,
         include_traces: IncludeTraces,
     ) -> Self {
         let include_trace = include_traces == IncludeTraces::All
@@ -319,9 +326,14 @@ impl TestResult {
             ),
             stack_trace_result: test_result.stack_trace_result.map(Arc::new),
             call_trace_arenas: if include_trace {
-                test_result.traces
+                setup_traces
+                    .iter()
+                    .filter(|(k, _)| *k != traces::SetupTraceKind::Deployment)
+                    .map(|(_, arena)| arena.clone())
+                    .chain(test_result.execution_traces)
+                    .collect()
             } else {
-                vec![]
+                Vec::new()
             },
         }
     }