Merge remote-tracking branch 'origin/master' into network-state-provider

Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	shared/services/ec-manager.go
#	shared/services/requirements.go

Author: 0xfornax

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.1
+          go-version: 1.26.2
       - run: make NO_DOCKER=true release 
   docker-build:
     runs-on: ubuntu-latest

.github/workflows/lint.yml

@@ -19,12 +19,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.1
+          go-version: 1.26.2
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v2.4
+          version: v2.11
 
           # Optional: working directory, useful for monorepos
           # working-directory: ${{ matrix.modules }}

.github/workflows/unit-tests.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.1
+          go-version: 1.26.2
       - run: go test -test.timeout 20m $(go list ./... | grep -v bindings) -coverprofile=./cover.out -coverpkg=./...
       # upload the plaintext coverage report
       - name: Upload txt coverage report

.golangci.yml

@@ -1,12 +1,46 @@
 version: "2"
 linters:
-  default: none 
+  enable:
+    - revive
+  settings:
+    revive:
+      enable-default-rules: true
+      rules:
+        - name: exported
+          disabled: true
+        - name: var-naming
+          disabled: true
+        - name: package-comments
+          disabled: true
+        - name: unused-parameter
+          disabled: true
+        - name: error-strings
+          disabled: true
+    staticcheck:
+      checks:
+        - all
+        # A `-` preceding a linter name disables it.
+        # Disable ST1000 to allow packages without comments
+        - -ST1000
+        # Disable ST1005 to allow error strings to start with uppercase letters
+        - -ST1005
+        # Disable ST1003 to allow underscores in variable names
+        - -ST1003
+        # Disable these 3 to allow comments on exported things to have the improper form
+        - -ST1020
+        - -ST1021
+        - -ST1022
+    errcheck:
+      exclude-functions:
+        - (*os.File).Close
+
+
 formatters:
   enable:
     - goimports
 run:
   relative-path-mode: cfg
-  go: '1.25.1'
+  go: '1.26.2'
 output:
   formats:
     text:

Makefile

@@ -25,9 +25,13 @@ define rocketpool-cli-template
 ${BIN_DIR}/rocketpool-cli-$1-$2: ${bin_deps}
 	@echo "Building rocketpool-cli-$1-$2"
 ifndef NO_DOCKER
-	docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=0 \
-		-e GOARCH=$2 -e GOOS=$1 --workdir /src -v ~/.cache:/.cache rocketpool/smartnode-builder:${VERSION} \
-		go build -o $$@ ./rocketpool-cli/
+	docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) \
+		-e CGO_ENABLED=0 -e XDG_CACHE_HOME=/go/.cache \
+		-e GOMODCACHE=/go/.cache/pkg/mod \
+		-e GOCACHE=/go/.cache/go-build \
+		-e GOARCH=$2 -e GOOS=$1 \
+		--workdir /src -v ~/.cache:/go/.cache \
+		rocketpool/smartnode-builder:${VERSION} go build -o $$@ ./rocketpool-cli/
 else
 	CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -o $$@ ./rocketpool-cli/
 endif
@@ -66,18 +70,28 @@ ifndef NO_DOCKER
 	bin_deps += docker-builder
 endif
 
-docker_build_cmd_amd64 = docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=1 -e CGO_CFLAGS="-O -D__BLST_PORTABLE__" \
-	-e GOARCH=amd64 -e GOOS=linux --workdir /src -v ~/.cache:/.cache rocketpool/smartnode-builder:${VERSION} \
-	go build
+docker_build_cmd_amd64 = docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) \
+	-e CGO_ENABLED=1 -e CGO_CFLAGS="-O -D__BLST_PORTABLE__" \
+	-e GOARCH=amd64 -e GOOS=linux \
+	-e XDG_CACHE_HOME=/go/.cache \
+	-e GOMODCACHE=/go/.cache/pkg/mod \
+	-e GOCACHE=/go/.cache/go-build \
+	--workdir /src -v ~/.cache:/go/.cache \
+	rocketpool/smartnode-builder:${VERSION} go build
 local_build_cmd_amd64 = CGO_ENABLED=1 CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=amd64 GOOS=linux go build
