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

change imstateroot handling in DS #3698

Merged
merged 2 commits into from
Jun 6, 2024
Merged

change imstateroot handling in DS #3698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
319a334
change imstateroot handling in DS
ToniRamirezM Jun 6, 2024
75304fa
change imstateroot handling in DS
ToniRamirezM Jun 6, 2024
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 sequencer/sequencer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,10 @@ func (s *Sequencer) sendDataToStreamer(chainID uint64) {
ImStateRoot: l2Transaction.ImStateRoot.Bytes(),
}

// Clear the state root if the ForkID is >= ETROG
// Clear the state root if the ForkID is > ETROG
// currently this is redundant as the current implementation of the sequencer
// leaves the ImStateRoot empty
if l2Block.ForkID >= state.FORKID_ETROG {
if l2Block.ForkID > state.FORKID_ETROG {
streamL2Transaction.ImStateRoot = common.Hash{}.Bytes()
}

Expand Down
4 changes: 2 additions & 2 deletions state/datastream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,8 @@ func GenerateDataStreamFile(ctx context.Context, streamServer *datastreamer.Stre
ImStateRoot: tx.StateRoot.Bytes(),
}

// Clear the state root if the ForkID is >= ETROG
if l2Block.ForkID >= FORKID_ETROG {
// Clear the state root if the ForkID is > ETROG
if l2Block.ForkID > FORKID_ETROG {
transaction.ImStateRoot = common.Hash{}.Bytes()
}

Expand Down
Loading