Skip to content
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

Jump to bottom

refactor get block generator #16335

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
+82 −92
Draft

refactor get block generator #16335

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
eeb8cbd
propegate forkpoint, reorder checks, fix fork typing allover
almogdepaz Sep 14, 2023
72ded77
only read from disc in one place
almogdepaz Sep 14, 2023
a0425ff
remove leftover code
almogdepaz Sep 14, 2023
9791d33
lint, fix test to use same genesis
almogdepaz Sep 18, 2023
1544069
fix basic_chain test to use same genesis
almogdepaz Sep 18, 2023
163564e
get all refs from db in one go
almogdepaz Sep 18, 2023
489bb26
fix test_wallet_sync
almogdepaz Sep 18, 2023
97c70ad
revert db optimization
almogdepaz Sep 18, 2023
4b438a4
Merge branch 'main' into refactor_get_block_generator
almogdepaz Sep 18, 2023
e911183
get correct blocks for generators
almogdepaz Oct 2, 2023
b5e9ebf
pass fork point in short batch syncing
almogdepaz Oct 2, 2023
777ccce
Merge branch 'main' into refactor_get_block_generator
almogdepaz Oct 2, 2023
f5d57d5
pass fork point in short batch syncing
almogdepaz Oct 3, 2023
c5682d5
revert fork point type change
almogdepaz Oct 3, 2023
73ab429
remove redundant imports
almogdepaz Oct 4, 2023
fffc28f
fix redundant type conversion
almogdepaz Oct 4, 2023
a1c62a7
use additional blocks dict
almogdepaz Oct 4, 2023
07cbdfe
pass reorg blocks to get_block_generator
almogdepaz Oct 4, 2023
c99c512
fix forkpoint in add block
almogdepaz Oct 6, 2023
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
4 changes: 2 additions & 2 deletions chia/consensus/block_body_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async def validate_block_body(
height: uint32,
npc_result: Optional[NPCResult],
fork_point_with_peak: int,
get_block_generator: Callable[[BlockInfo, uint32], Awaitable[Optional[BlockGenerator]]],
get_block_generator: Callable[[BlockInfo, int, Dict[uint32, FullBlock]], Awaitable[Optional[BlockGenerator]]],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should bundle the fork_height and this height->block map into a class. We'll need to extend this with passing in the unspent coin set of the fork as well.

Also, I would worry about storing all the FullNode objects in memory. We're not likely to actually need all of that, and it can take up a lot of space

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what do you mean by "FullNode" objects?

*,
validate_signature: bool = True,
) -> Tuple[Optional[Err], Optional[NPCResult]]:
Expand Down Expand Up @@ -307,7 +307,7 @@ async def validate_block_body(
if curr.transactions_generator is not None:
# These blocks are in the past and therefore assumed to be valid, so get_block_generator won't raise
curr_block_generator: Optional[BlockGenerator] = await get_block_generator(
curr, uint32(0 if fork_point_with_peak is None else fork_point_with_peak)
curr, 0 if fork_point_with_peak is None else fork_point_with_peak, reorg_blocks
)
assert curr_block_generator is not None and curr.transactions_info is not None
curr_npc_result = get_name_puzzle_conditions(
Expand Down
Loading