@nomicfoundation/edr 0.4.2 → 0.5.1

package/index.d.ts

@@ -223,6 +223,8 @@ export interface ProviderConfig {
   chains: Array<ChainConfig>
   /** The address of the coinbase */
   coinbase: Buffer
+  /** Enables RIP-7212 */
+  enableRip7212: boolean
   /**
    * The configuration for forking a blockchain. If not provided, a local
    * blockchain will be created
@@ -260,7 +262,8 @@ export const enum SuccessReason {
   /** The opcode `RETURN` was called */
   Return = 1,
   /** The opcode `SELFDESTRUCT` was called */
-  SelfDestruct = 2
+  SelfDestruct = 2,
+  EofReturnContract = 3
 }
 export interface CallOutput {
   /** Return value */
@@ -313,7 +316,13 @@ export const enum ExceptionalHalt {
   /** Error on created contract that begins with EF */
   CreateContractStartingWithEF = 12,
   /** EIP-3860: Limit and meter initcode. Initcode size limit exceeded. */
-  CreateInitCodeSizeLimit = 13
+  CreateInitCodeSizeLimit = 13,
+  /** Aux data overflow, new aux data is larger tha u16 max size. */
+  EofAuxDataOverflow = 14,
+  /** Aud data is smaller then already present data size. */
+  EofAuxDataTooSmall = 15,
+  /** EOF Subroutine stack overflow */
+  EOFFunctionStackOverflow = 16
 }
 /** The result when the EVM terminates due to an exceptional halt. */
 export interface HaltResult {
@@ -409,7 +418,8 @@ export class Provider {
   setVerboseTracing(verboseTracing: boolean): void
 }
 export class Response {
-  get json(): string
+  /** Returns the response data as a JSON string or a JSON object. */
+  get data(): string | any
   get solidityTrace(): RawTrace | null
   get traces(): Array<RawTrace>
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.4.2",
+  "version": "0.5.1",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -38,6 +38,7 @@
     "@types/node": "^18.0.0",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
+    "json-stream-stringify": "^3.1.4",
     "mocha": "^10.0.0",
     "ts-node": "^10.8.0",
     "typescript": "~4.5.2"
@@ -46,13 +47,13 @@
     "node": ">= 18"
   },
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.4.2",
-    "@nomicfoundation/edr-darwin-x64": "0.4.2",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.4.2",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.4.2",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.4.2",
-    "@nomicfoundation/edr-linux-x64-musl": "0.4.2",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.4.2"
+    "@nomicfoundation/edr-darwin-arm64": "0.5.1",
+    "@nomicfoundation/edr-darwin-x64": "0.5.1",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.5.1",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.5.1",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.5.1",
+    "@nomicfoundation/edr-linux-x64-musl": "0.5.1",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.5.1"
   },
   "scripts": {
     "artifacts": "napi artifacts",
@@ -63,8 +64,8 @@
     "universal": "napi universal",
     "version": "napi version",
     "pretest": "pnpm build",
-    "test": "pnpm tsc && mocha --recursive \"test/**/*.ts\"",
-    "testNoBuild": "pnpm tsc && mocha --recursive \"test/**/*.ts\"",
+    "test": "pnpm tsc && node --max-old-space-size=8192 node_modules/mocha/bin/_mocha --recursive \"test/**/*.ts\"",
+    "testNoBuild": "pnpm tsc && node --max-old-space-size=8192 node_modules/mocha/bin/_mocha --recursive \"test/**/*.ts\"",
     "clean": "rm -rf @nomicfoundation/edr.node"
   }
 }

package/src/provider/config.rs

@@ -100,6 +100,8 @@ pub struct ProviderConfig {
     pub chains: Vec<ChainConfig>,
     /// The address of the coinbase
     pub coinbase: Buffer,
+    /// Enables RIP-7212
+    pub enable_rip_7212: bool,
     /// The configuration for forking a blockchain. If not provided, a local
     /// blockchain will be created
     pub fork: Option<ForkConfig>,
@@ -261,6 +263,7 @@ impl TryFrom<ProviderConfig> for edr_provider::ProviderConfig {
             chain_id: value.chain_id.try_cast()?,
             chains,
             coinbase: value.coinbase.try_cast()?,
+            enable_rip_7212: value.enable_rip_7212,
             fork: value.fork.map(TryInto::try_into).transpose()?,
             genesis_accounts: HashMap::new(),
             hardfork: value.hardfork.into(),

package/src/provider.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use edr_provider::{time::CurrentTime, InvalidRequestReason};
 use edr_rpc_eth::jsonrpc;
-use napi::{tokio::runtime, Env, JsFunction, JsObject, Status};
+use napi::{tokio::runtime, Either, Env, JsFunction, JsObject, Status};
 use napi_derive::napi;
 
 use self::config::ProviderConfig;
@@ -120,9 +120,9 @@ impl Provider {
                             format!("Invalid JSON `{json_request}` due to: {error}"),
                         )
                     })
