Skip to content

Commit d132b5c

Browse files
authored
Merge branch 'master' into fix/build-chainspec
2 parents bcce7b0 + 702d98d commit d132b5c

File tree

9 files changed

+197
-1564
lines changed

9 files changed

+197
-1564
lines changed

Cargo.lock

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/core/src/database.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use sbv_primitives::{
1111
revm::{AccountInfo, Bytecode},
1212
},
1313
};
14-
use sbv_trie::r0::SparseState;
14+
use sbv_trie::SparseState;
1515
use std::collections::BTreeMap;
1616

1717
/// A database that consists of account and storage information.

crates/core/src/verifier/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use sbv_primitives::{
99
chainspec::ChainSpec,
1010
types::{reth::primitives::Block, rpc::ExecutionWitness},
1111
};
12-
use sbv_trie::{HashedPostState, KeccakKeyHasher, r0::SparseState};
12+
use sbv_trie::{HashedPostState, KeccakKeyHasher, SparseState};
1313
use std::sync::Arc;
1414

1515
#[cfg(feature = "scroll")]

crates/core/src/verifier/scroll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use reth_stateless::{StatelessTrie, validation::StatelessValidationError};
66
use sbv_primitives::{
77
Address, B256, U256, chainspec::ChainSpec, types::reth::evm::execute::ProviderError,
88
};
9-
use sbv_trie::r0::SparseState;
9+
use sbv_trie::SparseState;
1010
use std::sync::Arc;
1111

1212
/// State commit mode for the block witness verification process.

crates/trie/Cargo.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ alloy-rlp.workspace = true
1616
alloy-trie.workspace = true
1717
reth-trie.workspace = true
1818
reth-stateless.workspace = true
19-
serde = { workspace = true, features = ["derive"] }
20-
rlp = "0.5"
2119
risc0-ethereum-trie = { workspace = true, features = ["serde"] }
22-
2320
sbv-primitives = { workspace = true, features = ["revm-types", "reth-evm-types"] }
24-
sbv-helpers.workspace = true
25-
26-
thiserror.workspace = true
2721
tracing = { workspace = true, optional = true }
2822

29-
3023
[features]
3124
dev = ["dep:tracing", "sbv-primitives/dev"]
3225

crates/trie/src/execution_witness.rs

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)