diff --git a/block/retriever.go b/block/retriever.go index 47f5bf3b..e66c18b1 100644 --- a/block/retriever.go +++ b/block/retriever.go @@ -66,9 +66,17 @@ func (m *Manager) ProcessNextDABatch(daMetaData *da.DASubmitMetaData) error { if batchResp.Code != da.StatusSuccess { return batchResp.Error } - + err := m.applyDaBlocks(batchResp) + if err != nil { + return err + } m.logger.Debug("retrieved batches", "n", len(batchResp.Batches), "daHeight", daMetaData.Height) + return nil +} + +func (m *Manager) applyDaBlocks(batchResp da.ResultRetrieveBatch) error { + m.retrieverMu.Lock() defer m.retrieverMu.Unlock() @@ -83,7 +91,7 @@ func (m *Manager) ProcessNextDABatch(daMetaData *da.DASubmitMetaData) error { continue } - err := m.applyBlock(block, batch.Commits[i], types.BlockMetaData{Source: types.DA, DAHeight: daMetaData.Height}) + err := m.applyBlock(block, batch.Commits[i], types.BlockMetaData{Source: types.DA, DAHeight: batchResp.CheckMetaData.Height}) if err != nil { return fmt.Errorf("apply block: height: %d: %w", block.Header.Height, err) } @@ -97,7 +105,6 @@ func (m *Manager) ProcessNextDABatch(daMetaData *da.DASubmitMetaData) error { } types.LastReceivedDAHeightGauge.Set(lastAppliedHeight) - return nil } func (m *Manager) fetchBatch(daMetaData *da.DASubmitMetaData) da.ResultRetrieveBatch {