-                    .map(|json_response| Response {
+                    .map(|json| Response {
                         solidity_trace: None,
-                        json: json_response,
+                        data: Either::A(json),
                         traces: Vec::new(),
                     });
             }
@@ -168,10 +168,25 @@ impl Provider {
         let response = jsonrpc::ResponseData::from(response.map(|response| response.result));
 
         serde_json::to_string(&response)
-            .map_err(|e| napi::Error::new(Status::GenericFailure, e.to_string()))
-            .map(|json_response| Response {
+            .and_then(|json| {
+                // We experimentally determined that 500_000_000 was the maximum string length
+                // that can be returned without causing the error:
+                //
+                // > Failed to convert rust `String` into napi `string`
+                //
+                // To be safe, we're limiting string lengths to half of that.
+                const MAX_STRING_LENGTH: usize = 250_000_000;
+
+                if json.len() <= MAX_STRING_LENGTH {
+                    Ok(Either::A(json))
+                } else {
+                    serde_json::to_value(response).map(Either::B)
+                }
+            })
+            .map_err(|error| napi::Error::new(Status::GenericFailure, error.to_string()))
+            .map(|data| Response {
                 solidity_trace,
-                json: json_response,
+                data,
                 traces: traces.into_iter().map(Arc::new).collect(),
             })
     }
@@ -209,7 +224,10 @@ impl Provider {
 
 #[napi]
 pub struct Response {
-    json: String,
+    // N-API is known to be slow when marshalling `serde_json::Value`s, so we try to return a
+    // `String`. If the object is too large to be represented as a `String`, we return a `Buffer`
+    // instead.
+    data: Either<String, serde_json::Value>,
     /// When a transaction fails to execute, the provider returns a trace of the
     /// transaction.
     solidity_trace: Option<Arc<edr_evm::trace::Trace>>,
@@ -219,9 +237,10 @@ pub struct Response {
 
 #[napi]
 impl Response {
+    /// Returns the response data as a JSON string or a JSON object.
     #[napi(getter)]
-    pub fn json(&self) -> String {
-        self.json.clone()
+    pub fn data(&self) -> Either<String, serde_json::Value> {
+        self.data.clone()
     }
 
     #[napi(getter)]

package/src/result.rs

@@ -85,7 +85,7 @@ pub struct RevertResult {
 pub enum ExceptionalHalt {
     OutOfGas,
     OpcodeNotFound,
-    InvalidEFOpcode,
+    InvalidFEOpcode,
     InvalidJump,
     NotActivated,
     StackUnderflow,
@@ -113,7 +113,7 @@ impl From<edr_evm::HaltReason> for ExceptionalHalt {
         match halt {
             edr_evm::HaltReason::OutOfGas(..) => ExceptionalHalt::OutOfGas,
             edr_evm::HaltReason::OpcodeNotFound => ExceptionalHalt::OpcodeNotFound,
-            edr_evm::HaltReason::InvalidEFOpcode => ExceptionalHalt::InvalidEFOpcode,
+            edr_evm::HaltReason::InvalidFEOpcode => ExceptionalHalt::InvalidFEOpcode,
             edr_evm::HaltReason::InvalidJump => ExceptionalHalt::InvalidJump,
             edr_evm::HaltReason::NotActivated => ExceptionalHalt::NotActivated,
             edr_evm::HaltReason::StackUnderflow => ExceptionalHalt::StackUnderflow,
@@ -152,7 +152,7 @@ impl From<ExceptionalHalt> for edr_evm::HaltReason {
         match value {
             ExceptionalHalt::OutOfGas => Self::OutOfGas(edr_evm::OutOfGasError::Basic),
             ExceptionalHalt::OpcodeNotFound => Self::OpcodeNotFound,
-            ExceptionalHalt::InvalidEFOpcode => Self::InvalidEFOpcode,
+            ExceptionalHalt::InvalidFEOpcode => Self::InvalidFEOpcode,
             ExceptionalHalt::InvalidJump => Self::InvalidJump,
             ExceptionalHalt::NotActivated => Self::NotActivated,
             ExceptionalHalt::StackUnderflow => Self::StackUnderflow,