-docker_build_cmd_arm64 = docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=1 -e CGO_CFLAGS="-O -D__BLST_PORTABLE__" \
-	-e CC=aarch64-linux-gnu-gcc -e CXX=aarch64-linux-gnu-cpp -e CGO_CFLAGS="-O -D__BLST_PORTABLE__" -e GOARCH=arm64 -e GOOS=linux \
-	--workdir /src -v ~/.cache:/.cache rocketpool/smartnode-builder:${VERSION} \
-	go build
+docker_build_cmd_arm64 = docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) \
+	-e CGO_ENABLED=1 -e CC=aarch64-linux-gnu-gcc -e CXX=aarch64-linux-gnu-cpp \
+	-e CGO_CFLAGS="-O -D__BLST_PORTABLE__" -e GOARCH=arm64 -e GOOS=linux \
+	-e XDG_CACHE_HOME=/go/.cache \
+	-e GOMODCACHE=/go/.cache/pkg/mod \
+	-e GOCACHE=/go/.cache/go-build \
+	--workdir /src -v ~/.cache:/go/.cache \
+	rocketpool/smartnode-builder:${VERSION} go build
 local_build_cmd_arm64 = CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-cpp CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=arm64 GOOS=linux go build
 # amd64 daemon build
 .PHONY: ${BIN_DIR}/rocketpool-daemon-linux-amd64
 ${BIN_DIR}/rocketpool-daemon-linux-amd64: ${bin_deps}
+	@echo "Building rocketpool-daemon-linux-amd64"
 ifndef NO_DOCKER
 	${docker_build_cmd_amd64} -o $@ rocketpool/rocketpool.go
 else
@@ -87,6 +101,7 @@ endif
 # arm64 daemon build
 .PHONY: ${BIN_DIR}/rocketpool-daemon-linux-arm64
 ${BIN_DIR}/rocketpool-daemon-linux-arm64: ${bin_deps}
+	@echo "Building rocketpool-daemon-linux-arm64"
 ifndef NO_DOCKER
 	${docker_build_cmd_arm64} -o $@ rocketpool/rocketpool.go
 else
