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

Author: gacevicljubisa

.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 {