Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: SparseStateTrie's BlindedProviderFactory is boxed #13463

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: SparseStateTrie's BlindedProviderFactory is boxed #13463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3c323a
provider factory boxed
nadtech-hub Dec 19, 2024
9056e24
Boxes removed from StateRootTask
nadtech-hub Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions crates/engine/tree/src/tree/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ pub enum StateRootMessage<BPF: BlindedProviderFactory> {
/// New state update from transaction execution
StateUpdate(EvmState),
/// Proof calculation completed for a specific state update
ProofCalculated(Box<ProofCalculated>),
ProofCalculated(ProofCalculated),
/// Error during proof calculation
ProofCalculationError(ProviderError),
/// State root calculation completed
RootCalculated {
/// The updated sparse trie
trie: Box<SparseStateTrie<BPF>>,
trie: SparseStateTrie<BPF>,
/// Time taken to calculate the root
elapsed: Duration,
},
Expand Down Expand Up @@ -273,7 +273,7 @@ pub struct StateRootTask<'env, Factory, BPF: BlindedProviderFactory> {
proof_sequencer: ProofSequencer,
/// The sparse trie used for the state root calculation. If [`None`], then update is in
/// progress.
sparse_trie: Option<Box<SparseStateTrie<BPF>>>,
sparse_trie: Option<SparseStateTrie<BPF>>,
/// Reference to the shared thread pool for parallel proof generation
thread_pool: &'env rayon::ThreadPool,
}
Expand Down Expand Up @@ -307,7 +307,7 @@ where
tx,
fetched_proof_targets: Default::default(),
proof_sequencer: ProofSequencer::new(),
sparse_trie: Some(Box::new(SparseStateTrie::new(blinded_provider).with_updates(true))),
sparse_trie: Some(SparseStateTrie::new(blinded_provider).with_updates(true)),
thread_pool,
}
}
Expand Down Expand Up @@ -408,12 +408,12 @@ where
match result {
Ok(proof) => {
let _ = state_root_message_sender.send(StateRootMessage::ProofCalculated(
Box::new(ProofCalculated {
ProofCalculated {
state_update: hashed_state_update,
targets: proof_targets,
proof,
sequence_number: proof_sequence_number,
}),
},
));
}
Err(error) => {
Expand Down Expand Up @@ -751,11 +751,11 @@ fn update_sparse_trie<
SBP: BlindedProvider<Error = SparseTrieError> + Send + Sync,
BPF: BlindedProviderFactory<AccountNodeProvider = ABP, StorageNodeProvider = SBP> + Send + Sync,
>(
mut trie: Box<SparseStateTrie<BPF>>,
mut trie: SparseStateTrie<BPF>,
multiproof: MultiProof,
targets: MultiProofTargets,
state: HashedPostState,
) -> SparseStateTrieResult<(Box<SparseStateTrie<BPF>>, Duration)> {
) -> SparseStateTrieResult<(SparseStateTrie<BPF>, Duration)> {
trace!(target: "engine::root::sparse", "Updating sparse trie");
let started_at = Instant::now();

Expand Down
4 changes: 2 additions & 2 deletions crates/trie/sparse/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use std::{fmt, iter::Peekable};
/// Sparse state trie representing lazy-loaded Ethereum state trie.
pub struct SparseStateTrie<F: BlindedProviderFactory = DefaultBlindedProviderFactory> {
/// Blinded node provider factory.
provider_factory: F,
provider_factory: Box<F>,
/// Sparse account trie.
state: SparseTrie<F::AccountNodeProvider>,
/// Sparse storage tries.
Expand Down Expand Up @@ -72,7 +72,7 @@ impl<F: BlindedProviderFactory> SparseStateTrie<F> {
/// Create new [`SparseStateTrie`] with blinded node provider factory.
pub fn new(provider_factory: F) -> Self {
Self {
provider_factory,
provider_factory: Box::new(provider_factory),
state: Default::default(),
storages: Default::default(),
revealed: Default::default(),
Expand Down
Loading