feat(hardfork): l2 hardfork #1212
Open
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
block/modes.go
Outdated
|
|
||
| func (m *Manager) subscribeFullNodeEvents(ctx context.Context) { | ||
| // Subscribe to new (or finalized) state updates events. | ||
| go uevent.MustSubscribe(ctx, m.Pubsub, syncLoop, settlement.EventQueryNewSettlementBatchAccepted, m.onNewStateUpdate, m.logger) |
Check notice
Code scanning / CodeQL
Spawning a Go routine
block/modes.go
Outdated
| func (m *Manager) subscribeFullNodeEvents(ctx context.Context) { | ||
| // Subscribe to new (or finalized) state updates events. | ||
| go uevent.MustSubscribe(ctx, m.Pubsub, syncLoop, settlement.EventQueryNewSettlementBatchAccepted, m.onNewStateUpdate, m.logger) | ||
| go uevent.MustSubscribe(ctx, m.Pubsub, validateLoop, settlement.EventQueryNewSettlementBatchFinalized, m.onNewStateUpdateFinalized, m.logger) |
Check notice
Code scanning / CodeQL
Spawning a Go routine
| go uevent.MustSubscribe(ctx, m.Pubsub, validateLoop, settlement.EventQueryNewSettlementBatchFinalized, m.onNewStateUpdateFinalized, m.logger) | ||
|
|
||
| // Subscribe to P2P received blocks events (used for P2P syncing). | ||
| go uevent.MustSubscribe(ctx, m.Pubsub, p2pGossipLoop, p2p.EventQueryNewGossipedBlock, m.OnReceivedBlock, m.logger) |
Check notice
Code scanning / CodeQL
Spawning a Go routine
|
|
||
| // Subscribe to P2P received blocks events (used for P2P syncing). | ||
| go uevent.MustSubscribe(ctx, m.Pubsub, p2pGossipLoop, p2p.EventQueryNewGossipedBlock, m.OnReceivedBlock, m.logger) | ||
| go uevent.MustSubscribe(ctx, m.Pubsub, p2pBlocksyncLoop, p2p.EventQueryNewBlockSyncBlock, m.OnReceivedBlock, m.logger) |
Check notice
Code scanning / CodeQL
Spawning a Go routine
srene
force-pushed
the
srene/hardfork-fix
branch
from
68644a8
to
217ba07
Compare
mtsitrin
reviewed
Nov 11, 2024
srene
force-pushed
the
srene/hardfork-fix
branch
from
635d160
to
f815898
Compare
…ymint into srene/hardfork-fix
i think we addressed everything but there are things i dont think need to be changed now. ill add issues for what is ncessary:
|
danwt
requested changes
Nov 14, 2024
block/fork.go
Outdated
Comment on lines
39
to
40
| if err := m.checkForkUpdate(ctx); err != nil { | ||
| continue |
block/fork.go
Outdated
Comment on lines
24
to
42
| if !types.InstructionExists(m.RootDir) { | ||
| err := m.checkForkUpdate(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| ticker := time.NewTicker(LoopInterval) // TODO make this configurable | ||
| defer ticker.Stop() | ||
|
|
||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return nil | ||
| case <-ticker.C: | ||
| if err := m.checkForkUpdate(ctx); err != nil { | ||
| continue | ||
| } | ||
| } |
There was a problem hiding this comment.
can dry out and put checkForUpdate at top of for loop?
block/fork.go
Outdated
Comment on lines
162
to
167
| // Block Creation Rules: | ||
| // - Two blocks are considered in this process: | ||
| // - First block: Contains consensus messages for the fork | ||
| // - Second block: Should be empty (no messages or transactions) | ||
| // - Total height increase should be 2 blocks from RevisionStartHeight | ||
| func (m *Manager) handleCreationOfForkBlocks(instruction types.Instruction, consensusMsgs []proto.Message) error { |
There was a problem hiding this comment.
just call it create fork blocks?
block/fork.go
Outdated
| if err := m.validateExistingBlocks(instruction, 1); err != nil { | ||
| return err | ||
| } | ||
| return m.createNewBlocks(consensusMsgs, 1) // Create only the second block |
There was a problem hiding this comment.
why does second block have cons message?
block/fork.go
Outdated
Comment on lines
240
to
250
| // Create first block with consensus messages if blocksToCreate == 2 | ||
| if blocksToCreate == 2 { | ||
| if _, _, err := m.ProduceApplyGossipBlock(context.Background(), true); err != nil { | ||
| return fmt.Errorf("producing first block: %v", err) | ||
| } | ||
| } | ||
|
|
||
| // Create second empty block for both cases (blocksToCreate == 1 or 2) | ||
| if _, _, err := m.ProduceApplyGossipBlock(context.Background(), true); err != nil { | ||
| return fmt.Errorf("producing second block: %v", err) | ||
| } |
There was a problem hiding this comment.
it's allow empty, it should be forced empty
srene
force-pushed
the
srene/hardfork-fix
branch
from
047c201
to
5f0f8d1
Compare
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.
PR Standards
Opening a pull request should be able to meet the following requirements
--
PR naming convention: https://hackmd.io/@nZpxHZ0CT7O5ngTp0TP9mg/HJP_jrm7A
Close #XXX
<-- Briefly describe the content of this pull request -->
For Author:
godoccommentsFor Reviewer:
After reviewer approval: