chore: set beelocal branch to update-k3s-1.30.3 and go 1.23 upgrade (#…

…4878)

.github/workflows/beekeeper.yml

@@ -8,7 +8,7 @@ on:
       - "**"
 
 env:
-  K3S_VERSION: "v1.22.17+k3s1"
+  K3S_VERSION: "v1.30.3+k3s1"
   REPLICA: 3
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"

.github/workflows/go.yml

@@ -67,10 +67,10 @@ jobs:
       if: github.ref != 'refs/heads/master'
       uses: wagoid/commitlint-github-action@v5
     - name: GolangCI-Lint
-      uses: golangci/golangci-lint-action@v4
+      uses: golangci/golangci-lint-action@v6
       with:
         skip-cache: false
-        version: v1.54.1
+        version: v1.61.0
     - name: Whitespace check
       run: make check-whitespace
     - name: go mod tidy check

.golangci.yml

@@ -4,13 +4,12 @@ linters:
   enable:
     - asciicheck
     - bidichk
-    # - depguard disable temporary until this issue is resolved: https://github.com/golangci/golangci-lint/issues/3906
+    - copyloopvar
     - dogsled
     - durationcheck
     - errcheck
     - errname
     - errorlint
-    - exportloopref
     - forbidigo
     - gochecknoinits
     - goconst
@@ -33,6 +32,7 @@ linters:
     - typecheck
     - unconvert
     - unused
+    # - depguard disable temporary until this issue is resolved: https://github.com/golangci/golangci-lint/issues/3906
 
 linters-settings:
   govet:

CODINGSTYLE.md

