diff --git a/execution/gethexec/executionengine.go b/execution/gethexec/executionengine.go index 126d5ad1b2..193e8e7414 100644 --- a/execution/gethexec/executionengine.go +++ b/execution/gethexec/executionengine.go @@ -135,10 +135,6 @@ func (s *ExecutionEngine) backlogL1GasCharged() uint64 { s.cachedL1PriceData.msgToL1PriceData[0].l1GasCharged) } -func (s *ExecutionEngine) SetReorgEventsNotifier(reorgEventsNotifier chan struct{}) { - s.reorgEventsNotifier = reorgEventsNotifier -} - func (s *ExecutionEngine) MarkFeedStart(to arbutil.MessageIndex) { s.cachedL1PriceData.mutex.Lock() defer s.cachedL1PriceData.mutex.Unlock() @@ -187,6 +183,16 @@ func (s *ExecutionEngine) SetRecorder(recorder *BlockRecorder) { s.recorder = recorder } +func (s *ExecutionEngine) SetReorgEventsNotifier(reorgEventsNotifier chan struct{}) { + if s.Started() { + panic("trying to set reorg events notifier after start") + } + if s.reorgEventsNotifier != nil { + panic("trying to set reorg events notifier when already set") + } + s.reorgEventsNotifier = reorgEventsNotifier +} + func (s *ExecutionEngine) EnableReorgSequencing() { if s.Started() { panic("trying to enable reorg sequencing after start") diff --git a/go-ethereum b/go-ethereum index ecbb71b896..68cb86d1ec 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit ecbb71b89683c1506c374b34d0fefd87ae6144e6 +Subproject commit 68cb86d1eca03353375c24befaa7814f145d425a