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

Cherry-pick #3741: Fix update datastream file #3760

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Cherry-pick #3741: Fix update datastream file #3760

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
57 changes: 38 additions & 19 deletions state/datastream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,26 +315,43 @@ func GenerateDataStreamFile(ctx context.Context, streamServer *datastreamer.Stre
}

currentL2BlockNumber := transaction.L2BlockNumber
currentBatchNumber = transaction.L2BlockNumber
lastAddedL2BlockNumber = currentL2BlockNumber

// Get Previous l2block timestamp
bookMark := &datastream.BookMark{
// Get current batch number
bookMarkCurrentL2Block := &datastream.BookMark{
Type: datastream.BookmarkType_BOOKMARK_TYPE_L2_BLOCK,
Value: currentL2BlockNumber - 1,
Value: currentL2BlockNumber,
}

marshalledBookMark, err := proto.Marshal(bookMark)
marshalledBookMarkCurrentL2Block, err := proto.Marshal(bookMarkCurrentL2Block)
if err != nil {
return err
}

prevL2BlockEntryNumber, err := streamServer.GetBookmark(marshalledBookMark)
currentL2BlockEntry, err := streamServer.GetFirstEventAfterBookmark(marshalledBookMarkCurrentL2Block)
if err != nil {
return err
}

prevL2BlockEntry, err := streamServer.GetEntry(prevL2BlockEntryNumber)
currentL2Block := &datastream.L2Block{}
if err := proto.Unmarshal(currentL2BlockEntry.Data, currentL2Block); err != nil {
return err
}

currentBatchNumber = currentL2Block.BatchNumber

// Get Previous l2block timestamp
bookMarkPrevL2Block := &datastream.BookMark{
Type: datastream.BookmarkType_BOOKMARK_TYPE_L2_BLOCK,
Value: currentL2BlockNumber - 1,
}

marshalledBookMarkPrevL2Block, err := proto.Marshal(bookMarkPrevL2Block)
if err != nil {
return err
}

prevL2BlockEntry, err := streamServer.GetFirstEventAfterBookmark(marshalledBookMarkPrevL2Block)
if err != nil {
return err
}
Expand Down Expand Up @@ -683,20 +700,22 @@ func GenerateDataStreamFile(ctx context.Context, streamServer *datastreamer.Stre
}
}

batchEnd := &datastream.BatchEnd{
Number: batch.BatchNumber,
LocalExitRoot: batch.LocalExitRoot.Bytes(),
StateRoot: batch.StateRoot.Bytes(),
}
if !batch.WIP {
batchEnd := &datastream.BatchEnd{
Number: batch.BatchNumber,
LocalExitRoot: batch.LocalExitRoot.Bytes(),
StateRoot: batch.StateRoot.Bytes(),
}

marshalledBatch, err := proto.Marshal(batchEnd)
if err != nil {
return err
}
marshalledBatch, err := proto.Marshal(batchEnd)
if err != nil {
return err
}

_, err = streamServer.AddStreamEntry(datastreamer.EntryType(datastream.EntryType_ENTRY_TYPE_BATCH_END), marshalledBatch)
if err != nil {
return err
_, err = streamServer.AddStreamEntry(datastreamer.EntryType(datastream.EntryType_ENTRY_TYPE_BATCH_END), marshalledBatch)
if err != nil {
return err
}
}

// Commit at the end of each batch group
Expand Down
Loading