Skip to content

ethereum: Handle mixed block formats in recent_blocks_cache #6312

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

Open
incrypto32 wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −32
Open

ethereum: Handle mixed block formats in recent_blocks_cache #6312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 40 additions & 28 deletions chain/ethereum/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,32 +1075,42 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
.ancestor_block(ptr.clone(), offset, root.clone())
.await?;

// First check if we have the ancestor in cache and can deserialize it
// First check if we have the ancestor in cache and can deserialize it.
// recent_blocks_cache can have full format {"block": {...}, "transaction_receipts": [...]}
// or light format (just block fields). We need full format with receipts for
// ancestor_block since it's used for trigger processing.
let block_ptr = match cached {
Some((json, ptr)) => {
// Try to deserialize the cached block
match json::from_value::<EthereumBlock>(json.clone()) {
Ok(block) => {
// Successfully cached and deserialized
return Ok(Some(BlockFinality::NonFinal(EthereumBlockWithCalls {
ethereum_block: block,
calls: None,
})));
}
Err(e) => {
// Cache hit but deserialization failed
warn!(
self.logger,
"Failed to deserialize cached ancestor block #{} {} (offset {} from #{}): {}. \
This may indicate stale cache data from a previous version. \
Falling back to Firehose/RPC.",
ptr.number,
ptr.hash_hex(),
offset,
ptr_for_log.number,
e
);
ptr
if json.get("block").is_none() {
warn!(
self.logger,
"Cached ancestor block #{} {} has light format without receipts. \
Falling back to Firehose/RPC.",
ptr.number,
ptr.hash_hex(),
);
ptr
} else {
match json::from_value::<EthereumBlock>(json.clone()) {
Ok(block) => {
return Ok(Some(BlockFinality::NonFinal(EthereumBlockWithCalls {
ethereum_block: block,
calls: None,
})));
}
Err(e) => {
warn!(
self.logger,
"Failed to deserialize cached ancestor block #{} {} (offset {} from #{}): {}. \
Falling back to Firehose/RPC.",
ptr.number,
ptr.hash_hex(),
offset,
ptr_for_log.number,
e
);
ptr
}
}
}
}
Expand Down Expand Up @@ -1161,15 +1171,17 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
// First try to get the block from the store
if let Ok(blocks) = chain_store.blocks(vec![block.hash.clone()]).await {
if let Some(cached_json) = blocks.first() {
match json::from_value::<LightEthereumBlock>(cached_json.clone()) {
Ok(block) => {
return Ok(block.parent_ptr());
// recent_blocks_cache can contain full format {"block": {...}, "transaction_receipts": [...]}
// or light format (just block fields). Extract block data for deserialization.
let inner = cached_json.get("block").unwrap_or(cached_json);
match json::from_value::<LightEthereumBlock>(inner.clone()) {
Ok(light_block) => {
return Ok(light_block.parent_ptr());
}
Err(e) => {
warn!(
self.logger,
"Failed to deserialize cached block #{} {}: {}. \
This may indicate stale cache data from a previous version. \
Falling back to Firehose.",
block.number,
block.hash_hex(),
Expand Down
10 changes: 6 additions & 4 deletions chain/ethereum/src/ethereum_adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,14 +1614,16 @@ impl EthereumAdapterTrait for EthereumAdapter {
.unwrap_or_default()
.into_iter()
.filter_map(|value| {
json::from_value(value.clone())
// recent_blocks_cache can contain full format {"block": {...}, "transaction_receipts": [...]}
// or light format (just block fields). Extract block data for deserialization.
let inner = value.get("block").unwrap_or(&value);
json::from_value(inner.clone())
.map_err(|e| {
let block_num = value.get("number").and_then(|n| n.as_u64());
let block_hash = value.get("hash").and_then(|h| h.as_str());
let block_num = inner.get("number").and_then(|n| n.as_str());
let block_hash = inner.get("hash").and_then(|h| h.as_str());
warn!(
&logger,
"Failed to deserialize cached block #{:?} {:?}: {}. \
This may indicate stale cache data from a previous version. \
Block will be re-fetched from RPC.",
block_num,
block_hash,
Expand Down