refactor: replace dependency on Block with BlockHeader and Chunks on apply chunk
#12746
+144
−94
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12746 +/- ##
==========================================
- Coverage 70.74% 70.73% -0.01%
==========================================
Files 848 848
Lines 174301 174335 +34
Branches 174301 174335 +34
==========================================
+ Hits 123303 123312 +9
- Misses 45856 45871 +15
- Partials 5142 5152 +10
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
VanBarbascu
approved these changes
Jan 16, 2025
| // Before `FixApplyChunks` feature, gas price was taken from current | ||
| // block by mistake. Preserve it for backwards compatibility. | ||
| let gas_price = if !is_new_chunk | ||
| && protocol_version < ProtocolFeature::FixApplyChunks.protocol_version() | ||
| let gas_price = if protocol_version >= ProtocolFeature::FixApplyChunks.protocol_version() |
There was a problem hiding this comment.
Suggested change
| let gas_price = if protocol_version >= ProtocolFeature::FixApplyChunks.protocol_version() | |
| let gas_price = if ProtocolFeature::FixApplyChunks.enabled(protocol_version) |
| @@ -3722,30 +3742,38 @@ impl Chain { | |||
| fn get_update_shard_job( | |||
| &self, | |||
| me: &Option<AccountId>, | |||
| block: &Block, | |||
| // TODO(#10584): introduce separate structure which can be derived from | |||
There was a problem hiding this comment.
This can be an enum that either has Block or OptimisticBlock.
| let epoch_id = self.epoch_manager.get_epoch_id_from_prev_block(prev_hash)?; | ||
| let shard_layout = self.epoch_manager.get_shard_layout(&epoch_id)?; | ||
| let shard_id = shard_layout.get_shard_id(shard_index)?; | ||
| let chunk_header = &chunk_headers[shard_index]; |
There was a problem hiding this comment.
In Chunks struct, they say that Index trait is deprecated and recommends using .get() instead. Just to align with the new resharding implementattion.
Suggested change
| let chunk_header = &chunk_headers[shard_index]; | |
| let chunk_header = &chunk_headers.get(shard_index); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Context
We want to improve chunk processing efficiency by applying chunks optimistically (#10584), when all partial chunks for the next height and block metadata (from an
OptimisticBlock) are already available. This allows the results of chunk application to be reused when the actual block is received, enabling the next chunk to be produced immediately.Currently, this work is a step towards supporting
OptimisticBlock. WhileOptimisticBlockis not introduced yet, this refactor prepares the codebase for its implementation by reducing data dependency on the current block.Change
I replaced the dependency on
Blockwithblock_metadata: &BlockHeaderandchunk_headers: &Chunks. Theblock_metadatacurrently is just a block header information and later must be aligned withOptimisticBlock. Chunk headers are just taken from block, and for optimistic block, they must be supplied by ShardsManager.Some APIs are refactored to reflect that change.
Next steps
block_metadatamust become theOptimisticBlock, orBlockMetadata, etc - we need to think about it.get_update_shard_jobforOptimisticBlockand reuse result if it is called for the actualBlock.