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

Fix ds data cannot be unwind #916

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Fix ds data cannot be unwind #916

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
771016e
update
zjg555543 Aug 5, 2024
eada63d
Merge branch 'zkevm' into zjg/fix-ds-unwind
zjg555543 Aug 5, 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
26 changes: 13 additions & 13 deletions zk/datastream/server/datastream_populate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ func (srv *DataStreamServer) WriteWholeBatchToStream(
batchNum uint64,
) error {
var err error
if err = srv.stream.StartAtomicOp(); err != nil {
return err
}
defer srv.stream.RollbackAtomicOp()

blocksForBatch, err := reader.GetL2BlockNosByBatch(batchNum)
if err != nil {
return err
Expand All @@ -58,6 +53,11 @@ func (srv *DataStreamServer) WriteWholeBatchToStream(
return err
}

if err = srv.stream.StartAtomicOp(); err != nil {
return err
}
defer srv.stream.RollbackAtomicOp()

blocks := make([]eritypes.Block, 0)
txsPerBlock := make(map[uint64][]eritypes.Transaction)
for blockNumber := fromBlockNum; blockNumber <= toBlockNum; blockNumber++ {
Expand Down Expand Up @@ -116,14 +116,14 @@ func (srv *DataStreamServer) WriteBlocksToStreamConsecutively(
return err
}

if err = srv.stream.StartAtomicOp(); err != nil {
if err = srv.UnwindIfNecessary(logPrefix, reader, from, latestbatchNum, batchNum); err != nil {
return err
}
defer srv.stream.RollbackAtomicOp()

if err = srv.UnwindIfNecessary(logPrefix, reader, from, latestbatchNum, batchNum); err != nil {
if err = srv.stream.StartAtomicOp(); err != nil {
return err
}
defer srv.stream.RollbackAtomicOp()

// check if a new batch starts and the old needs closing before that
// if it is already closed with a batch end, do not add a new batch end
Expand Down Expand Up @@ -220,17 +220,17 @@ func (srv *DataStreamServer) WriteBlockWithBatchStartToStream(
t := utils.StartTimer("write-stream", "writeblockstostream")
defer t.LogTimer()

if err = srv.stream.StartAtomicOp(); err != nil {
return err
}
defer srv.stream.RollbackAtomicOp()

blockNum := block.NumberU64()

if err = srv.UnwindIfNecessary(logPrefix, reader, blockNum, prevBlockBatchNum, batchNum); err != nil {
return err
}

if err = srv.stream.StartAtomicOp(); err != nil {
return err
}
defer srv.stream.RollbackAtomicOp()

// if start of new batch add batch start entries
var batchStartEntries *DataStreamEntries
if prevBlockBatchNum != batchNum {
Expand Down
Loading