merge fix

dymensionxyz · Nov 4, 2024 · 63affef · 63affef
1 parent 5fa6057
commit 63affef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/block/manager.go b/block/manager.go
@@ -276,8 +276,6 @@ func (m *Manager) updateFromLastSettlementState() error {
 
 	// update last block submitted time from last batch when starting the  node
 	m.LastSettlementHeight.Store(latestHeight)
-	lastBlockTimestamp := res.BlockDescriptors[len(res.BlockDescriptors)-1].GetTimestamp()
-	m.State.SetLastSubmittedBlockTime(lastBlockTimestamp)
 
 	if latestHeight >= m.State.NextHeight() {
 		m.UpdateTargetHeight(latestHeight)

diff --git a/block/validate.go b/block/validate.go
@@ -40,6 +40,10 @@ func (m *Manager) SettlementValidateLoop(ctx context.Context) error {
 					uevent.MustPublish(ctx, m.Pubsub, &events.DataHealthStatus{Error: err}, events.HealthStatusList)
 					return err
 				}
+
+				lastBlockTimestamp := batch.BlockDescriptors[len(batch.BlockDescriptors)-1].GetTimestamp()
+				m.State.SetLastSubmittedBlockTime(lastBlockTimestamp)
+
 				// validate batch
 				err = m.SettlementValidator.ValidateStateUpdate(batch)
 				if err != nil {