Skip to content

Commit f11e2ea

Browse files
santamasamattsse
andauthored
chore: fix PoS total difficulty calculation (paradigmxyz#15452)
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
1 parent 6f8082a commit f11e2ea

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

bin/reth/src/commands/debug_cmd/merkle.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! Command for debugging merkle tree calculation.
22
use crate::{args::NetworkArgs, providers::ExecutionOutcome, utils::get_single_header};
3-
use alloy_consensus::BlockHeader;
43
use alloy_eips::BlockHashOrNumber;
54
use backon::{ConstantBuilder, Retryable};
65
use clap::Parser;
@@ -21,8 +20,8 @@ use reth_node_api::{BlockTy, NodePrimitives};
2120
use reth_node_ethereum::{consensus::EthBeaconConsensus, EthExecutorProvider};
2221
use reth_provider::{
2322
providers::ProviderNodeTypes, BlockNumReader, BlockWriter, ChainSpecProvider,
24-
DatabaseProviderFactory, HeaderProvider, LatestStateProviderRef, OriginalValuesKnown,
25-
ProviderError, ProviderFactory, StateWriter, StorageLocation,
23+
DatabaseProviderFactory, LatestStateProviderRef, OriginalValuesKnown, ProviderFactory,
24+
StateWriter, StorageLocation,
2625
};
2726
use reth_revm::database::StateProviderDatabase;
2827
use reth_stages::{
@@ -143,10 +142,6 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
143142
.get_full_block_range(to_header.hash_slow(), self.to - best_block_number)
144143
.await;
145144

146-
let mut td = provider_rw
147-
.header_td_by_number(best_block_number)?
148-
.ok_or(ProviderError::TotalDifficultyNotFound(best_block_number))?;
149-
150145
let mut account_hashing_stage = AccountHashingStage::default();
151146
let mut storage_hashing_stage = StorageHashingStage::default();
152147
let mut merkle_stage = MerkleStage::default_execution();
@@ -159,7 +154,6 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
159154

160155
provider_rw.insert_block(sealed_block.clone(), StorageLocation::Database)?;
161156

162-
td += sealed_block.difficulty();
163157
let executor = executor_provider
164158
.executor(StateProviderDatabase::new(LatestStateProviderRef::new(&provider_rw)));
165159
let output = executor.execute(&sealed_block)?;

0 commit comments

Comments
 (0)