*: v1.6.0-rc4 cherry-picking (#3928)

Cherry-picking for v1.6.0-rc4.

category: misc
ticket: none

Author: DiogoSantoss

.github/workflows/build-release-binaries.yml

@@ -20,11 +20,15 @@ jobs:
       id: setup-go
 
     - name: Set version from git tag
-      if: github.ref_type == 'tag'
       run: |
-        echo "APP_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+        echo "VCS_REVISION=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
+        echo "VCS_TIME=$(git log -1 --format="%cd" --date=iso-strict $GITHUB_SHA)" >> $GITHUB_ENV
         echo "RELEASE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
-        echo "LDFLAGS_VALUE=-X github.com/obolnetwork/charon/app/version.version=${{ github.ref_name }}" >> $GITHUB_ENV
+
+    - name: Construct LDFLAGS_VALUE
+      run: |
+        LDFLAGS_VALUE=$'-X github.com/obolnetwork/charon/app/version.version=${{ github.ref_name }} -X github.com/obolnetwork/charon/app/version.vcsRevision=${{ env.VCS_REVISION }} -X github.com/obolnetwork/charon/app/version.vcsTime=${{ env.VCS_TIME }}'
+        echo "LDFLAGS_VALUE=${LDFLAGS_VALUE}" >> $GITHUB_ENV
 
     - name: Build x86_64 binary
       env:

.github/workflows/govulncheck.yml

@@ -13,5 +13,5 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-go
-      - run: go install golang.org/x/vuln/cmd/[email protected].3
+      - run: go install golang.org/x/vuln/cmd/[email protected].4
       - run: govulncheck -show=traces -test ./...

.github/workflows/unit-tests.yml

@@ -25,7 +25,7 @@ jobs:
             ${{ runner.os }}-go-
       - run: go test -coverprofile=coverage.out -covermode=atomic -timeout=5m -race ./...
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.5.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.out

app/eth2wrap/synthproposer.go

@@ -270,7 +270,7 @@ func IsSyntheticProposal(block *eth2api.VersionedSignedProposal) bool {
 	return graffiti == GetSyntheticGraffiti()
 }
 
-// synthProposerCache returns a new cache for synthetic proposer duties.
+// newSynthProposerCache returns a new cache for synthetic proposer duties.
 func newSynthProposerCache() *synthProposerCache {
 	return &synthProposerCache{
 		duties:      make(map[eth2p0.Epoch][]*eth2v1.ProposerDuty),

app/log/config.go

@@ -508,7 +508,7 @@ var level4Map = map[zapcore.Level]string{
 	zapcore.FatalLevel:  "FATL",
 }
 
-// level4CharEncoder adapts zapcore CapitalColorLevelEncoder but trims level strings to 4 characters.
+// newLevel4CharEncoder adapts zapcore CapitalColorLevelEncoder but trims level strings to 4 characters.
 func newLevel4CharEncoder(color bool) zapcore.LevelEncoder {
 	return func(l zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
 		replace, ok := level4Map[l]

app/log/loki/lokipb/v1/loki.pb.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"regexp"
-	"runtime/debug"
 	"strconv"
 
 	"github.com/obolnetwork/charon/app/errors"
@@ -22,6 +21,12 @@ var version = "v1.6-rc"
 //   - Release branch: v0.Y-rc
 var Version, _ = Parse(version) // Error is caught in tests.
 
+var (
+	// These variables are populated with build information via -ldflags.
+	vcsRevision = "unknown"
+	vcsTime     = "unknown"
+)
+
 // Supported returns the supported minor versions in order of precedence.
 func Supported() []SemVer {
 	return []SemVer{
@@ -37,29 +42,7 @@ func Supported() []SemVer {
 
 // GitCommit returns the git commit hash and timestamp from build info.
 func GitCommit() (hash string, timestamp string) {
-	hash, timestamp = "unknown", "unknown"
-	hashLen := 7
-
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return hash, timestamp
-	}
-
-	for _, s := range info.Settings {
-		switch s.Key {
-		case "vcs.revision":
-			if len(s.Value) < hashLen {
-				hashLen = len(s.Value)
-			}
-
-			hash = s.Value[:hashLen]
-		case "vcs.time":
-			timestamp = s.Value
-		default:
-		}
-	}
-
-	return hash, timestamp
+	return vcsRevision, vcsTime
 }
 
 // LogInfo logs charon version information along-with the provided message.