updates

Author: julienrbrt

block/internal/executing/executor.go

@@ -154,10 +154,14 @@ func (e *Executor) Stop() error {
 func (e *Executor) GetLastState() types.State {
 	state := e.lastState.Load()
 	if state == nil {
-		// Return zero value if not initialized
 		return types.State{}
 	}
-	return *state
+
+	stateCopy := *state
+	stateCopy.AppHash = bytes.Clone(state.AppHash)
+	stateCopy.LastResultsHash = bytes.Clone(state.LastResultsHash)
+
+	return stateCopy
 }
 
 // SetLastState updates the current state

block/internal/syncing/syncer.go

@@ -47,8 +47,7 @@ type Syncer struct {
 	options common.BlockOptions
 
 	// State management
-	lastState    types.State
-	lastStateMtx *sync.RWMutex
+	lastState *atomic.Pointer[types.State]
 
 	// DA state
 	daHeight uint64
@@ -90,20 +89,20 @@ func NewSyncer(
 	errorCh chan<- error,
 ) *Syncer {
 	return &Syncer{
-		store:        store,
-		exec:         exec,
-		da:           da,
-		cache:        cache,
-		metrics:      metrics,
-		config:       config,
-		genesis:      genesis,
-		options:      options,
-		headerStore:  headerStore,
-		dataStore:    dataStore,
-		lastStateMtx: &sync.RWMutex{},
-		heightInCh:   make(chan common.DAHeightEvent, 10_000),
-		errorCh:      errorCh,
-		logger:       logger.With().Str("component", "syncer").Logger(),
+		store:       store,
+		exec:        exec,
+		da:          da,
+		cache:       cache,
+		metrics:     metrics,
+		config:      config,
+		genesis:     genesis,
+		options:     options,
+		headerStore: headerStore,
+		dataStore:   dataStore,
+		lastState:   &atomic.Pointer[types.State]{},
+		heightInCh:  make(chan common.DAHeightEvent, 10_000),
+		errorCh:     errorCh,
+		logger:      logger.With().Str("component", "syncer").Logger(),
 	}
 }
 
@@ -150,16 +149,21 @@ func (s *Syncer) Stop() error {
 
 // GetLastState returns the current state
 func (s *Syncer) GetLastState() types.State {
-	s.lastStateMtx.RLock()
-	defer s.lastStateMtx.RUnlock()
-	return s.lastState
+	state := s.lastState.Load()
+	if state == nil {
+		return types.State{}
+	}
+
+	stateCopy := *state
+	stateCopy.AppHash = bytes.Clone(state.AppHash)
+	stateCopy.LastResultsHash = bytes.Clone(state.LastResultsHash)
+
+	return stateCopy
 }
 
 // SetLastState updates the current state
 func (s *Syncer) SetLastState(state types.State) {
-	s.lastStateMtx.Lock()
-	defer s.lastStateMtx.Unlock()
-	s.lastState = state
+	s.lastState.Store(&state)
 }
 
 // GetDAHeight returns the current DA height

scripts/test.mk

@@ -36,7 +36,7 @@ test-integration-cover:
 ## test-cover: generate code coverage report.
 test-cover:
 	@echo "--> Running unit tests"
-	@go run -tags=cover scripts/test_cover.go
+	@go run -tags=cover -race scripts/test_cover.go
 .PHONY: test-cover
 
 ## bench: run micro-benchmarks for internal cache