Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: read sidecars from table in get_take_block_range #79

Merged
merged 2 commits into from
Jul 22, 2024
Merged

fix: read sidecars from table in get_take_block_range #79

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51044fb
fix: read sidecars from table in `get_take_block_range`
pythonberg1997 Jul 22, 2024
6725558
fix lint issue
pythonberg1997 Jul 22, 2024
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
17 changes: 13 additions & 4 deletions crates/storage/provider/src/providers/database/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,7 @@ impl<TX: DbTxMut + DbTx> DatabaseProvider<TX> {
let block_withdrawals =
self.get_or_take::<tables::BlockWithdrawals, TAKE>(range.clone())?;
let block_requests = self.get_or_take::<tables::BlockRequests, TAKE>(range.clone())?;
let block_sidecars = self.get_or_take::<tables::Sidecars, TAKE>(range.clone())?;

let block_tx = self.get_take_block_transaction_range::<TAKE>(range.clone())?;

Expand All @@ -993,9 +994,11 @@ impl<TX: DbTxMut + DbTx> DatabaseProvider<TX> {
let mut block_ommers_iter = block_ommers.into_iter();
let mut block_withdrawals_iter = block_withdrawals.into_iter();
let mut block_requests_iter = block_requests.into_iter();
let mut block_sidecars_iter = block_sidecars.into_iter();
let mut block_ommers = block_ommers_iter.next();
let mut block_withdrawals = block_withdrawals_iter.next();
let mut block_requests = block_requests_iter.next();
let mut block_sidecars = block_sidecars_iter.next();

let mut blocks = Vec::new();
for ((main_block_number, header), (_, header_hash), (_, tx)) in
Expand Down Expand Up @@ -1044,10 +1047,16 @@ impl<TX: DbTxMut + DbTx> DatabaseProvider<TX> {
}

// sidecars can be missing
let sidecars = if self.chain_spec.is_cancun_active_at_timestamp(header.timestamp) {
self.static_file_provider.sidecars(&header.hash())?
} else {
None
let cancun_is_active = self.chain_spec.is_cancun_active_at_timestamp(header.timestamp);
let mut sidecars = Some(BlobSidecars::default());
if cancun_is_active {
if let Some((block_number, _)) = block_sidecars.as_ref() {
if *block_number == main_block_number {
sidecars = Some(block_sidecars.take().unwrap().1);
block_sidecars = block_sidecars_iter.next();
}
} } else {
sidecars = None;
};

blocks.push(SealedBlockWithSenders {
Expand Down
Loading