add pruningwindow

Author: Wondertan

sync/options.go

@@ -38,6 +38,8 @@ type Parameters struct {
 	//
 	// SyncFromHeight has lower priority than SyncFromHash.
 	SyncFromHeight uint64
+	// PruningWindow defines the duration within which headers will be retained before being pruned.
+	PruningWindow time.Duration
 	// blockTime provides a reference point for the Syncer to determine
 	// whether its subjective head is outdated.
 	// Keeping it private to disable serialization for it.
@@ -54,6 +56,7 @@ type Parameters struct {
 func DefaultParameters() Parameters {
 	return Parameters{
 		TrustingPeriod: 336 * time.Hour, // tendermint's default trusting period
+		PruningWindow:  337 * time.Hour,
 	}
 }
 

sync/sync.go

@@ -110,7 +110,6 @@ func (s *Syncer[H]) Start(ctx context.Context) error {
 // Stop stops Syncer.
 func (s *Syncer[H]) Stop(context.Context) error {
 	s.cancel()
-	s.store.Reset()
 	return s.metrics.Close()
 }
 

sync/sync_head.go

@@ -50,7 +50,13 @@ func (s *Syncer[H]) Head(ctx context.Context, _ ...header.HeadOption[H]) (H, err
 	// NOTE: We could trust the netHead like we do during 'automatic subjective initialization'
 	// but in this case our subjective head is not expired, so we should verify netHead
 	// and only if it is valid, set it as new head
-	_ = s.incomingNetworkHead(ctx, netHead)
+	err = s.incomingNetworkHead(ctx, netHead)
+	if err != nil {
+		log.Errorw("incoming network head failed",
+			"height", netHead.Height(),
+			"hash", netHead.Hash().String(),
+			"err", err)
+	}
 	// netHead was either accepted or rejected as the new subjective
 	// anyway return most current known subjective head
 	return s.subjectiveHead(ctx)

sync/sync_store.go

@@ -28,10 +28,6 @@ type syncStore[H header.Header[H]] struct {
 	head atomic.Pointer[H]
 }
 
-func (s *syncStore[H]) Reset() {
-	s.head.Store(nil)
-}
-
 func (s *syncStore[H]) Head(ctx context.Context) (H, error) {
 	if headPtr := s.head.Load(); headPtr != nil {
 		return *headPtr, nil

sync/sync_tail.go

@@ -10,6 +10,11 @@ import (
 	"github.com/celestiaorg/go-header"
 )
 
+// TODO:
+//  * Refactor tests
+//  * Write tests for estimation
+//  * Ensure sync always happen on start
+
 // subjectiveTail returns the current Tail header.
 // Lazily fetching it if it doesn't exist locally or moving it to a different height.
 // Moving is done if either parameters are changed or tail moved outside a pruning window.
@@ -30,11 +35,10 @@ func (s *Syncer[H]) subjectiveTail(ctx context.Context, head H) (H, error) {
 			fetched = true
 		}
 	} else if tailHeight, outdated := s.isTailHeightOutdated(tail); outdated {
-		// hack for the case with tailHeight > store.Height avoiding heightSub
-		storeCtx, cancel := context.WithTimeout(ctx, time.Second)
-		tail, err = s.store.GetByHeight(storeCtx, tailHeight)
-		cancel()
-		if err != nil {
+		if tailHeight <= s.store.Height() {
+			tail, err = s.store.GetByHeight(ctx, tailHeight)
+		}
+		if err != nil || tailHeight != tail.Height() {
 			tail, err = s.getter.GetByHeight(ctx, tailHeight)
 			if err != nil {
 				return tail, fmt.Errorf("getting SyncFromHeight tail(%d): %w", tailHeight, err)
@@ -52,7 +56,7 @@ func (s *Syncer[H]) subjectiveTail(ctx context.Context, head H) (H, error) {
 			fetched = true
 		} else {
 			// have a known Tail - estimate basing on it.
-			cutoffTime := head.Time().UTC().Add(-s.Params.TrustingPeriod)
+			cutoffTime := head.Time().UTC().Add(-s.Params.PruningWindow)
 			diff := cutoffTime.Sub(tail.Time().UTC())
 			if diff <= 0 {
 				// current tail is relevant as is

sync/sync_tail_test.go

@@ -40,6 +40,9 @@ func TestSyncer_TailReconfiguration(t *testing.T) {
 
 	err = syncer.Start(ctx)
 	require.NoError(t, err)
+	time.Sleep(time.Millisecond * 10)
+	syncer.SyncWait(ctx)
+
 	err = syncer.Stop(ctx)
 	require.NoError(t, err)
 	time.Sleep(time.Millisecond * 10)
@@ -48,7 +51,6 @@ func TestSyncer_TailReconfiguration(t *testing.T) {
 
 	err = syncer.Start(ctx)
 	require.NoError(t, err)
-	time.Sleep(time.Millisecond * 10)
 
 	storeTail, err := localStore.Tail(ctx)
 	require.NoError(t, err)