fix(witness): collect witness using sparse trie

crates/evm/execution-errors/src/trie.rs

@@ -118,23 +118,20 @@ pub enum SparseTrieError {
 }
 
 /// Trie witness errors.
-#[derive(Error, PartialEq, Eq, Clone, Debug)]
+#[derive(Error, Debug)]
 pub enum TrieWitnessError {
     /// Error gather proofs.
     #[error(transparent)]
     Proof(#[from] StateProofError),
     /// RLP decoding error.
     #[error(transparent)]
     Rlp(#[from] alloy_rlp::Error),
+    /// Sparse state trie error.
+    #[error(transparent)]
+    Sparse(#[from] SparseStateTrieError),
     /// Missing account.
     #[error("missing account {_0}")]
     MissingAccount(B256),
-    /// Missing target node.
-    #[error("target node missing from proof {_0:?}")]
-    MissingTargetNode(Nibbles),
-    /// Unexpected empty root.
-    #[error("unexpected empty root: {_0:?}")]
-    UnexpectedEmptyRoot(Nibbles),
 }
 
 impl From<TrieWitnessError> for ProviderError {

crates/trie/sparse/src/state.rs

@@ -36,10 +36,10 @@ pub struct SparseStateTrie<F: BlindedProviderFactory = DefaultBlindedProviderFac
 impl Default for SparseStateTrie {
     fn default() -> Self {
         Self {
+            provider_factory: Default::default(),
             state: Default::default(),
             storages: Default::default(),
             revealed: Default::default(),
-            provider_factory: Default::default(),
             retain_updates: false,
             account_rlp_buf: Vec::with_capacity(TRIE_ACCOUNT_RLP_MAX_SIZE),
         }

crates/trie/trie/src/proof/blinded.rs

@@ -20,6 +20,17 @@ pub struct ProofBlindedProviderFactory<T, H> {
     prefix_sets: Arc<TriePrefixSetsMut>,
 }
 
+impl<T, H> ProofBlindedProviderFactory<T, H> {
+    /// Create new proof-based blinded provider factory.
+    pub fn new(
+        trie_cursor_factory: T,
+        hashed_cursor_factory: H,
+        prefix_sets: Arc<TriePrefixSetsMut>,
+    ) -> Self {
+        Self { trie_cursor_factory, hashed_cursor_factory, prefix_sets }
+    }
+}
+
 impl<T, H> BlindedProviderFactory for ProofBlindedProviderFactory<T, H>
 where
     T: TrieCursorFactory + Clone,
@@ -57,6 +68,17 @@ pub struct ProofBlindedAccountProvider<T, H> {
     prefix_sets: Arc<TriePrefixSetsMut>,
 }
 
+impl<T, H> ProofBlindedAccountProvider<T, H> {
+    /// Create new proof-based blinded account node provider.
+    pub fn new(
+        trie_cursor_factory: T,
+        hashed_cursor_factory: H,
+        prefix_sets: Arc<TriePrefixSetsMut>,
+    ) -> Self {
+        Self { trie_cursor_factory, hashed_cursor_factory, prefix_sets }
+    }
+}
+
 impl<T, H> BlindedProvider for ProofBlindedAccountProvider<T, H>
 where
     T: TrieCursorFactory + Clone,
@@ -89,6 +111,18 @@ pub struct ProofBlindedStorageProvider<T, H> {
     account: B256,
 }
 
+impl<T, H> ProofBlindedStorageProvider<T, H> {
+    /// Create new proof-based blinded storage node provider.
+    pub fn new(
+        trie_cursor_factory: T,
+        hashed_cursor_factory: H,
+        prefix_sets: Arc<TriePrefixSetsMut>,
+        account: B256,
+    ) -> Self {
+        Self { trie_cursor_factory, hashed_cursor_factory, prefix_sets, account }
+    }
+}
+
 impl<T, H> BlindedProvider for ProofBlindedStorageProvider<T, H>
 where
     T: TrieCursorFactory + Clone,