Merge remote-tracking branch 'scroll/scroll' into feat/scroll-state-r…

…oot-provider
scroll-tech · Dec 4, 2024 · b3de8e6 · b3de8e6
2 parents 94c9788 + 59a1ccd
commit b3de8e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs
@@ -259,8 +259,7 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
                 let block_with_senders =
                     SealedBlockWithSenders::<BlockTy<N>>::new(block.clone(), senders).unwrap();
 
-                let state_provider = blockchain_db.latest()?;
-                let db = StateProviderDatabase::new(&state_provider);
+                let db = StateProviderDatabase::new(blockchain_db.latest()?);
                 let executor =
                     EthExecutorProvider::ethereum(provider_factory.chain_spec()).executor(db);
 

diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs
@@ -69,7 +69,7 @@ use reth_trie::{
     updates::{StorageTrieUpdates, TrieUpdates},
     HashedPostStateSorted, KeyHasher, Nibbles, StoredNibbles,
 };
-use reth_trie_db::{DatabaseStorageTrieCursor, StateCommitment};
+use reth_trie_db::{DatabaseStateRoot, DatabaseStorageTrieCursor, StateCommitment};
 use revm::{
     db::states::{PlainStateReverts, PlainStorageChangeset, PlainStorageRevert, StateChangeset},
     primitives::{BlockEnv, CfgEnvWithHandlerCfg},