Merge pull request #576 from shutter-network/chore/upgrade-go-1.23.6

Upgrade golang to 1.23.6

Author: blockchainluffy

.asdf-plugins

@@ -4,20 +4,15 @@
 # To automatically install these run `make install-asdf-plugins` inside
 # the 'rolling-shutter' directory.
 
-babashka
-binaryen      https://github.com/birros/asdf-binaryen.git
 circleci      https://github.com/ulope/asdf-circleci.git
-clojure
 direnv
 golang
 golangci-lint
-java
 nodejs
 postgres
 pre-commit
 protoc
 python
 shfmt
 solidity
-sqlc          https://github.com/schmir/asdf-sqlc.git
-tinygo        https://github.com/schmir/asdf-tinygo
+sqlc          https://github.com/ulope/asdf-sqlc.git

.circleci/config.yml

@@ -29,14 +29,14 @@ executors:
 
   go:
     docker:
-      - image: cimg/go:1.21.1
+      - image: cimg/go:1.23.6
         environment:
           GO111MODULE: "on"
           PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
   go-integration:
     docker:
-      - image: cimg/go:1.21.1
+      - image: cimg/go:1.23.6
         environment:
           GO111MODULE: "on"
           PIP_DISABLE_PIP_VERSION_CHECK: "1"
@@ -149,9 +149,9 @@ jobs:
       - run:
           name: "Install asdf managed executables"
           command: |
-            asdf install tinygo
-            asdf install binaryen
-            asdf install nodejs
+            asdf install tinygo latest
+            asdf install binaryen latest
+            asdf install nodejs latest
       - run:
           name: "Run unit tests with gotestsum"
           command: |
@@ -176,7 +176,7 @@ jobs:
 
   rs-lint:
     executor: go
-    resource_class: medium+
+    resource_class: xlarge
     working_directory: ~/src/rolling-shutter
     steps:
       - checkout:
@@ -194,7 +194,7 @@ jobs:
             asdf plugin add golangci-lint || true
             asdf install golangci-lint
       - run: |
-          make lint-changes
+          GOLINT_CONCURRENCY=3 make lint-changes
       - save_cache:
           key: rs-lint-v14-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
           paths:

.tool-versions

@@ -1,15 +1,10 @@
-babashka 1.3.182
-binaryen 114
-circleci 0.1.28811
-clojure 1.11.1.1386
-golang 1.21.4
-golangci-lint 1.55.2
-java temurin-17.0.5+8
+circleci 0.1.31425
+golang 1.23.6
+golangci-lint 1.64.5
 nodejs 18.17.0
 postgres 14.2
-pre-commit 3.6.0
-protoc 22.3
-shfmt 3.7.0
+pre-commit 4.1.0
+protoc 29.3
+shfmt 3.10.0
 solidity 0.8.9
-sqlc 1.22.0
-tinygo 0.29.0
+sqlc 1.28.0

docker/build-src/rolling-shutter/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 AS builder
+FROM golang:1.23.6 AS builder
 ENV GOMODCACHE=/root/.cache/mod
 # Fetch go modules separately to improve cache usage
 RUN mkdir /gomod

rolling-shutter/.golangci.yml

@@ -113,39 +113,41 @@ linters:
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
-    - bodyclose
+    # `staticcheck` and `gosimple` are disabled because of https://github.com/golangci/golangci-lint/issues/5449
     # - depguard
+    # - unused
+    - bodyclose
+    - copyloopvar
     - dogsled
     - errcheck
     - exhaustive
+    - forbidigo
     - funlen
     - gci
     - goconst
     - gocritic
     - gocyclo
+    - godot
     - gofumpt
-    - revive
     - goprintffuncname
     - gosec
-    - gosimple
+    #    - gosimple
     - govet
     - ineffassign
     - lll
     - misspell
     - nakedret
+    - nilnesserr
     - noctx
     - nolintlint
-    - exportloopref
-    - staticcheck
+    - revive
+    #    - staticcheck
     - stylecheck
+    - thelper
     - typecheck
     - unconvert
     - unparam
-    # - unused
     - whitespace
-    - thelper
-    - godot
-    - forbidigo
 
   # don't enable:
   # - asciicheck

rolling-shutter/Makefile

