Str 1781 impl evm ee

.justfile

@@ -43,6 +43,12 @@ cov-unit: ensure-cargo-llvm-cov ensure-cargo-nextest
 cov-report-html: ensure-cargo-llvm-cov ensure-cargo-nextest
     cargo llvm-cov --open --workspace --locked nextest
 
+# Run integration tests
+[group('test')]
+test-int: ensure-cargo-nextest
+    cargo nextest run -p "integration-tests" --status-level=fail --no-capture --no-tests=warn
+
+
 # Runs `nextest` under `cargo-mutants`. Caution: This can take *really* long to run
 [group('test')]
 mutants-test: ensure-cargo-mutants

Cargo.toml

@@ -48,6 +48,7 @@ members = [
   "crates/ee-acct-types",
   "crates/ee-chain-types",
   "crates/eectl",
+  "crates/evm-ee",
   "crates/evmexec",
   "crates/identifiers",
   "crates/key-derivation",
@@ -313,6 +314,7 @@ reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
+reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
@@ -349,7 +351,9 @@ reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v1
 reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", default-features = false }
 reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
-reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", features = [
+  "serde",
+] }
 reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", default-features = false }
 reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
 
@@ -393,6 +397,7 @@ hex = { version = "0.4", features = ["serde"] }
 http = "1.0.0"
 hyper = "0.14.25"
 int-enum = "1.2"
+itertools = "0.14"
 jsonrpsee = { version = "0.26.0" }
 jsonrpsee-http-client = { version = "0.26.0" }
 jsonrpsee-types = { version = "0.26.0" }

crates/asm/manifest-types/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2024"
 [dependencies]
 borsh.workspace = true
 serde.workspace = true
-thiserror.workspace = true
 strata-codec.workspace = true
 strata-identifiers.workspace = true
 strata-msg-fmt.workspace = true
+thiserror.workspace = true
 
 [lints]
 workspace = true

crates/ee-acct-runtime/src/chain_segment_builder.rs

@@ -4,8 +4,8 @@ use digest::Digest;
 use sha2::Sha256;
 use strata_codec::encode_to_vec;
 use strata_ee_acct_types::{
-    CommitBlockData, CommitChainSegment, ExecBlock, ExecHeader, ExecPartialState, ExecPayload,
-    ExecutionEnvironment, PendingInputEntry,
+    BlockAssembler, CommitBlockData, CommitChainSegment, ExecBlock, ExecHeader, ExecPartialState,
+    ExecPayload, ExecutionEnvironment, PendingInputEntry,
 };
 use strata_ee_chain_types::{BlockInputs, ExecBlockCommitment, ExecBlockPackage};
 
@@ -28,7 +28,7 @@ pub struct ChainSegmentBuilder<E: ExecutionEnvironment> {
     consumed_inputs: usize,
 }
 
-impl<E: ExecutionEnvironment> ChainSegmentBuilder<E> {
+impl<E: ExecutionEnvironment + BlockAssembler> ChainSegmentBuilder<E> {
     /// Creates a new chain segment builder from an existing state, header, and
     /// pending inputs queue.
     pub fn new(

crates/ee-acct-types/src/lib.rs

@@ -20,4 +20,6 @@ pub use inputs::ExecPayload;
 pub use messages::*;
 pub use outputs::ExecBlockOutput;
 pub use state::{EeAccountState, PendingFinclEntry, PendingInputEntry, PendingInputType};
-pub use traits::{ExecBlock, ExecBlockBody, ExecHeader, ExecPartialState, ExecutionEnvironment};
+pub use traits::{
+    BlockAssembler, ExecBlock, ExecBlockBody, ExecHeader, ExecPartialState, ExecutionEnvironment,
+};

crates/ee-acct-types/src/traits.rs

@@ -86,14 +86,6 @@ pub trait ExecutionEnvironment: Sized {
         inputs: &BlockInputs,
     ) -> EnvResult<ExecBlockOutput<Self>>;
 
-    /// Completes a header for an exec payload using the exec outputs.  This can
-    /// be assembled into a final block.
-    fn complete_header(
-        &self,
-        exec_payload: &ExecPayload<'_, Self::Block>,
-        output: &ExecBlockOutput<Self>,
-    ) -> EnvResult<<Self::Block as ExecBlock>::Header>;
-
     /// Performs any additional checks needed from the block outputs against the
     /// header.
     fn verify_outputs_against_header(
@@ -103,9 +95,28 @@ pub trait ExecutionEnvironment: Sized {
     ) -> EnvResult<()>;
 
     /// Applies a pending write batch into the partial state.
+    // NOTE: should this be moved to BlockAssembler?
     fn merge_write_into_state(
         &self,
         state: &mut Self::PartialState,
         wb: &Self::WriteBatch,
     ) -> EnvResult<()>;
 }
+
+/// Block assembly trait for constructing complete headers from execution outputs.
+///
+/// This trait is separate from ExecutionEnvironment because header completion
+/// is only needed when building new blocks, not when verifying existing blocks.
+/// The ExecutionEnvironment trait focuses on proof-related operations.
+pub trait BlockAssembler: ExecutionEnvironment {
+    /// Constructs a complete header from header intrinsics and execution outputs.
+    ///
+    /// This combines the header intrinsics (parent hash, timestamp, etc.) with
+    /// the computed commitments from execution (state root, logs bloom, etc.)
+    /// to produce a complete block header.
+    fn complete_header(
+        &self,
+        exec_payload: &ExecPayload<'_, Self::Block>,
+        output: &ExecBlockOutput<Self>,
+    ) -> EnvResult<<Self::Block as ExecBlock>::Header>;
+}

crates/evm-ee/Cargo.toml

@@ -0,0 +1,50 @@
+[package]
+name = "strata-evm-ee"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+# Strata crates
+strata-acct-types.workspace = true
+strata-codec.workspace = true
+strata-ee-acct-types.workspace = true
+strata-ee-chain-types.workspace = true
+strata-ol-msg-types.workspace = true
+
+# RSP for sparse MPT and execution
+rsp-client-executor.workspace = true
+rsp-mpt.workspace = true
+
+# Reth for EVM execution
+alpen-reth-evm.workspace = true
+alpen-reth-primitives.workspace = true
+reth-chainspec.workspace = true
+reth-consensus-common.workspace = true
+reth-errors.workspace = true
+reth-evm.workspace = true
+reth-evm-ethereum.workspace = true
+reth-primitives.workspace = true
+reth-primitives-traits.workspace = true
+reth-trie.workspace = true              # Used for HashedPostState in EvmWriteBatch
+
+# REVM
+revm.workspace = true
+revm-primitives.workspace = true
+
+# Alloy for Ethereum types
+alloy-consensus = { workspace = true, features = ["serde-bincode-compat"] }
+alloy-rlp.workspace = true
+
+# Serialization
+rlp.workspace = true
+
+# Utilities
+itertools.workspace = true
+
+[dev-dependencies]
+alloy-eips.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+[lints]
+workspace = true