block: fix the block body parsing as well as save/load from blockchain #3392
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
g11tech
commented
May 3, 2024
| @@ -43,14 +43,7 @@ function DBSetBlockOrHeader(blockBody: Block | BlockHeader): DBOp[] { | |||
|
|
|||
| const isGenesis = header.number === BIGINT_0 | |||
|
|
|||
| if ( | |||
There was a problem hiding this comment.
I think the optimization of not saving the body when there aren't non zero fields is not worth it compared to the body load complexity where we would push empty [] to resconstruct the body
g11tech
commented
May 3, 2024
| @@ -107,40 +104,6 @@ export class DBManager { | |||
| if (hash === undefined || number === undefined) return undefined | |||
| const header = await this.getHeader(hash, number) | |||
| const body = await this.getBody(hash, number) | |||
| if (body[0].length === 0 && body[1].length === 0) { | |||
There was a problem hiding this comment.
we don't need this reconstruction now because we now just simply write the body array as is
g11tech
commented
May 3, 2024
| @@ -217,10 +220,22 @@ export class Block { | |||
|
|
|||
| // First try to load header so that we can use its common (in case of setHardfork being activated) | |||
| // to correctly make checks on the hardforks | |||
| const [headerData, txsData, uhsData, withdrawalBytes, requestBytes, executionWitnessBytes] = | |||
There was a problem hiding this comment.
we can't do a simple assignment because this sequence is dependent on the eip activation
g11tech
commented
May 3, 2024
| @@ -375,8 +375,8 @@ export class Blockchain implements BlockchainInterface { | |||
| async getCanonicalHeadHeader(): Promise<BlockHeader> { | |||
| return this.runWithLock<BlockHeader>(async () => { | |||
| if (!this._headHeaderHash) throw new Error('No head header set') | |||
| const block = await this.getBlock(this._headHeaderHash) | |||
| return block.header | |||
| const header = await this._getHeader(this._headHeaderHash) | |||
There was a problem hiding this comment.
various fixes in this class to not refer block for header based functionality
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.
fixes the block body parsing and removes the body save optimization making the body load simple enough
tested kaustinen6 network and confimed working (so in general all post merge networks) as well as mainnet pow first few thousand blocks