@nomicfoundation/edr 0.10.0 → 0.12.0-alpha.0

package/Cargo.toml

@@ -1,36 +1,38 @@
 [package]
 name = "edr_napi"
 version = "0.3.5"
-edition = "2021"
+edition.workspace = true
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-alloy-sol-types = { version = "0.5.1", default-features = false, features = ["std"] }
-ansi_term = { version = "0.12.1", default-features = false }
-itertools = { version = "0.12.0", default-features = false }
-k256 = { version = "0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "pkcs8", "precomputed-tables", "std"] }
-# The `async` feature ensures that a tokio runtime is available
-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" }
-edr_provider = { version = "0.3.5", path = "../edr_provider" }
-edr_rpc_eth = { version = "0.3.5", path = "../edr_rpc_eth" }
-edr_solidity = { version = "0.3.5", path = "../edr_solidity" }
+alloy-dyn-abi = { version = "0.8.22", default-features = false, features = ["eip712", "std"] }
+alloy-json-abi = { version = "0.8.22", default-features = false }
+alloy-sol-types = { version = "0.8.22", default-features = false, features = ["std"] }
+derive-where = { version = "1.2.7", default-features = false }
+edr_eth = { path = "../edr_eth" }
+edr_evm = { path = "../edr_evm" }
+edr_generic = { path = "../edr_generic" }
+edr_napi_core = { path = "../edr_napi_core" }
+edr_op = { path = "../edr_op", optional = true }
+edr_provider = { path = "../edr_provider" }
+edr_rpc_client = { path = "../edr_rpc_client" }
 edr_scenarios = { version = "0.3.5", path = "../edr_scenarios", optional = true }
-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"] }
-tracing-flame = { version = "0.2.0", default-features = false, features = ["smallvec"] }
-tracing-subscriber = { version = "0.3.18", default-features = false, features = ["ansi", "env-filter", "fmt", "parking_lot", "smallvec", "std"] }
+edr_solidity ={ version = "0.3.5", path = "../edr_solidity" }
+k256 = { version = "0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "pkcs8" ] }
+mimalloc = { version = "0.1.39", default-features = false, features = ["local_dynamic_tls"] }
+# The `async` feature ensures that a tokio runtime is available
+napi = { version = "2.16.17", default-features = false, features = ["async", "error_anyhow", "napi8", "serde-json"] }
+napi-derive = "2.16.13"
 rand = { version = "0.8.4", optional = true }
-serde = { version = "1.0.189", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
+serde_json = { version = "1.0.127" }
 static_assertions = "1.1.0"
 strum = { version = "0.26.0", features = ["derive"] }
-mimalloc = { version = "0.1.39", default-features = false, features = ["local_dynamic_tls"] }
+tracing = { version = "0.1.37", default-features = false, features = ["std"] }
+tracing-flame = { version = "0.2.0", default-features = false, features = ["smallvec"] }
+tracing-subscriber = { version = "0.3.18", default-features = false, features = ["ansi", "env-filter", "fmt", "parking_lot", "smallvec", "std"] }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 openssl-sys = { version = "0.9.93", features = ["vendored"] }
@@ -48,8 +50,9 @@ openssl-sys = { version = "0.9.93", features = ["vendored"] }
 napi-build = "2.0.1"
 
 [features]
-tracing = ["edr_evm/tracing", "edr_provider/tracing"]
-scenarios = ["rand", "edr_scenarios"]
+op = ["dep:edr_op"]
+scenarios = ["dep:edr_scenarios", "dep:rand"]
+tracing = ["edr_evm/tracing", "edr_napi_core/tracing", "edr_provider/tracing"]
 
 [profile.release]
 lto = true

package/index.d.ts

@@ -3,8 +3,31 @@
 
 /* auto-generated by NAPI-RS */
 
-/** An account that needs to be created during the genesis block. */
-export interface GenesisAccount {
+/** A description of an account's state. */
+export interface Account {
+  /** The account's address */
+  address: Uint8Array
+  /** The account's balance */
+  balance: bigint
+  /** The account's nonce */
+  nonce: bigint
+  /** The account's code */
+  code?: Uint8Array
+  /** The account's storage */
+  storage: Array<StorageSlot>
+}
+/** A description of a storage slot's state. */
+export interface StorageSlot {
+  /** The storage slot's index */
+  index: bigint
+  /** The storage slot's value */
+  value: bigint
+}
+/**
+ * An owned account, for which the secret key is known, and its desired genesis
+ * balance.
+ */
+export interface OwnedAccount {
   /** Account secret key */
   secretKey: string
   /** Account balance */
@@ -69,8 +92,13 @@ export interface CallOverrideResult {
   result: Buffer
   shouldRevert: boolean
 }
+export const GENERIC_CHAIN_TYPE: string
+export declare function genericChainProviderFactory(): ProviderFactory
+export const L1_CHAIN_TYPE: string
+export declare function l1GenesisState(hardfork: SpecId): Array<Account>
+export declare function l1ProviderFactory(): ProviderFactory
 /** Identifier for the Ethereum spec. */
-export const enum SpecId {
+export enum SpecId {
   /** Frontier */
   Frontier = 0,
   /** Frontier Thawing */
@@ -108,57 +136,40 @@ export const enum SpecId {
   /** Cancun */
   Cancun = 17,
   /** Prague */
-  Prague = 18,
-  /** Latest */
-  Latest = 19
-}
-export interface DebugTraceResult {
-  pass: boolean
-  gasUsed: bigint
-  output?: Buffer
-  structLogs: Array<DebugTraceLogItem>
-}
-export interface DebugTraceLogItem {
-  /** Program Counter */
-  pc: bigint
-  op: number
-  /** Gas left before executing this operation as hex number. */
-  gas: string
-  /** Gas cost of this operation as hex number. */
-  gasCost: string
-  /** Array of all values (hex numbers) on the stack */
-  stack?: Array<string>
-  /** Depth of the call stack */
-  depth: bigint
-  /** Size of memory array */
-  memSize: bigint
-  /** Name of the operation */
-  opName: string
-  /** Description of an error as a hex string. */
-  error?: string
-  /** Array of all allocated values as hex strings. */
-  memory?: Array<string>
-  /** Map of all stored values with keys and values encoded as hex strings. */
-  storage?: Record<string, string>
-}
-/** Ethereum execution log. */
-export interface ExecutionLog {
-  address: Buffer
-  topics: Array<Buffer>
-  data: Buffer
-}
-export interface ContractAndFunctionName {
-  /** The contract name. */
-  contractName: string
-  /** The function name. Only present for calls. */
-  functionName?: string
-}
-export interface LoggerConfig {
-  /** Whether to enable the logger. */
-  enable: boolean
-  decodeConsoleLogInputsCallback: (inputs: Buffer[]) => string[]
-  printLineCallback: (message: string, replace: boolean) => void
+  Prague = 18
 }
+/**
+ * Tries to parse the provided string to create a [`SpecId`] instance.
+ *
+ * Returns an error if the string does not match any known hardfork.
+ */
+export declare function l1HardforkFromString(hardfork: string): SpecId
+export declare function l1HardforkToString(harfork: SpecId): string
+/**
+ * Returns the latest supported OP hardfork.
+ *
+ * The returned value will be updated after each network upgrade.
+ */
+export declare function l1HardforkLatest(): SpecId
+export const FRONTIER: string
+export const FRONTIER_THAWING: string
+export const HOMESTEAD: string
+export const DAO_FORK: string
+export const TANGERINE: string
+export const SPURIOUS_DRAGON: string
+export const BYZANTIUM: string
+export const CONSTANTINOPLE: string
+export const PETERSBURG: string
+export const ISTANBUL: string
+export const MUIR_GLACIER: string
+export const BERLIN: string
+export const LONDON: string
+export const ARROW_GLACIER: string
+export const GRAY_GLACIER: string
+export const MERGE: string
+export const SHANGHAI: string
+export const CANCUN: string
+export const PRAGUE: string
 /** Configuration for a chain */
 export interface ChainConfig {
   /** The chain ID */
@@ -187,10 +198,10 @@ export interface HardforkActivation {
   /** The block number at which the hardfork is activated */
   blockNumber: bigint
   /** The activated hardfork */
-  specId: SpecId
+  specId: string
 }
 /**The type of ordering to use when selecting blocks to mine. */
-export const enum MineOrdering {
+export enum MineOrdering {
   /**Insertion order */
   Fifo = 'Fifo',
   /**Effective miner fee */
@@ -237,10 +248,10 @@ export interface ProviderConfig {
    * blockchain will be created
    */
   fork?: ForkConfig
-  /** The genesis accounts of the blockchain */
-  genesisAccounts: Array<GenesisAccount>
+  /** The genesis state of the blockchain */
+  genesisState: Array<Account>
   /** The hardfork of the blockchain */
-  hardfork: SpecId
+  hardfork: string
   /**
    * The initial base fee per gas of the blockchain. Required for EIP-1559
    * transactions and later
@@ -261,6 +272,8 @@ export interface ProviderConfig {
   mining: MiningConfig
   /** The network ID of the blockchain */
   networkId: bigint
+  /** Owned accounts, for which the secret key is known */
+  ownedAccounts: Array<OwnedAccount>
 }
 /** Tracing config for Solidity stack trace generation. */
 export interface TracingConfigWithBuffers {
@@ -283,8 +296,55 @@ export interface BuildInfoAndOutput {
   /** The build info output file */
   output: Uint8Array
 }
+export interface DebugTraceResult {
+  pass: boolean
+  gasUsed: bigint
+  output?: Buffer
+  structLogs: Array<DebugTraceLogItem>
+}
+export interface DebugTraceLogItem {
+  /** Program Counter */
+  pc: bigint
+  op: number
+  /** Gas left before executing this operation as hex number. */
+  gas: string
+  /** Gas cost of this operation as hex number. */
+  gasCost: string
+  /** Array of all values (hex numbers) on the stack */
+  stack?: Array<string>
+  /** Depth of the call stack */
+  depth: bigint
+  /** Size of memory array */
+  memSize: bigint
+  /** Name of the operation */
+  opName: string
+  /** Description of an error as a hex string. */
+  error?: string
+  /** Array of all allocated values as hex strings. */
+  memory?: Array<string>
+  /** Map of all stored values with keys and values encoded as hex strings. */
+  storage?: Record<string, string>
+}
+/** Ethereum execution log. */
+export interface ExecutionLog {
+  address: Buffer
+  topics: Array<Buffer>
+  data: Buffer
+}
+export interface ContractAndFunctionName {
+  /** The contract name. */
+  contractName: string
+  /** The function name. Only present for calls. */
+  functionName?: string
+}
+export interface LoggerConfig {
+  /** Whether to enable the logger. */
+  enable: boolean
+  decodeConsoleLogInputsCallback: (inputs: Buffer[]) => string[]
+  printLineCallback: (message: string, replace: boolean) => void
+}
 /** The possible reasons for successful termination of the EVM. */
-export const enum SuccessReason {
+export enum SuccessReason {
   /** The opcode `STOP` was called */
   Stop = 0,
   /** The opcode `RETURN` was called */
@@ -327,7 +387,7 @@ export interface RevertResult {
  * Indicates that the EVM has experienced an exceptional halt. This causes
  * execution to immediately end with all gas being consumed.
  */
-export const enum ExceptionalHalt {
+export enum ExceptionalHalt {
   OutOfGas = 0,
   OpcodeNotFound = 1,
   InvalidFEOpcode = 2,
@@ -350,7 +410,7 @@ export const enum ExceptionalHalt {
   /** Aud data is smaller then already present data size. */
   EofAuxDataTooSmall = 15,
   /** EOF Subroutine stack overflow */
-  EOFFunctionStackOverflow = 16,
+  SubRoutineStackOverflow = 16,
   /** Check for target address validity is only done inside subcall. */
   InvalidEXTCALLTarget = 17
 }
@@ -371,6 +431,11 @@ export interface ExecutionResult {
   /** Optional contract address if the transaction created a new contract. */
   contractAddress?: Buffer
 }
+/** Configuration for subscriptions. */
+export interface SubscriptionConfig {
+  /** Callback to be called when a new event is received. */
+  subscriptionCallback: (event: SubscriptionEvent) => void
+}
 export interface SubscriptionEvent {
   filterId: bigint
   result: any
@@ -378,7 +443,7 @@ export interface SubscriptionEvent {
 export declare function linkHexStringBytecode(code: string, address: string, position: number): string
 export declare function printStackTrace(trace: SolidityStackTrace): void
 /** Represents the exit code of the EVM. */
-export const enum ExitCode {
+export enum ExitCode {
   /** Execution was successful. */
   SUCCESS = 0,
   /** Execution was reverted. */
@@ -398,7 +463,7 @@ export const enum ExitCode {
   /** Unknown halt reason. */
   UNKNOWN_HALT_REASON = 8
 }
-export const enum ContractFunctionType {
+export enum ContractFunctionType {
   CONSTRUCTOR = 0,
   FUNCTION = 1,
   FALLBACK = 2,
@@ -407,7 +472,7 @@ export const enum ContractFunctionType {
   MODIFIER = 5,
   FREE_FUNCTION = 6
 }
-export const enum StackTraceEntryType {
+export enum StackTraceEntryType {
   CALLSTACK_ENTRY = 0,
   UNRECOGNIZED_CREATE_CALLSTACK_ENTRY = 1,
   UNRECOGNIZED_CONTRACT_CALLSTACK_ENTRY = 2,
@@ -622,28 +687,32 @@ export interface Withdrawal {
 export declare class EdrContext {
   /**Creates a new [`EdrContext`] instance. Should only be called once! */
   constructor()
+  /**Constructs a new provider with the provided configuration. */
+  createProvider(chainType: string, providerConfig: ProviderConfig, loggerConfig: LoggerConfig, subscriptionConfig: SubscriptionConfig, tracingConfig: TracingConfigWithBuffers): Promise<Provider>
+  /**Registers a new provider factory for the provided chain type. */
+  registerProviderFactory(chainType: string, factory: ProviderFactory): Promise<void>
+}
+export declare class ProviderFactory { }
+export declare class Response {
+  /**Returns the response data as a JSON string or a JSON object. */
+  get data(): string | any
+  /**Compute the error stack trace. Return the stack trace if it can be decoded, otherwise returns none. Throws if there was an error computing the stack trace. */
+  stackTrace(): SolidityStackTrace | null
+  /**Returns the raw traces of executed contracts. This maybe contain zero or more traces. */
+  get traces(): Array<RawTrace>
 }
 /** A JSON-RPC provider for Ethereum. */
 export declare class Provider {
-  /**Constructs a new provider with the provided configuration. */
-  static withConfig(context: EdrContext, config: ProviderConfig, loggerConfig: LoggerConfig, tracingConfig: TracingConfigWithBuffers, subscriberCallback: (event: SubscriptionEvent) => void): Promise<Provider>
   /**Handles a JSON-RPC request and returns a JSON-RPC response. */
-  handleRequest(jsonRequest: string): Promise<Response>
-  setCallOverrideCallback(callOverrideCallback: (contract_address: Buffer, data: Buffer) => Promise<CallOverrideResult | undefined>): void
+  handleRequest(request: string): Promise<Response>
+  setCallOverrideCallback(callOverrideCallback: (contract_address: Buffer, data: Buffer) => Promise<CallOverrideResult | undefined>): Promise<void>
   /**
    * Set to `true` to make the traces returned with `eth_call`,
    * `eth_estimateGas`, `eth_sendRawTransaction`, `eth_sendTransaction`,
    * `evm_mine`, `hardhat_mine` include the full stack and memory. Set to
    * `false` to disable this.
    */
-  setVerboseTracing(verboseTracing: boolean): void
-}
-export declare class Response {
-  /** Returns the response data as a JSON string or a JSON object. */
-  get data(): string | any
-  get traces(): Array<RawTrace>
-  /**Compute the error stack trace. Return the stack trace if it can be decoded, otherwise returns none. Throws if there was an error computing the stack trace. */
-  stackTrace(): SolidityStackTrace | null
+  setVerboseTracing(verboseTracing: boolean): Promise<void>
 }
 export declare class Exit {
   get kind(): ExitCode

package/index.js

@@ -310,13 +310,41 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { SpecId, EdrContext, MineOrdering, Provider, Response, SuccessReason, ExceptionalHalt, linkHexStringBytecode, printStackTrace, Exit, ExitCode, BytecodeWrapper, ContractFunctionType, ReturnData, StackTraceEntryType, stackTraceEntryTypeToString, FALLBACK_FUNCTION_NAME, RECEIVE_FUNCTION_NAME, CONSTRUCTOR_FUNCTION_NAME, UNRECOGNIZED_FUNCTION_NAME, UNKNOWN_FUNCTION_NAME, PRECOMPILE_FUNCTION_NAME, UNRECOGNIZED_CONTRACT_NAME, RawTrace, getLatestSupportedSolcVersion } = nativeBinding
+const { GENERIC_CHAIN_TYPE, genericChainProviderFactory, L1_CHAIN_TYPE, l1GenesisState, l1ProviderFactory, SpecId, l1HardforkFromString, l1HardforkToString, l1HardforkLatest, FRONTIER, FRONTIER_THAWING, HOMESTEAD, DAO_FORK, TANGERINE, SPURIOUS_DRAGON, BYZANTIUM, CONSTANTINOPLE, PETERSBURG, ISTANBUL, MUIR_GLACIER, BERLIN, LONDON, ARROW_GLACIER, GRAY_GLACIER, MERGE, SHANGHAI, CANCUN, PRAGUE, MineOrdering, EdrContext, ProviderFactory, Response, Provider, SuccessReason, ExceptionalHalt, linkHexStringBytecode, printStackTrace, Exit, ExitCode, BytecodeWrapper, ContractFunctionType, ReturnData, StackTraceEntryType, stackTraceEntryTypeToString, FALLBACK_FUNCTION_NAME, RECEIVE_FUNCTION_NAME, CONSTRUCTOR_FUNCTION_NAME, UNRECOGNIZED_FUNCTION_NAME, UNKNOWN_FUNCTION_NAME, PRECOMPILE_FUNCTION_NAME, UNRECOGNIZED_CONTRACT_NAME, RawTrace, getLatestSupportedSolcVersion } = nativeBinding
 
+module.exports.GENERIC_CHAIN_TYPE = GENERIC_CHAIN_TYPE
+module.exports.genericChainProviderFactory = genericChainProviderFactory
+module.exports.L1_CHAIN_TYPE = L1_CHAIN_TYPE
+module.exports.l1GenesisState = l1GenesisState
+module.exports.l1ProviderFactory = l1ProviderFactory
 module.exports.SpecId = SpecId
-module.exports.EdrContext = EdrContext
+module.exports.l1HardforkFromString = l1HardforkFromString
+module.exports.l1HardforkToString = l1HardforkToString
+module.exports.l1HardforkLatest = l1HardforkLatest
+module.exports.FRONTIER = FRONTIER
+module.exports.FRONTIER_THAWING = FRONTIER_THAWING
+module.exports.HOMESTEAD = HOMESTEAD
+module.exports.DAO_FORK = DAO_FORK
+module.exports.TANGERINE = TANGERINE
+module.exports.SPURIOUS_DRAGON = SPURIOUS_DRAGON
+module.exports.BYZANTIUM = BYZANTIUM
+module.exports.CONSTANTINOPLE = CONSTANTINOPLE
+module.exports.PETERSBURG = PETERSBURG
+module.exports.ISTANBUL = ISTANBUL
+module.exports.MUIR_GLACIER = MUIR_GLACIER
+module.exports.BERLIN = BERLIN
+module.exports.LONDON = LONDON
+module.exports.ARROW_GLACIER = ARROW_GLACIER
+module.exports.GRAY_GLACIER = GRAY_GLACIER
+module.exports.MERGE = MERGE
+module.exports.SHANGHAI = SHANGHAI
+module.exports.CANCUN = CANCUN
+module.exports.PRAGUE = PRAGUE
 module.exports.MineOrdering = MineOrdering
-module.exports.Provider = Provider
+module.exports.EdrContext = EdrContext
+module.exports.ProviderFactory = ProviderFactory
 module.exports.Response = Response
+module.exports.Provider = Provider
 module.exports.SuccessReason = SuccessReason
 module.exports.ExceptionalHalt = ExceptionalHalt
 module.exports.linkHexStringBytecode = linkHexStringBytecode

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.10.0",
+  "version": "0.12.0-alpha.0",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
+    "@nomicfoundation/ethereumjs-util": "^9.0.4",
     "@types/chai": "^4.2.0",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": ">=9.1.0",
@@ -52,28 +53,29 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.10.0",
-    "@nomicfoundation/edr-darwin-x64": "0.10.0",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.10.0",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.10.0",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.10.0",
-    "@nomicfoundation/edr-linux-x64-musl": "0.10.0",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.10.0"
+    "@nomicfoundation/edr-darwin-arm64": "0.12.0-alpha.0",
+    "@nomicfoundation/edr-darwin-x64": "0.12.0-alpha.0",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-alpha.0",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-alpha.0",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-alpha.0",
+    "@nomicfoundation/edr-linux-x64-musl": "0.12.0-alpha.0",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-alpha.0"
   },
   "scripts": {
     "artifacts": "napi artifacts",
-    "build": "napi build --platform --release",
-    "build:debug": "napi build --platform",
-    "build:scenarios": "napi build --platform --release --features scenarios",
-    "build:tracing": "napi build --platform --release --features tracing",
+    "build": "napi build --platform --release --no-const-enum",
+    "build:debug": "napi build --platform  --no-const-enum",
+    "build:op": "napi build --platform --release --no-const-enum --features op",
+    "build:scenarios": "napi build --platform --release --no-const-enum --features scenarios",
+    "build:tracing": "napi build --platform --release --no-const-enum --features tracing",
     "clean": "rm -rf @nomicfoundation/edr.node",
     "eslint": "eslint 'test/**/*.ts'",
     "lint": "pnpm run prettier && pnpm run eslint",
     "lint:fix": "pnpm run prettier --write",
-    "pretest": "pnpm build",
+    "pretest": "pnpm build:op",
     "prettier": "prettier --check \"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\"",
+    "testNoBuild": "pnpm tsc && node --max-old-space-size=8192 node_modules/mocha/bin/_mocha --recursive \"test/**/{,!(op)}.ts\"",
     "universal": "napi universal",
     "version": "napi version"
   }

package/src/account.rs

@@ -1,18 +1,43 @@
-use std::fmt::{Debug, Display};
+use core::fmt::{Debug, Display};
 
-#[allow(deprecated)]
-// This is the only source file in production code where it's allowed to create
-// `DangerousSecretKeyStr`.
-use edr_eth::signature::{secret_key_from_str, DangerousSecretKeyStr};
-use napi::{bindgen_prelude::BigInt, JsString, Status};
+use edr_eth::signature::secret_key_from_str;
+use napi::{
+    JsString, Status,
+    bindgen_prelude::{BigInt, Uint8Array},
+};
 use napi_derive::napi;
 use serde::Serialize;
 
-use crate::cast::TryCast;
+use crate::cast::TryCast as _;
 
-/// An account that needs to be created during the genesis block.
+/// A description of an account's state.
 #[napi(object)]
-pub struct GenesisAccount {
+pub struct Account {
+    /// The account's address
+    pub address: Uint8Array,
+    /// The account's balance
+    pub balance: BigInt,
+    /// The account's nonce
+    pub nonce: BigInt,
+    /// The account's code
+    pub code: Option<Uint8Array>,
+    /// The account's storage
+    pub storage: Vec<StorageSlot>,
+}
+
+/// A description of a storage slot's state.
+#[napi(object)]
+pub struct StorageSlot {
+    /// The storage slot's index
+    pub index: BigInt,
+    /// The storage slot's value
+    pub value: BigInt,
+}
+
+/// An owned account, for which the secret key is known, and its desired genesis
+/// balance.
+#[napi(object)]
+pub struct OwnedAccount {
     // Using JsString here as it doesn't have `Debug`, `Display` and `Serialize` implementation
     // which prevents accidentally leaking the secret keys to error messages and logs.
     /// Account secret key
@@ -21,10 +46,15 @@ pub struct GenesisAccount {
     pub balance: BigInt,
 }
 
-impl TryFrom<GenesisAccount> for edr_provider::AccountConfig {
+impl TryFrom<OwnedAccount> for edr_provider::config::OwnedAccount {
     type Error = napi::Error;
 
-    fn try_from(value: GenesisAccount) -> Result<Self, Self::Error> {
+    fn try_from(value: OwnedAccount) -> Result<Self, Self::Error> {
+        // This is the only place in production code where it's allowed to use
+        // `DangerousSecretKeyStr`.
+        #[allow(deprecated)]
+        use edr_eth::signature::DangerousSecretKeyStr;
+
         static_assertions::assert_not_impl_all!(JsString: Debug, Display, Serialize);
         // `k256::SecretKey` has `Debug` implementation, but it's opaque (only shows the
         // type name)

package/src/block.rs

@@ -1,4 +1,4 @@
-use edr_eth::{Address, Bytes, B256, B64};
+use edr_eth::{Address, B64, B256, Bytes};
 use napi::bindgen_prelude::{BigInt, Buffer};
 use napi_derive::napi;
 

package/src/call_override.rs

@@ -2,12 +2,12 @@ use std::sync::mpsc::channel;
 
 use edr_eth::{Address, Bytes};
 use napi::{
+    Env, JsFunction, Status,
     bindgen_prelude::{Buffer, Promise},
     threadsafe_function::{
         ErrorStrategy, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
     },
     tokio::runtime,
-    Env, JsFunction, Status,
 };
 use napi_derive::napi;