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

fix: don't unwrap missing requests (#11646)

Browse Source
This commit is contained in:
Matthias Seitz
2024-10-10 18:54:06 +02:00
committed by GitHub
parent 1d2c6d5ada
commit fca1cd8181
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/storage/codecs/src/alloy/header.rs
View File

@ -181,4 +181,14 @@ mod tests {
let len = header.to_compact(&mut encoded_header);
assert_eq!(header, Header::from_compact(&encoded_header, len).0);
}
#[test]
fn test_extra_fields_missing() {
let mut header = HOLESKY_BLOCK;
header.extra_fields = None;
let mut encoded_header = vec![];
let len = header.to_compact(&mut encoded_header);
assert_eq!(header, Header::from_compact(&encoded_header, len).0);
}
}

12
crates/storage/provider/src/providers/database/provider.rs
View File

@ -2151,10 +2151,8 @@ impl<TX: DbTx, Spec: Send + Sync + EthereumHardforks> RequestsProvider
) -> ProviderResult<Option<Requests>> {
if self.chain_spec.is_prague_active_at_timestamp(timestamp) {
if let Some(number) = self.convert_hash_or_number(id)? {
// If we are past Prague, then all blocks should have a requests list, even if
// empty
let requests = self.tx.get::<tables::BlockRequests>(number)?.unwrap_or_default();
return Ok(Some(requests))
let requests = self.tx.get::<tables::BlockRequests>(number)?;
return Ok(requests)
}
}
Ok(None)
@ -3483,10 +3481,8 @@ impl<TX: DbTxMut + DbTx + 'static, Spec: Send + Sync + EthereumHardforks + 'stat
}
if let Some(requests) = block.block.body.requests {
if !requests.0.is_empty() {
self.tx.put::<tables::BlockRequests>(block_number, requests)?;
durations_recorder.record_relative(metrics::Action::InsertBlockRequests);
}
self.tx.put::<tables::BlockRequests>(block_number, requests)?;
durations_recorder.record_relative(metrics::Action::InsertBlockRequests);
}
let block_indices = StoredBlockBodyIndices { first_tx_num, tx_count };