@nomicfoundation/edr 0.6.0 → 0.6.2

package/Cargo.toml

@@ -16,10 +16,9 @@ itertools = { version = "0.12.0", default-features = false }
 indexmap = { version = "2" }
 k256 = { version = "0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "pkcs8", "precomputed-tables", "std"] }
 log = { version = "0.4.20", default-features = false }
-# when napi is pinned, be sure to pin napi-derive to the same version
 # 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"
+napi = { version = "2.16.11", default-features = false, features = ["async", "error_anyhow", "napi8", "serde-json"] }
+napi-derive = "2.16.11"
 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" }

package/index.d.ts

@@ -346,8 +346,8 @@ export interface SubscriptionEvent {
   filterId: bigint
   result: any
 }
-export function createModelsAndDecodeBytecodes(solcVersion: string, compilerInput: any, compilerOutput: any): Array<BytecodeWrapper>
-export function linkHexStringBytecode(code: string, address: string, position: number): string
+export declare function createModelsAndDecodeBytecodes(solcVersion: string, compilerInput: any, compilerOutput: any): Array<BytecodeWrapper>
+export declare function linkHexStringBytecode(code: string, address: string, position: number): string
 export const enum ContractFunctionType {
   CONSTRUCTOR = 0,
   FUNCTION = 1,
@@ -357,8 +357,8 @@ export const enum ContractFunctionType {
   MODIFIER = 5,
   FREE_FUNCTION = 6
 }
-export function printMessageTrace(trace: PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace, depth?: number | undefined | null): void
-export function printStackTrace(trace: SolidityStackTrace): void
+export declare function printMessageTrace(trace: PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace, depth?: number | undefined | null): void
+export declare function printStackTrace(trace: SolidityStackTrace): void
 /** Represents the exit code of the EVM. */
 export const enum ExitCode {
   /** Execution was successful. */
@@ -450,7 +450,7 @@ export const enum StackTraceEntryType {
   INTERNAL_FUNCTION_CALLSTACK_ENTRY = 22,
   CONTRACT_CALL_RUN_OUT_OF_GAS_ERROR = 23
 }
-export function stackTraceEntryTypeToString(val: StackTraceEntryType): string
+export declare function stackTraceEntryTypeToString(val: StackTraceEntryType): string
 export const FALLBACK_FUNCTION_NAME: string
 export const RECEIVE_FUNCTION_NAME: string
 export const CONSTRUCTOR_FUNCTION_NAME: string
@@ -582,7 +582,7 @@ export interface ContractAndFunctionName {
   contractName: string
   functionName: string | undefined
 }
-export function initializeVmTraceDecoder(vmTraceDecoder: VmTraceDecoder, tracingConfig: any): void
+export declare function initializeVmTraceDecoder(vmTraceDecoder: VmTraceDecoder, tracingConfig: any): void
 export interface TracingMessage {
   /** Sender address */
   readonly caller: Buffer
@@ -636,12 +636,12 @@ export interface Withdrawal {
   /** The value contained in withdrawal */
   amount: bigint
 }
-export class EdrContext {
+export declare class EdrContext {
   /**Creates a new [`EdrContext`] instance. Should only be called once! */
   constructor()
 }
 /** A JSON-RPC provider for Ethereum. */
-export class Provider {
+export declare class Provider {
   /**Constructs a new provider with the provided configuration. */
   static withConfig(context: EdrContext, config: ProviderConfig, loggerConfig: LoggerConfig, subscriberCallback: (event: SubscriptionEvent) => void): Promise<Provider>
   /**Handles a JSON-RPC request and returns a JSON-RPC response. */
@@ -655,7 +655,7 @@ export class Provider {
    */
   setVerboseTracing(verboseTracing: boolean): void
 }
-export class Response {
+export declare class Response {
   /** Returns the response data as a JSON string or a JSON object. */
   get data(): string | any
   get solidityTrace(): RawTrace | null
@@ -665,13 +665,13 @@ export class Response {
  * Opaque handle to the `Bytecode` struct.
  * Only used on the JS side by the `VmTraceDecoder` class.
  */
-export class BytecodeWrapper { }
-export class Exit {
+export declare class BytecodeWrapper { }
+export declare class Exit {
   get kind(): ExitCode
   isError(): boolean
   getReason(): string
 }
-export class ReturnData {
+export declare class ReturnData {
   readonly value: Uint8Array
   constructor(value: Uint8Array)
   isEmpty(): boolean
@@ -680,12 +680,12 @@ export class ReturnData {
   decodeError(): string
   decodePanic(): bigint
 }
-export class SolidityTracer {
+export declare class SolidityTracer {
   
   constructor()
   getStackTrace(trace: PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace): SolidityStackTrace
 }
-export class VmTraceDecoder {
+export declare class VmTraceDecoder {
   constructor()
   addBytecode(bytecode: BytecodeWrapper): void
   tryToDecodeMessageTrace(messageTrace: PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace): PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace
@@ -693,13 +693,13 @@ export class VmTraceDecoder {
 }
 export type VMTracer = VmTracer
 /** N-API bindings for the Rust port of `VMTracer` from Hardhat. */
-export class VmTracer {
+export declare class VmTracer {
   constructor()
   /** Observes a trace, collecting information about the execution of the EVM. */
   observe(trace: RawTrace): void
   getLastTopLevelMessageTrace(): PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace | undefined
   getLastError(): Error | undefined
 }
-export class RawTrace {
+export declare class RawTrace {
   trace(): Array<TracingMessage | TracingStep | TracingMessageResult>
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.3",
+    "@napi-rs/cli": "^2.18.4",
     "@types/chai": "^4.2.0",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": ">=9.1.0",
@@ -52,13 +52,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.6.0",
-    "@nomicfoundation/edr-darwin-x64": "0.6.0",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.6.0",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.6.0",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.6.0",
-    "@nomicfoundation/edr-linux-x64-musl": "0.6.0",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.6.0"
+    "@nomicfoundation/edr-darwin-arm64": "0.6.2",
+    "@nomicfoundation/edr-darwin-x64": "0.6.2",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.6.2",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.6.2",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.6.2",
+    "@nomicfoundation/edr-linux-x64-musl": "0.6.2",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.6.2"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/trace/error_inferrer.rs

@@ -955,8 +955,14 @@ impl ErrorInferrer {
             return Ok(entry);
         }
 
+        // This function is only called after we jumped into the initial function in
+        // call traces, so there should always be at least a function jumpdest.
         let trace = match trace {
-            Either::A(_call) => unreachable!("This shouldn't happen: a call trace has no functionJumpdest but has already jumped into a function"),
+            Either::A(_call) => return Err(
+              napi::Error::new(
+                napi::Status::GenericFailure,
+                "This shouldn't happen: a call trace has no functionJumpdest but has already jumped into a function"
+              )),
             Either::B(create) => create,
         };
 
@@ -1167,7 +1173,7 @@ impl ErrorInferrer {
                 _ => return Ok(false),
             };
 
-            let inst = subtrace_bytecode.get_instruction(step.pc)?;
+            let inst = bytecode.get_instruction(step.pc)?;
 
             // All the remaining locations should be valid, as they are part of the inline
             // asm