Fix block cache deserialization for old ethereum blocks#6330
Open
incrypto32 wants to merge 3 commits intomasterfrom
Open
Fix block cache deserialization for old ethereum blocks#6330incrypto32 wants to merge 3 commits intomasterfrom
incrypto32 wants to merge 3 commits intomasterfrom
Conversation
Add a dedicated module for JSON patching utilities that handle missing `type` fields in Ethereum transactions and receipts. This consolidates patching logic that will be used by both the HTTP transport layer (for RPC responses) and cache deserialization (for stored blocks). The module provides: - patch_type_field: Adds "type": "0x0" to JSON objects missing the field - patch_block_transactions: Patches all transactions in a block - patch_receipts: Patches single receipts or arrays of receipts
Refactor the HTTP transport's receipt patching to use the shared json_patch module instead of duplicating the patching logic. This removes the patch_receipt and patch_result methods from PatchingHttp and replaces them with calls to json_patch::patch_receipts. The patch_rpc_response and patch_response methods remain as they handle RPC-specific JSON-RPC response structure.
Add patching for cached blocks before deserialization to handle blocks that were cached before March 2022 when graph-node's rust-web3 fork didn't capture the transaction type field. This patches transactions and receipts in cached blocks at two locations: - ancestor_block(): For full block deserialization (EthereumBlock), patches both transactions and transaction_receipts - parent_ptr(): For light block deserialization (LightEthereumBlock), patches only transactions (light blocks don't include receipts) The patching adds type: 0x0 (legacy) to transactions/receipts missing the field, allowing alloy to deserialize blocks that would otherwise fail due to the missing required field.
incrypto32
force-pushed
the
krishna/unified-json-patching
branch
from
5eaa074 to
c52a748
Compare
lutter
requested changes
Feb 5, 2026
Collaborator
lutter
left a comment
lutter
left a comment
There was a problem hiding this comment.
Looks good, but I would tighten up the code by introducing a new JsonBlock type that helps with determining what the block is and conversion into one of our blocks.
| if json.get("block").is_none() { | ||
| warn!( | ||
| // Shallow blocks have "data": null - no block data to deserialize | ||
| if json.get("data") == Some(&json::Value::Null) { |
Collaborator
There was a problem hiding this comment.
Since this check is repeated a few times and a little noisy, I wonder if it wouldn't be better to introduce a newtype JsonBlock(json::Value) so that you could have methods like is_shallow(&self) and patch_transactions on that
| let mut json = json; | ||
| if let Some(block) = json.get_mut("block") { | ||
| json_patch::patch_block_transactions(block); | ||
| } |
Collaborator
There was a problem hiding this comment.
I would put the entire if statement into a json_block.path_block_transactions() method
| } | ||
| if let Some(receipts) = json.get_mut("transaction_receipts") { | ||
| json_patch::patch_receipts(receipts); | ||
| } |
| if let Some(receipts) = json.get_mut("transaction_receipts") { | ||
| json_patch::patch_receipts(receipts); | ||
| } | ||
| match json::from_value::<EthereumBlock>(json) { |
Collaborator
There was a problem hiding this comment.
or since patching happens here and on line 1205, just have a JsonBlock::patched_block<T>(self) -> Result<T, SomeError> that does the patching and conversion
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.