Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,7 @@ url = { version = "2.5.8", default-features = false }
vergen = "9.1.0"
vergen-git2 = "9.1.0"
byteorder = "1"
crossbeam-channel = "0.5.13"

# allocators
jemalloc_pprof = { version = "0.8", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion rust/op-reth/crates/cli/src/commands/op_proofs/prune.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ impl<C: ChainSpecParser<ChainSpec = OpChainSpec>> PruneCommand<C> {
storage,
provider_factory,
self.proofs_history_window,
self.proofs_history_prune_batch_size,
);
let pruner = pruner.with_batch_size(self.proofs_history_prune_batch_size);
pruner.run();
}};
}
Expand Down
367 changes: 195 additions & 172 deletions rust/op-reth/crates/exex/src/lib.rs

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions rust/op-reth/crates/node/src/proof_history.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ pub async fn launch_node_with_proof_history(
let RollupArgs {
proofs_history,
proofs_history_window,
proofs_history_prune_interval,
proofs_history_verification_interval,
proofs_history_storage_version,
..
Expand Down Expand Up @@ -64,7 +63,6 @@ pub async fn launch_node_with_proof_history(
.install_exex("proofs-history", async move |exex_context| {
Ok(OpProofsExEx::builder(exex_context, storage_exec)
.with_proofs_history_window(proofs_history_window)
.with_proofs_history_prune_interval(proofs_history_prune_interval)
.with_verification_interval(proofs_history_verification_interval)
.build()
.run()
Expand Down
1 change: 1 addition & 0 deletions rust/op-reth/crates/trie/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ auto_impl.workspace = true
eyre = { workspace = true, optional = true }
strum.workspace = true
tracing.workspace = true
crossbeam-channel.workspace = true
derive_more.workspace = true

[dev-dependencies]
Expand Down
3 changes: 3 additions & 0 deletions rust/op-reth/crates/trie/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ pub enum OpProofsStorageError {
Please clear proofs data and retry initialization."
)]
InitializeStorageInconsistentState,
/// Other error with a message.
#[error("{0}")]
Other(String),
}

impl From<BlockExecutionError> for OpProofsStorageError {
Expand Down
4 changes: 4 additions & 0 deletions rust/op-reth/crates/trie/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ pub type OpProofsStorage<S> = S;
pub mod proof;

pub mod provider;
pub mod overlay_provider;

pub mod live;

Expand All @@ -65,3 +66,6 @@ pub use prune::{
OpProofStoragePruner, OpProofStoragePrunerResult, OpProofStoragePrunerTask, PrunerError,
PrunerOutput,
};

pub mod state;
pub mod persistence;
Loading