@@ -105,6 +120,7 @@ $(foreach oos,$(CLI_TARGET_OOS),$(foreach arch,$(ARCHS),$(eval $(call rocketpool
 # amd64 treegen build
 .PHONY: ${BIN_DIR}/treegen-linux-amd64
 ${BIN_DIR}/treegen-linux-amd64: ${bin_deps}
+	@echo "Building treegen-linux-amd64"
 ifndef NO_DOCKER
 	${docker_build_cmd_amd64} -o $@ ./treegen/.
 else
@@ -114,6 +130,7 @@ endif
 # arm64 treegen build
 .PHONY: ${BIN_DIR}/treegen-linux-arm64
 ${BIN_DIR}/treegen-linux-arm64: ${bin_deps}
+	@echo "Building treegen-linux-arm64"
 ifndef NO_DOCKER
 	${docker_build_cmd_arm64} -o $@ ./treegen/.
 else
@@ -123,6 +140,7 @@ endif
 # amd64 state-cli build
 .PHONY: ${TOOLS_DIR}/state-cli-linux-amd64
 ${TOOLS_DIR}/state-cli-linux-amd64: ${bin_deps}
+	@echo "Building state-cli-linux-amd64"
 ifndef NO_DOCKER
 	${docker_build_cmd_amd64} -o $@ ./shared/services/state/cli/.
 else
@@ -132,6 +150,7 @@ endif
 # arm64 state-cli build
 .PHONY: ${TOOLS_DIR}/state-cli-linux-arm64
 ${TOOLS_DIR}/state-cli-linux-arm64: ${bin_deps}
+	@echo "Building state-cli-linux-arm64"
 ifndef NO_DOCKER
 	${docker_build_cmd_arm64} -o $@ ./shared/services/state/cli/.
 else
@@ -151,14 +170,14 @@ docker: ${BUILD_DIR}/docker-buildx-builder
 
 .PHONY: docker-push
 docker-push: ${BUILD_DIR}/docker-buildx-builder
-	echo -n "Building ${VERSION} and publishing containers. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
+	@echo -n "Building ${VERSION} and publishing containers. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
 	# override the output type to push to dockerhub
 	VERSION=${VERSION} ${SOURCE} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry"
-	echo "Done!"
+	@echo "Done!"
 
 .PHONY: docker-latest
 docker-latest: ${BUILD_DIR}/docker-buildx-builder
-	echo -n "Building ${VERSION}, tagging as latest, and publishing. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
+	@echo -n "Building ${VERSION}, tagging as latest, and publishing. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
 	# override the output type to push to dockerhub, and the tags array to tag latest
 	VERSION=${VERSION} ${SOURCE} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry" --set "smartnode.tags=rocketpool/smartnode:latest"
 
@@ -169,10 +188,18 @@ docker-prune:
 	docker buildx rm smartnode-builder
 	rm ${BUILD_DIR}/docker-buildx-builder
 
+golangci_lint_version = v2.11
+docker_lint_cmd = docker run -e XDG_CACHE_HOME=/go/.cache -e GOMODCACHE=/go/.cache/pkg/mod -e GOCACHE=/go/.cache/go-build -e GOLANGCI_LINT_CACHE=/go/.cache/golangci-lint \
+	--user $(shell id -u):$(shell id -g) --rm -v ~/.cache:/go/.cache -v .:/smartnode --workdir /smartnode/ golangci/golangci-lint:${golangci_lint_version}-alpine golangci-lint
+local_lint_cmd = GOTOOLCHAIN=go1.26.2 go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${golangci_lint_version}
 .PHONY: lint
 lint:
-ifndef NO_DOCKER
-	docker run -e GOMODCACHE=/go/.cache/pkg/mod -e GOCACHE=/go/.cache/go-build -e GOLANGCI_LINT_CACHE=/go/.cache/golangci-lint --user $(shell id -u):$(shell id -g) --rm -v ~/.cache:/go/.cache -v .:/smartnode --workdir /smartnode/ golangci/golangci-lint:v2.4-alpine golangci-lint fmt --diff
+ifdef NO_DOCKER
+	$(local_lint_cmd) run
+	$(local_lint_cmd) fmt --diff
+else
+	$(docker_lint_cmd) run
+	$(docker_lint_cmd) fmt --diff
 endif
 
 .PHONY: test
@@ -183,3 +210,7 @@ test:
 clean:
 	rm -rf ${BUILD_DIR}
 	docker buildx rm smartnode-builder
+
+.PHONY: fmt
+fmt:
+	go run golang.org/x/tools/cmd/goimports@v0.44.0 -local github.com/rocket-pool/smartnode -w .

addons/rescue_node/addon.go

@@ -27,7 +27,7 @@ type credentialDetails struct {
 
 func (c *credentialDetails) GetTimeLeft() time.Duration {
 
-	if c.solo == true {
+	if c.solo {
 		return time.Until(c.issued.Add(soloAuthValidity))
 	}
 

bindings/dao/claim.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+
 	"github.com/rocket-pool/smartnode/bindings/rocketpool"
 )
 

bindings/dao/protocol/dao.go

@@ -13,11 +13,12 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/rocket-pool/smartnode/bindings/dao"
 	"github.com/rocket-pool/smartnode/bindings/rocketpool"
 	"github.com/rocket-pool/smartnode/bindings/types"
 	strutils "github.com/rocket-pool/smartnode/bindings/utils/strings"
-	"golang.org/x/sync/errgroup"
 )
 
 // Settings

bindings/dao/protocol/proposal.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
+
 	"github.com/rocket-pool/smartnode/bindings/rocketpool"
 	"github.com/rocket-pool/smartnode/bindings/types"
 )