@@ -161,11 +161,10 @@ Use the Golang [testing package](https://pkg.go.dev/testing) from the standard l
 
 ### Parallel Test Execution
 
-Run tests in parallel where possible but don't forget about variable scope gotchas.
+Run tests in parallel where possible.
 
 ```go
 for tc := range tt {
-  tc := tc // must not forget this
   t.Run(tc.name, func(t *testing.T) {
     t.Parallel()
     //execute

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22 AS build
+FROM golang:1.23 AS build
 
 WORKDIR /src
 # enable modules caching in separate layer
@@ -8,7 +8,7 @@ COPY . ./
 
 RUN make binary
 
-FROM debian:12.4-slim
+FROM debian:12.7-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

Dockerfile.goreleaser

@@ -1,4 +1,4 @@
-FROM debian:12.4-slim
+FROM debian:12.7-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

Dockerfile.scratch

@@ -1,4 +1,4 @@
-FROM debian:12.4-slim
+FROM debian:12.7-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

Makefile

@@ -1,7 +1,7 @@
 GO ?= go
 GOBIN ?= $$($(GO) env GOPATH)/bin
 GOLANGCI_LINT ?= $(GOBIN)/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.55.0
+GOLANGCI_LINT_VERSION ?= v1.61.0
 GOGOPROTOBUF ?= protoc-gen-gogofaster
 GOGOPROTOBUF_VERSION ?= v1.3.1
 BEEKEEPER_INSTALL_DIR ?= $(GOBIN)

go.mod

@@ -1,8 +1,8 @@
 module github.com/ethersphere/bee/v2
 
-go 1.22
+go 1.23
 
-toolchain go1.22.0
+toolchain go1.23.0
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2

pkg/accesscontrol/grantee.go

@@ -7,11 +7,11 @@ package accesscontrol
 import (
 	"context"
 	"crypto/ecdsa"
-	"crypto/elliptic"
 	"errors"
 	"fmt"
 
 	"github.com/btcsuite/btcd/btcec/v2"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethersphere/bee/v2/pkg/file"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
 )
@@ -85,7 +85,10 @@ func (g *GranteeListStruct) Add(addList []*ecdsa.PublicKey) error {
 
 // Save saves the grantee list to the underlying storage and returns the reference.
 func (g *GranteeListStruct) Save(ctx context.Context) (swarm.Address, error) {
-	data := serialize(g.grantees)
+	data, err := serialize(g.grantees)
+	if err != nil {
+		return swarm.ZeroAddress, fmt.Errorf("grantee serialize error: %w", err)
+	}
 	refBytes, err := g.loadSave.Save(ctx, data)
 	if err != nil {
 		return swarm.ZeroAddress, fmt.Errorf("grantee save error: %w", err)
@@ -140,16 +143,16 @@ func NewGranteeListReference(ctx context.Context, ls file.LoadSaver, reference s
 	}, nil
 }
 
-func serialize(publicKeys []*ecdsa.PublicKey) []byte {
+func serialize(publicKeys []*ecdsa.PublicKey) ([]byte, error) {
 	b := make([]byte, 0, len(publicKeys)*publicKeyLen)
 	for _, key := range publicKeys {
-		b = append(b, serializePublicKey(key)...)
+		// TODO: check if this is the correct way to serialize the public key
+		// Is this the only curve we support?
+		// Should we have switch case for different curves?
+		pubBytes := crypto.S256().Marshal(key.X, key.Y)
+		b = append(b, pubBytes...)
 	}
-	return b
-}
-
-func serializePublicKey(pub *ecdsa.PublicKey) []byte {
-	return elliptic.Marshal(pub.Curve, pub.X, pub.Y)
+	return b, nil
 }
 
 func deserialize(data []byte) []*ecdsa.PublicKey {

pkg/api/api_test.go

@@ -384,7 +384,6 @@ func TestParseName(t *testing.T) {
 		s.Mount()
 		s.EnableFullAPI()
 
-		tC := tC
 		t.Run(tC.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -453,7 +452,6 @@ func TestPostageHeaderError(t *testing.T) {
 	)
 	content := []byte{7: 0} // 8 zeros
 	for _, endpoint := range endpoints {
-		endpoint := endpoint
 		t.Run(endpoint+": empty batch", func(t *testing.T) {
 			t.Parallel()
 
@@ -538,7 +536,6 @@ func TestOptions(t *testing.T) {
 			expectedMethods: "GET, HEAD",
 		},
 	} {
-		tc := tc
 		t.Run(tc.endpoint+" options test", func(t *testing.T) {
 			t.Parallel()
 
@@ -555,8 +552,6 @@ func TestPostageDirectAndDeferred(t *testing.T) {
 	t.Parallel()
 
 	for _, endpoint := range []string{"bytes", "bzz", "chunks"} {
-		endpoint := endpoint
-
 		if endpoint != "chunks" {
 			t.Run(endpoint+" deferred", func(t *testing.T) {
 				t.Parallel()

pkg/api/balances_test.go

@@ -210,7 +210,6 @@ func TestConsumedBalances(t *testing.T) {
 	if !equalBalances(got, expected) {
 		t.Errorf("got balances: %v, expected: %v", got, expected)
 	}
-
 }
 
 func TestConsumedError(t *testing.T) {
@@ -328,7 +327,6 @@ func Test_peerBalanceHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -377,7 +375,6 @@ func Test_compensatedPeerBalanceHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

pkg/api/bytes_test.go

@@ -271,7 +271,6 @@ func TestBytesInvalidStamp(t *testing.T) {
 			jsonhttptest.WithRequestBody(bytes.NewReader(content)),
 		)
 	})
-
 }
 
 func TestBytesUploadHandlerInvalidInputs(t *testing.T) {
@@ -314,7 +313,6 @@ func TestBytesUploadHandlerInvalidInputs(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -364,7 +362,6 @@ func TestBytesGetHandlerInvalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

pkg/api/bzz_test.go

@@ -210,10 +210,8 @@ func TestBzzUploadDownloadWithRedundancy_FLAKY(t *testing.T) {
 		})
 	}
 	for _, rLevel := range []redundancy.Level{1, 2, 3, 4} {
-		rLevel := rLevel
 		t.Run(fmt.Sprintf("level=%d", rLevel), func(t *testing.T) {
 			for _, encrypt := range []bool{false, true} {
-				encrypt := encrypt
 				shardCnt := rLevel.GetMaxShards()
 				parityCnt := rLevel.GetParities(shardCnt)
 				if encrypt {
@@ -230,7 +228,6 @@ func TestBzzUploadDownloadWithRedundancy_FLAKY(t *testing.T) {
 					case 3:
 						chunkCnt = shardCnt*shardCnt + 1
 					}
-					levels := levels
 					t.Run(fmt.Sprintf("encrypt=%v levels=%d chunks=%d", encrypt, levels, chunkCnt), func(t *testing.T) {
 						if levels > 2 && (encrypt == (rLevel%2 == 1)) {
 							t.Skip("skipping to save time")
@@ -619,7 +616,6 @@ func TestBzzFilesRangeRequests(t *testing.T) {
 	}
 
 	for _, upload := range uploads {
-		upload := upload
 		t.Run(upload.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -886,7 +882,6 @@ func Test_bzzDownloadHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -934,7 +929,6 @@ func TestInvalidBzzParams(t *testing.T) {
 			jsonhttptest.WithRequestBody(tr),
 			jsonhttptest.WithRequestHeader(api.ContentTypeHeader, api.ContentTypeTar),
 		)
-
 	})
 
 	t.Run("batch exists", func(t *testing.T) {
@@ -962,7 +956,6 @@ func TestInvalidBzzParams(t *testing.T) {
 			jsonhttptest.WithRequestBody(tr),
 			jsonhttptest.WithRequestHeader(api.ContentTypeHeader, api.ContentTypeTar),
 		)
-
 	})
 
 	t.Run("batch not found", func(t *testing.T) {
@@ -1057,7 +1050,6 @@ func TestInvalidBzzParams(t *testing.T) {
 		address := "f30c0aa7e9e2a0ef4c9b1b750ebfeaeb7c7c24da700bb089da19a46e3677824b"
 		jsonhttptest.Request(t, client, http.MethodGet, fmt.Sprintf("/bzz/%s/", address), http.StatusNotFound)
 	})
-
 }
 
 // TestDirectUploadBzz tests that the direct upload endpoint give correct error message in dev mode

pkg/api/chequebook_test.go

@@ -418,7 +418,6 @@ func TestChequebookLastCheques(t *testing.T) {
 	if !LastChequesEqual(got, expected) {
 		t.Fatalf("Got: \n %+v \n\n Expected: \n %+v \n\n", got, expected)
 	}
-
 }
 
 func TestChequebookLastChequesPeer(t *testing.T) {
@@ -433,7 +432,6 @@ func TestChequebookLastChequesPeer(t *testing.T) {
 	sig := make([]byte, 65)
 
 	lastSentChequeFunc := func(swarm.Address) (*chequebook.SignedCheque, error) {
-
 		sig := make([]byte, 65)
 
 		lastSentCheque := &chequebook.SignedCheque{
@@ -449,7 +447,6 @@ func TestChequebookLastChequesPeer(t *testing.T) {
 	}
 
 	lastReceivedChequeFunc := func(swarm.Address) (*chequebook.SignedCheque, error) {
-
 		lastReceivedCheque := &chequebook.SignedCheque{
 			Cheque: chequebook.Cheque{
 				Beneficiary:      beneficiary0,
@@ -488,7 +485,6 @@ func TestChequebookLastChequesPeer(t *testing.T) {
 	if !reflect.DeepEqual(got, expected) {
 		t.Fatalf("Got: \n %+v \n\n Expected: \n %+v \n\n", got, expected)
 	}
-
 }
 
 func TestChequebookCashout(t *testing.T) {
@@ -753,7 +749,6 @@ func Test_chequebookLastPeerHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -765,7 +760,6 @@ func Test_chequebookLastPeerHandler_invalidInputs(t *testing.T) {
 }
 
 func LastChequesEqual(a, b *api.ChequebookLastChequesResponse) bool {
-
 	var state bool
 
 	for akeys := range a.LastCheques {

pkg/api/chunk_test.go

@@ -177,7 +177,6 @@ func TestChunkHandlersInvalidInputs(t *testing.T) {
 
 	method := http.MethodGet
 	for _, tc := range tests {
-		tc := tc
 		t.Run(method+" "+tc.name, func(t *testing.T) {
 			t.Parallel()
 

pkg/api/cors_test.go

@@ -79,7 +79,6 @@ func TestCORSHeaders(t *testing.T) {
 			wantCORS:       false,
 		},
 	} {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -116,7 +115,6 @@ func TestCORSHeaders(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 // TestCors tests whether CORs work correctly with OPTIONS method
@@ -135,7 +133,8 @@ func TestCors(t *testing.T) {
 		{
 			endpoint:        "bzz",
 			expectedMethods: "POST",
-		}, {
+		},
+		{
 			endpoint:        "bzz/0101011",
 			expectedMethods: "GET, HEAD",
 		},
@@ -156,7 +155,6 @@ func TestCors(t *testing.T) {
 			expectedMethods: "GET, HEAD",
 		},
 	} {
-		tc := tc
 		t.Run(tc.endpoint, func(t *testing.T) {
 			t.Parallel()
 
@@ -212,7 +210,6 @@ func TestCorsStatus(t *testing.T) {
 			allowedMethods:    "GET, HEAD",
 		},
 	} {
-		tc := tc
 		t.Run(tc.endpoint, func(t *testing.T) {
 			t.Parallel()