jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: remove unnecessary state clone (#4763)

Browse Source
This commit is contained in:
Roman Krasiuk
2023-09-25 16:48:48 +03:00
committed by GitHub
parent 1b17453261
commit 0f9def08c0
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/blockchain-tree/src/chain.rs
View File

@ -210,7 +210,7 @@ impl AppendableChain {
// check state root if the block extends the canonical chain.
if block_kind.extends_canonical_head() {
// check state root
let state_root = provider.state_root(bundle_state.clone())?;
let state_root = provider.state_root(&bundle_state)?;
if block.state_root != state_root {
return Err(ConsensusError::BodyStateRootDiff {
got: state_root,

2
crates/consensus/auto-seal/src/lib.rs
View File

@ -353,7 +353,7 @@ impl StorageInner {
let state_root = client
.latest()
.map_err(|_| BlockExecutionError::ProviderError)?
.state_root(bundle_state.clone())
.state_root(bundle_state)
.unwrap();
header.state_root = state_root;
Ok(header)

4
crates/payload/basic/src/lib.rs
View File

@ -793,7 +793,7 @@ where
let logs_bloom = bundle.block_logs_bloom(block_number).expect("Number is in range");
// calculate the state root
let state_root = state_provider.state_root(bundle)?;
let state_root = state_provider.state_root(&bundle)?;
// create the block header
let transactions_root = proofs::calculate_transaction_root(&executed_txs);
@ -909,7 +909,7 @@ where
// calculate the state root
let bundle_state = BundleStateWithReceipts::new(db.take_bundle(), vec![], block_number);
let state_root = state.state_root(bundle_state)?;
let state_root = state.state_root(&bundle_state)?;
let header = Header {
parent_hash: parent_block.hash,

2
crates/revm/src/processor.rs
View File

@ -623,7 +623,7 @@ mod tests {
}
impl StateRootProvider for StateProviderTest {
fn state_root(&self, _bundle_state: BundleStateWithReceipts) -> RethResult<H256> {
fn state_root(&self, _bundle_state: &BundleStateWithReceipts) -> RethResult<H256> {
todo!()
}
}

2
crates/rpc/rpc/src/eth/api/pending_block.rs
View File

@ -193,7 +193,7 @@ impl PendingBlockEnv {
let logs_bloom = bundle.block_logs_bloom(block_number).expect("Block is present");
// calculate the state root
let state_root = state_provider.state_root(bundle)?;
let state_root = state_provider.state_root(&bundle)?;
// create the block header
let transactions_root = proofs::calculate_transaction_root(&executed_txs);

6
crates/storage/provider/src/providers/bundle_state_provider.rs
View File

@ -58,10 +58,10 @@ impl<SP: StateProvider, BSDP: BundleStateDataProvider> AccountReader
impl<SP: StateProvider, BSDP: BundleStateDataProvider> StateRootProvider
for BundleStateProvider<SP, BSDP>
{
fn state_root(&self, post_state: BundleStateWithReceipts) -> RethResult<H256> {
fn state_root(&self, post_state: &BundleStateWithReceipts) -> RethResult<H256> {
let mut state = self.post_state_data_provider.state().clone();
state.extend(post_state);
self.state_provider.state_root(state)
state.extend(post_state.clone());
self.state_provider.state_root(&state)
}
}

2
crates/storage/provider/src/providers/state/historical.rs
View File

@ -205,7 +205,7 @@ impl<'a, 'b, TX: DbTx<'a>> BlockHashReader for HistoricalStateProviderRef<'a, 'b
}
impl<'a, 'b, TX: DbTx<'a>> StateRootProvider for HistoricalStateProviderRef<'a, 'b, TX> {
fn state_root(&self, _post_state: BundleStateWithReceipts) -> RethResult<H256> {
fn state_root(&self, _post_state: &BundleStateWithReceipts) -> RethResult<H256> {
Err(ProviderError::StateRootNotAvailableForHistoricalBlock.into())
}
}

2
crates/storage/provider/src/providers/state/latest.rs
View File

@ -60,7 +60,7 @@ impl<'a, 'b, TX: DbTx<'a>> BlockHashReader for LatestStateProviderRef<'a, 'b, TX
}
impl<'a, 'b, TX: DbTx<'a>> StateRootProvider for LatestStateProviderRef<'a, 'b, TX> {
fn state_root(&self, bundle_state: BundleStateWithReceipts) -> RethResult<H256> {
fn state_root(&self, bundle_state: &BundleStateWithReceipts) -> RethResult<H256> {
bundle_state.state_root_slow(self.db).map_err(|err| RethError::Database(err.into()))
}
}

2
crates/storage/provider/src/providers/state/macros.rs
View File

@ -31,7 +31,7 @@ macro_rules! delegate_provider_impls {
$crate::providers::state::macros::delegate_impls_to_as_ref!(
for $target =>
StateRootProvider $(where [$($generics)*])? {
fn state_root(&self, state: crate::BundleStateWithReceipts) -> reth_interfaces::RethResult<reth_primitives::H256>;
fn state_root(&self, state: &crate::BundleStateWithReceipts) -> reth_interfaces::RethResult<reth_primitives::H256>;
}
AccountReader $(where [$($generics)*])? {
fn basic_account(&self, address: reth_primitives::Address) -> reth_interfaces::RethResult<Option<reth_primitives::Account>>;

2
crates/storage/provider/src/test_utils/mock.rs
View File

@ -476,7 +476,7 @@ impl AccountReader for MockEthProvider {
}
impl StateRootProvider for MockEthProvider {
fn state_root(&self, _state: BundleStateWithReceipts) -> RethResult<H256> {
fn state_root(&self, _state: &BundleStateWithReceipts) -> RethResult<H256> {
todo!()
}
}

2
crates/storage/provider/src/test_utils/noop.rs
View File

@ -253,7 +253,7 @@ impl ChangeSetReader for NoopProvider {
}
impl StateRootProvider for NoopProvider {
fn state_root(&self, _state: BundleStateWithReceipts) -> RethResult<H256> {
fn state_root(&self, _state: &BundleStateWithReceipts) -> RethResult<H256> {
todo!()
}
}

2
crates/storage/provider/src/traits/state.rs
View File

@ -234,5 +234,5 @@ pub trait BundleStateDataProvider: Send + Sync {
#[auto_impl[Box,&, Arc]]
pub trait StateRootProvider: Send + Sync {
/// Returns the state root of the BundleState on top of the current state.
fn state_root(&self, post_state: BundleStateWithReceipts) -> RethResult<H256>;
fn state_root(&self, post_state: &BundleStateWithReceipts) -> RethResult<H256>;
}