Skip to content
This repository was archived by the owner on Apr 11, 2021. It is now read-only.

fix: latest value cleanups #248

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
39 changes: 21 additions & 18 deletions rollup/sync_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ func (s *SyncService) VerifierLoop() {
if err != nil {
log.Error("Cannot apply transaction", "msg", err)
}
s.SetLatestIndex(&i)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed because it now occurs within applyTransaction which would be called by maybeApplyTransaction. Is that correct?

}
time.Sleep(s.pollInterval)
}
Expand Down Expand Up @@ -391,18 +390,6 @@ func (s *SyncService) SequencerLoop() {
if err != nil {
log.Error("Cannot apply transaction", "msg", err)
}

s.SetLatestEnqueueIndex(enqueue.GetMeta().QueueIndex)
if enqueue.GetMeta().Index == nil {
latest := s.GetLatestIndex()
index := uint64(0)
if latest != nil {
index = *latest + 1
}
s.SetLatestIndex(&index)
} else {
s.SetLatestIndex(enqueue.GetMeta().Index)
}
}
s.txLock.Unlock()

Expand Down Expand Up @@ -474,11 +461,6 @@ func (s *SyncService) syncTransactionsToTip() error {
if err != nil {
log.Error("Cannot ingest transaction", "index", i)
}
s.SetLatestIndex(tx.GetMeta().Index)
if types.QueueOrigin(tx.QueueOrigin().Uint64()) == types.QueueOriginL1ToL2 {
queueIndex := tx.GetMeta().QueueIndex
s.SetLatestEnqueueIndex(queueIndex)
}
}
// Be sure to check that no transactions came in while
// the above loop was running
Expand Down Expand Up @@ -604,6 +586,25 @@ func (s *SyncService) maybeApplyTransaction(tx *types.Transaction) error {
// Lower level API used to apply a transaction, must only be used with
// transactions that came from L1.
func (s *SyncService) applyTransaction(tx *types.Transaction) error {
meta := tx.GetMeta()
if tx.QueueOrigin().Uint64() == uint64(types.QueueOriginL1ToL2) {
s.SetLatestEnqueueIndex(meta.QueueIndex)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there ever a situation in which meta.QueueIndex could be greater than the previous enqueue index?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean less than? It should not
See the note below the Types section here: https://github.com/ethereum-optimism/specs/blob/main/transaction-ingestor.md#types

}
// Queue origin sequencer transactions should not have an index here
if meta.Index != nil {
s.SetLatestIndex(meta.Index)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question as above for this SetLatestIndex and the one below.

} else {
// This should only happen in sequencer mode
if s.verifier {
return fmt.Errorf("Only for sequencer")
}
latest := s.GetLatestIndex()
index := uint64(0)
if latest != nil {
index = *latest + 1
}
s.SetLatestIndex(&index)
}
txs := types.Transactions{tx}
s.txFeed.Send(core.NewTxsEvent{Txs: txs})
return nil
Expand All @@ -630,5 +631,7 @@ func (s *SyncService) ApplyTransaction(tx *types.Transaction) error {
if err != nil {
return fmt.Errorf("invalid transaction: %w", err)
}
tx.SetL1Timestamp(s.GetLatestL1Timestamp())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this ever be a race condition?

tx.SetL1BlockNumber(s.GetLatestL1BlockNumber())
return s.applyTransaction(tx)
}