@@ -1,13 +1,20 @@
 .POSIX:
 
-GO		?= go
-GOFLAGS		?=
-TINYGO		?= tinygo
-WASMOPT     ?= wasm-opt
-BINDIR		?= ./bin
-WASMDIR		?= ../js/shutter-crypto
-EXECUTABLE	?= ${BINDIR}/rolling-shutter
-GOPATH          ?= $(${GO} env GOPATH)
+GO					?= go
+GOFLAGS				?=
+TINYGO				?= tinygo
+WASMOPT     		?= wasm-opt
+BINDIR				?= ./bin
+WASMDIR				?= ../js/shutter-crypto
+EXECUTABLE			?= ${BINDIR}/rolling-shutter
+GOPATH				?= $(${GO} env GOPATH)
+GOLINT_CONCURRENCY	?= 0
+
+TOOL_VERSTION_GOENUM		?= 0.6.0
+TOOL_VERSION_PROTOCGENGO	?= 1.36.5
+TOOL_VERSION_OAPICODEGEN	?= 1.16.1
+TOOL_VERSION_ABIGEN			?= 1.15.7
+
 
 build:
 	${GO} build ${GOFLAGS} -ldflags="-X github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion.version=$(shell git describe --always --dirty)" -o ${EXECUTABLE}
@@ -55,44 +62,40 @@ coverage:
 clean:
 	rm -f ${EXECUTABLE}
 
-install-tools: install-codegen-tools install-golangci-lint install-cobra install-gofumpt install-gci install-gotestsum
+install-tools: install-codegen-tools install-gofumpt install-gci install-gotestsum
 
 # code generation tools: pin version
 install-codegen-tools: install-npm install-abigen install-sqlc install-protoc-gen-go  install-oapi-codegen install-go-enum
 
+${GOPATH}/bin/sqlc:
+	${GO} install github.com/sqlc-dev/sqlc/cmd/[email protected]
+install-sqlc: ${GOPATH}/bin/sqlc
+
 ../contracts/node_modules/.mark-npm-install: ../contracts/package.json ../contracts/package-lock.json
 	cd ../contracts && npm install
 	@touch ../contracts/node_modules/.mark-npm-install
 
 install-npm: ../contracts/node_modules/.mark-npm-install
 
-${GOPATH}/bin/sqlc:
-	${GO} install github.com/sqlc-dev/sqlc/cmd/[email protected]
-install-sqlc: ${GOPATH}/bin/sqlc
-
 
 ${GOPATH}/bin/go-enum:
-	${GO} install github.com/abice/go-enum@v0.5.6
+	${GO} install github.com/abice/go-enum@v${TOOL_VERSTION_GOENUM}
 install-go-enum: ${GOPATH}/bin/go-enum
 
 ${GOPATH}/bin/abigen:
-	${GO} install github.com/ethereum/go-ethereum/cmd/abigen@v1.12.0
+	${GO} install github.com/ethereum/go-ethereum/cmd/abigen@v${TOOL_VERSION_ABIGEN}
 install-abigen: ${GOPATH}/bin/abigen
 
-
 ${GOPATH}/bin/protoc-gen-go:
-	${GO} install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30.0
+	${GO} install google.golang.org/protobuf/cmd/protoc-gen-go@v${TOOL_VERSION_PROTOCGENGO}
 install-protoc-gen-go: ${GOPATH}/bin/protoc-gen-go
 
 
 ${GOPATH}/bin/oapi-codegen:
-	${GO} install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.9.1
+	${GO} install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v${TOOL_VERSION_OAPICODEGEN}
 install-oapi-codegen: ${GOPATH}/bin/oapi-codegen
 
 # non code generation tools
-install-golangci-lint:
-	${GO} install github.com/golangci/golangci-lint/cmd/[email protected]
-
 install-gofumpt:
 	${GO} install mvdan.cc/gofumpt@latest
 
@@ -116,7 +119,7 @@ lint:
 
 lint-changes:
 	base=`git merge-base HEAD origin/main`; \
-	golangci-lint --verbose run --new-from-rev $${base}
+	golangci-lint --verbose run --concurrency ${GOLINT_CONCURRENCY} --print-resources-usage --new-from-rev $${base}
 
 abigen:
 	go generate -x ./contract