update dependency & go lint fixes

qu0b · qu0b · commit 5e97e872e7d9 · 2026-01-02T15:27:51.000+01:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -22,7 +22,7 @@ linters:
     - tparallel
     - unconvert
     - whitespace
-    - wsl
+    - wsl_v5
   settings:
     errcheck:
       check-type-assertions: true
@@ -39,6 +39,10 @@ linters:
     nolintlint:
       require-explanation: true
       require-specific: true
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
   exclusions:
     generated: lax
     presets:
diff --git a/cmd/root.go b/cmd/root.go
@@ -54,7 +54,6 @@ func loadConfigFromFile(file string) (*checkpointz.Config, error) {
 	}
 
 	yamlFile, err := os.ReadFile(file)
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/ethpandaops/checkpointz
 
 go 1.25.1
 
-replace github.com/attestantio/go-eth2-client => github.com/pk910/go-eth2-client v0.0.0-20250925114125-8cac04566494
+replace github.com/attestantio/go-eth2-client => github.com/qu0b/go-eth2-client v0.0.0-20260102140736-77debf2f2683
 
 require (
 	github.com/attestantio/go-eth2-client v0.27.2
diff --git a/go.sum b/go.sum
@@ -156,8 +156,6 @@ github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/pk910/dynamic-ssz v1.1.1 h1:b8sPR8fyhBvz8SHa2RH20SNtt5VDzAEY6fKsPCUcYX4=
 github.com/pk910/dynamic-ssz v1.1.1/go.mod h1:3zyemisUysY2PWACZ8LeZS2tAw8AkuTb2GaLmqYsg1I=
-github.com/pk910/go-eth2-client v0.0.0-20250925114125-8cac04566494 h1:PkeLES9m7cMwE97hNV2vfscpEgBbYc992DfeHqGFExo=
-github.com/pk910/go-eth2-client v0.0.0-20250925114125-8cac04566494/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -175,6 +173,8 @@ github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 h1:lC8ki
 github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15/go.mod h1:8svFBIKKu31YriBG/pNizo9N0Jr9i5PQ+dFkxWg3x5k=
 github.com/prysmaticlabs/gohashtree v0.0.4-beta h1:H/EbCuXPeTV3lpKeXGPpEV9gsUpkqOOVnWapUyeWro4=
 github.com/prysmaticlabs/gohashtree v0.0.4-beta/go.mod h1:BFdtALS+Ffhg3lGQIHv9HDWuHS8cTvHZzrHWxwOtGOs=
+github.com/qu0b/go-eth2-client v0.0.0-20260102140736-77debf2f2683 h1:5y0ylewlPVfEWwszsz6LpFPoc2yqMcJHSh0nDiHMgEg=
+github.com/qu0b/go-eth2-client v0.0.0-20260102140736-77debf2f2683/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY=
 github.com/r3labs/sse/v2 v2.10.0 h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0=
 github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktEmkNJ7I=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
diff --git a/pkg/beacon/default.go b/pkg/beacon/default.go
@@ -750,7 +750,7 @@ func (d *Default) ListFinalizedSlots(ctx context.Context) ([]phase0.Slot, error)
 
 	latestSlot := phase0.Slot(uint64(finality.Finalized.Epoch) * uint64(sp.SlotsPerEpoch))
 
-	//nolint:gosec // HistoricalEpochCount is a small positive config value, overflow not possible
+	//nolint:gosec // HistoricalEpochCount is validated as positive in config.
 	for i, val := uint64(latestSlot), uint64(latestSlot)-uint64(sp.SlotsPerEpoch)*uint64(d.config.HistoricalEpochCount); i > val; i -= uint64(sp.SlotsPerEpoch) {
 		slots = append(slots, phase0.Slot(i))
 	}
diff --git a/pkg/beacon/download.go b/pkg/beacon/download.go
@@ -173,14 +173,13 @@ func (d *Default) fetchHistoricalCheckpoints(ctx context.Context, checkpoint *v1
 	// We'll derive the current finalized slot and then work back in intervals of SLOTS_PER_EPOCH.
 	currentSlot := uint64(checkpoint.Finalized.Epoch) * uint64(sp.SlotsPerEpoch)
 	for i := 1; i < d.config.HistoricalEpochCount; i++ {
-		//nolint:gosec // i is a small positive loop counter, overflow not possible
+		//nolint:gosec // i starts at 1 and increments, always positive.
 		if uint64(i)*uint64(sp.SlotsPerEpoch) > currentSlot {
 			break
 		}
 
-		slot := phase0.Slot(currentSlot - uint64(i)*uint64(sp.SlotsPerEpoch))
-
-		slotsInScope[slot] = struct{}{}
+		//nolint:gosec // i starts at 1 and increments, always positive.
+		slotsInScope[phase0.Slot(currentSlot-uint64(i)*uint64(sp.SlotsPerEpoch))] = struct{}{}
 	}
 
 	for slot := range slotsInScope {
diff --git a/pkg/cache/ttl.go b/pkg/cache/ttl.go
@@ -40,6 +40,7 @@ func NewTTLMap(maxItems int, name, namespace string) (m *TTLMap) {
 	go func() {
 		for now := range time.Tick(time.Second * 1) {
 			m.l.Lock()
+
 			for k, v := range m.m {
 				if v.invincible {
 					continue
@@ -49,6 +50,7 @@ func NewTTLMap(maxItems int, name, namespace string) (m *TTLMap) {
 					m.delete(k, v.value, v.expiresAt)
 				}
 			}
+
 			m.l.Unlock()
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ func loadConfigFromFile(file string) (*checkpointz.Config, error) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`yamlFile, err := os.ReadFile(file)`
`57`		`-`
`58`	`57`	`if err != nil {`
`59`	`58`	`return nil, err`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ func (d *Default) ListFinalizedSlots(ctx context.Context) ([]phase0.Slot, error)`
`750`	`750`
`751`	`751`	`latestSlot := phase0.Slot(uint64(finality.Finalized.Epoch) * uint64(sp.SlotsPerEpoch))`
`752`	`752`
`753`		`- //nolint:gosec // HistoricalEpochCount is a small positive config value, overflow not possible`
	`753`	`+ //nolint:gosec // HistoricalEpochCount is validated as positive in config.`
`754`	`754`	`for i, val := uint64(latestSlot), uint64(latestSlot)-uint64(sp.SlotsPerEpoch)*uint64(d.config.HistoricalEpochCount); i > val; i -= uint64(sp.SlotsPerEpoch) {`
`755`	`755`	`slots = append(slots, phase0.Slot(i))`
`756`	`756`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ func NewTTLMap(maxItems int, name, namespace string) (m *TTLMap) {`
`40`	`40`	`go func() {`
`41`	`41`	`for now := range time.Tick(time.Second * 1) {`
`42`	`42`	`m.l.Lock()`
	`43`	`+`
`43`	`44`	`for k, v := range m.m {`
`44`	`45`	`if v.invincible {`
`45`	`46`	`continue`
`@@ -49,6 +50,7 @@ func NewTTLMap(maxItems int, name, namespace string) (m *TTLMap) {`
`49`	`50`	`m.delete(k, v.value, v.expiresAt)`
`50`	`51`	`}`
`51`	`52`	`}`
	`53`	`+`
`52`	`54`	`m.l.Unlock()`
`53`	`55`	`}`
`54`	`56`	`}()`