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

fixed using correct blocks root for batch end #853

Merged
merged 1 commit into from
Jul 26, 2024
Merged

fixed using correct blocks root for batch end #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion zk/datastream/client/stream_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (c *StreamClient) ReadAllEntriesToChannel() error {
}

// reset the channels as there could be data ahead of the bookmark we want to track here.
c.resetChannels()
// c.resetChannels()

return err2
}
Expand Down
4 changes: 2 additions & 2 deletions zk/datastream/server/data_stream_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ func createBlockWithBatchCheckStreamEntriesProto(
if err != nil {
return nil, err
}
blockRoot := block.Root()
if endEntriesProto, err = addBatchEndEntriesProto(lastBatchNumber, &blockRoot, gers, &localExitRoot); err != nil {
lastBlockRoot := lastBlock.Root()
if endEntriesProto, err = addBatchEndEntriesProto(lastBatchNumber, &lastBlockRoot, gers, &localExitRoot); err != nil {
return nil, err
}
}
Expand Down
1 change: 1 addition & 0 deletions zk/datastream/types/batch_proto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ func UnmarshalBatchEnd(data []byte) (*BatchEnd, error) {
}

return &BatchEnd{
Number: batchEnd.Number,
LocalExitRoot: libcommon.BytesToHash(batchEnd.LocalExitRoot),
StateRoot: libcommon.BytesToHash(batchEnd.StateRoot),
Debug: ProcessDebug(batchEnd.Debug),
Expand Down
Loading