moved safe tag calculation to tracker

Author: silaslenihan

chains/heads/tracker.go

@@ -51,6 +51,7 @@ type ChainConfig interface {
 	FinalityDepth() uint32
 	SafeDepth() uint32
 	FinalityTagEnabled() bool
+	SafeTagSupported() bool
 	FinalizedBlockOffset() uint32
 }
 
@@ -402,9 +403,19 @@ func (t *tracker[HTH, S, ID, BHASH]) backfillLoop(ctx context.Context) {
 
 func (t *tracker[HTH, S, ID, BHASH]) LatestSafeBlock(ctx context.Context) (safe HTH, err error) {
 	if t.config.FinalityTagEnabled() {
-		latestSafe, err2 := t.client.LatestSafeBlock(ctx)
-		if err2 != nil {
-			return latestSafe, fmt.Errorf("failed to get latest finalized block: %w", err2)
+		var latestSafe HTH
+		if t.config.SafeTagSupported() {
+			latestSafe, err = t.client.LatestSafeBlock(ctx)
+			if err != nil {
+				return latestSafe, fmt.Errorf("failed to get latest finalized block: %w", err)
+			}
+		} else {
+			// return latest finalized block if safe tag is not enabled
+			_, finalized, err2 := t.LatestAndFinalizedBlock(ctx)
+			if err2 != nil {
+				return finalized, fmt.Errorf("failed to get latest finalized block: %w", err2)
+			}
+			latestSafe = finalized
 		}
 
 		if !latestSafe.IsValid() {

multinode/config/config.go

@@ -33,7 +33,6 @@ type MultiNode struct {
 	NoNewFinalizedHeadsThreshold *config.Duration
 	FinalityDepth                *uint32
 	FinalityTagEnabled           *bool
-	SafeTagEnabled               *bool
 	FinalizedBlockOffset         *uint32
 }
 
@@ -93,8 +92,6 @@ func (c *MultiNodeConfig) FinalityDepth() uint32 { return *c.MultiNode.FinalityD
 
 func (c *MultiNodeConfig) FinalityTagEnabled() bool { return *c.MultiNode.FinalityTagEnabled }
 
-func (c *MultiNodeConfig) SafeTagEnabled() bool { return *c.MultiNode.SafeTagEnabled }
-
 func (c *MultiNodeConfig) FinalizedBlockOffset() uint32 { return *c.MultiNode.FinalizedBlockOffset }
 
 func (c *MultiNodeConfig) SetFrom(f *MultiNodeConfig) {
@@ -150,9 +147,6 @@ func (c *MultiNodeConfig) SetFrom(f *MultiNodeConfig) {
 	if f.MultiNode.FinalityTagEnabled != nil {
 		c.MultiNode.FinalityTagEnabled = f.MultiNode.FinalityTagEnabled
 	}
-	if f.MultiNode.SafeTagEnabled != nil {
-		c.MultiNode.SafeTagEnabled = f.MultiNode.SafeTagEnabled
-	}
 	if f.MultiNode.FinalizedBlockOffset != nil {
 		c.MultiNode.FinalizedBlockOffset = f.MultiNode.FinalizedBlockOffset
 	}

multinode/mocks/config.go

@@ -4,7 +4,6 @@ import "time"
 
 type ChainConfig struct {
 	IsFinalityTagEnabled            bool
-	IsSafeTagEnabled                bool
 	FinalityDepthVal                uint32
 	NoNewHeadsThresholdVal          time.Duration
 	FinalizedBlockOffsetVal         uint32
@@ -23,10 +22,6 @@ func (t ChainConfig) FinalityTagEnabled() bool {
 	return t.IsFinalityTagEnabled
 }
 
-func (t ChainConfig) SafeTagEnabled() bool {
-	return t.IsSafeTagEnabled
-}
-
 func (t ChainConfig) FinalizedBlockOffset() uint32 {
 	return t.FinalizedBlockOffsetVal
 }

multinode/node.go

@@ -34,7 +34,6 @@ type ChainConfig interface {
 	NoNewFinalizedHeadsThreshold() time.Duration
 	FinalityDepth() uint32
 	FinalityTagEnabled() bool
-	SafeTagEnabled() bool
 	FinalizedBlockOffset() uint32
 }