Merge pull request #6537 from onetechnical/relbeta4.5.0

Author: algojohnlee

.custom-gcl.yml

@@ -8,3 +8,6 @@ plugins:
   - module: fillmore-labs.com/errortype
     import: fillmore-labs.com/errortype/gclplugin
     version: v0.0.7
+  - module: github.com/cce/docnametypo
+    import: github.com/cce/docnametypo/gclplugin
+    version: v0.2.0

.github/actions/setup-test/action.yml

@@ -28,13 +28,3 @@ runs:
         sudo dpkg-reconfigure -f noninteractive man-db
         sudo apt-get install -y --no-upgrade expect
       shell: bash
-    - name: Cache gotestsum
-      id: cache-gotestsum
-      uses: actions/cache@v4
-      with:
-        path: ~/go/bin/gotestsum
-        key: gotestsum-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('scripts/buildtools/versions') }}
-    - name: Install gotestsum
-      if: steps.cache-gotestsum.outputs.cache-hit != 'true'
-      run: ./scripts/buildtools/install_buildtools.sh -o "gotest.tools/gotestsum"
-      shell: bash

.github/workflows/ci-nightly.yml

@@ -102,11 +102,10 @@ jobs:
       - name: Run tests
         run: |
           ./scripts/configure_dev.sh
-          ./scripts/buildtools/install_buildtools.sh -o "gotest.tools/gotestsum"
           PACKAGES="$(go list ./... | grep -v /go-algorand/test/)"
           export PACKAGE_NAMES=$(echo $PACKAGES | tr -d '\n')          
           mkdir -p test_results/${{ matrix.platform }}_test_nightly/${PARTITION_ID}
-          gotestsum --format standard-quiet \
+          go tool -modfile=tool.mod gotestsum --format standard-quiet \
             --junitfile ~/test_results/${{ matrix.platform }}_test_nightly/${PARTITION_ID}/results.xml \
             --jsonfile ~/test_results/${{ matrix.platform }}_test_nightly/${PARTITION_ID}/testresults.json \
             -- --tags "sqlite_unlock_notify sqlite_omit_load_extension" \
@@ -184,7 +183,6 @@ jobs:
       - name: Run integration tests
         run: |
           ./scripts/configure_dev.sh
-          ./scripts/buildtools/install_buildtools.sh -o "gotest.tools/gotestsum"
           mkdir -p ~/test_results/${{ matrix.platform }}_integration_nightly/${PARTITION_ID}
           TEST_RESULTS=~/test_results/${{ matrix.platform }}_integration_nightly/${PARTITION_ID} \
           test/scripts/run_integration_tests.sh
@@ -241,7 +239,6 @@ jobs:
       - name: Run E2E expect tests
         run: |
           scripts/configure_dev.sh
-          scripts/buildtools/install_buildtools.sh -o "gotest.tools/gotestsum"
           mkdir -p ~/test_results/${{ matrix.platform }}_e2e_expect_nightly/${PARTITION_ID}
           TEST_RESULTS=~/test_results/${{ matrix.platform }}_e2e_expect_nightly/${PARTITION_ID} \
           test/scripts/run_integration_tests.sh
@@ -308,7 +305,6 @@ jobs:
       - name: Run E2E subs tests
         run: |
           scripts/configure_dev.sh
-          scripts/buildtools/install_buildtools.sh -o "gotest.tools/gotestsum"
           mkdir -p ~/test_results/${{ matrix.platform }}_e2e_subs_nightly
           TEST_RESULTS=~/test_results/${{ matrix.platform }}_e2e_subs_nightly \
           test/scripts/run_integration_tests.sh

.github/workflows/ci-pr.yml

@@ -51,7 +51,7 @@ jobs:
           PACKAGES="$(go list ./... | grep -v /go-algorand/test/)"
           export PACKAGE_NAMES=$(echo $PACKAGES | tr -d '\n')          
           mkdir -p test_results/${{ matrix.platform }}_test/${PARTITION_ID}
-          gotestsum --format standard-quiet \
+          go tool -modfile=tool.mod gotestsum --format standard-quiet \
             --junitfile ~/test_results/${{ matrix.platform }}_test/${PARTITION_ID}/results.xml \
             --jsonfile ~/test_results/${{ matrix.platform }}_test/${PARTITION_ID}/testresults.json \
             -- --tags "sqlite_unlock_notify sqlite_omit_load_extension" $SHORTTEST \

.github/workflows/reviewdog.yml

@@ -1,6 +1,6 @@
 name: "ReviewDog workflow"
 env:
-  GOLANGCI_LINT_VERSION: "v2.6.0"
+  GOLANGCI_LINT_VERSION: "v2.7.1"
 on:
   push:
     branches:

.golangci-warnings.yml

@@ -4,16 +4,23 @@ run:
 linters:
   default: none
   enable:
+    - docnametypo
+    - errortype
     - gosec
     - partitiontest
-    - errortype
   settings:
     gosec:
       excludes: [G101, G103, G104, G107, G112, G114, G115, G202, G204, G301, G302, G303, G304, G306, G307, G404]
     custom:
-      partitiontest:
-        type: "module"
-        description: This custom linter ensures test functions call 'partitiontest.PartitionTest(t)'
+      docnametypo:
+        type: module
+        description: "docnametypo catches doc comments with mismatched function names"
+        original-url: "https://github.com/cce/docnametypo"
+        settings:
+          include-exported: true
+          include-types: true
+          include-generated: false
+          allowed-prefixes: asm,op
       errortype:
         type: module
         description: "errortype helps prevent subtle bugs in error handling."
@@ -24,6 +31,9 @@ linters:
           check-is: true
           unchecked-assert: false
           check-unused: true
+      partitiontest:
+        type: "module"
+        description: This custom linter ensures test functions call 'partitiontest.PartitionTest(t)'
   exclusions:
     generated: lax
     rules:

.golangci.yml

@@ -126,8 +126,9 @@ linters:
         path: _test\.go
         text: 'dot-imports: should not use dot imports' # dot imports OK for tests
       - linters: revive
-        path: util/
         text: 'var-naming: avoid meaningless package names' # util package is OK
+      - linters: revive
+        text: 'var-naming: avoid package names that conflict with Go standard library package names' # e.g. crypto package
       - linters: unused
         text: 'field _struct is unused' # we use _struct field tags for msgp/json encoding settings
       - linters: revive

AGENTS.md

@@ -50,8 +50,6 @@ To verify that this wasn't missed, we run verification steps, which can be found
 ### Development Setup
 ```bash
 ./scripts/configure_dev.sh                    # Initial environment setup
-./scripts/buildtools/install_buildtools.sh   # Install build tools
-make deps                                     # Check/install dependencies
 ```
 
 ### Single Test Execution

Makefile

@@ -43,12 +43,7 @@ GOTAGSLIST          := sqlite_unlock_notify sqlite_omit_load_extension
 # e.g. make GOTAGSCUSTOM=msgtrace
 GOTAGSLIST += ${GOTAGSCUSTOM}
 
-# If available, use gotestsum instead of 'go test'.
-ifeq (, $(shell which gotestsum))
-export GOTESTCOMMAND=go test
-else
-export GOTESTCOMMAND=gotestsum --format pkgname --jsonfile testresults.json --
-endif
+GOTESTCOMMAND := go tool -modfile=tool.mod gotestsum --format pkgname --jsonfile testresults.json --
 
 ifeq ($(OS_TYPE), darwin)
 # M1 Mac--homebrew install location in /opt/homebrew
@@ -107,10 +102,13 @@ fix: build
 	$(GOBIN)/algofix */
 
 modernize:
-	GOTOOLCHAIN=auto go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@latest -any=false -bloop=false -rangeint=false -fmtappendf=false -waitgroup=false -stringsbuilder=false -omitzero=false -fix ./...
+	GOTOOLCHAIN=auto go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@v0.39.0 -any=false -bloop=false -rangeint=false -fmtappendf=false -waitgroup=false -stringsbuilder=false -omitzero=false -fix ./...
+
+lint:
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.7.1 run -c .golangci.yml
 
-lint: deps
-	$(GOBIN)/golangci-lint run -c .golangci.yml
+warninglint: custom-golangci-lint
+	./custom-golangci-lint run -c .golangci-warnings.yml
 
 expectlint:
 	cd test/e2e-go/cli/goal/expect && python3 expect_linter.py *.exp
@@ -140,7 +138,7 @@ cover:
 prof:
 	cd node && go test $(GOTAGS) -cpuprofile=cpu.out -memprofile=mem.out -mutexprofile=mutex.out
 
-generate: deps
+generate:
 	PATH=$(GOBIN):$$PATH go generate ./...
 
 msgp: $(patsubst %,%/msgp_gen.go,$(MSGP_GENERATE))
@@ -151,13 +149,13 @@ api:
 logic:
 	make -C data/transactions/logic
 
-
-%/msgp_gen.go: deps ALWAYS
+MSGP := go run github.com/algorand/msgp@v1.1.62
+%/msgp_gen.go: ALWAYS
 		@set +e; \
-		printf "msgp: $(@D)..."; \
-		$(GOBIN)/msgp -file ./$(@D) -o $@ -warnmask github.com/algorand/go-algorand > ./$@.out 2>&1; \
+		printf "$(MSGP) $(@D)..."; \
+		$(MSGP) -file ./$(@D) -o $@ -warnmask github.com/algorand/go-algorand > ./$@.out 2>&1; \
 		if [ "$$?" != "0" ]; then \
-			printf "failed:\n$(GOBIN)/msgp -file ./$(@D) -o $@ -warnmask github.com/algorand/go-algorand\n"; \
+			printf "failed:\n$(MSGP) -file ./$(@D) -o $@ -warnmask github.com/algorand/go-algorand\n"; \
 			cat ./$@.out; \
 			rm ./$@.out; \
 			exit 1; \
@@ -231,9 +229,6 @@ else
 	echo "OS_TYPE must be darwin for universal builds, skipping"
 endif
 
-deps:
-	./scripts/check_deps.sh
-
 # artifacts
 
 # Regenerate kmd swagger spec files
@@ -260,15 +255,15 @@ $(KMD_API_SWAGGER_SPEC): $(KMD_API_FILES) crypto/libs/$(OS_TYPE)/$(ARCH)/lib/lib
 		touch $@; \
 	fi
 
-$(KMD_API_SWAGGER_INJECT): deps $(KMD_API_SWAGGER_SPEC) $(KMD_API_SWAGGER_SPEC).validated
+$(KMD_API_SWAGGER_INJECT): $(KMD_API_SWAGGER_SPEC) $(KMD_API_SWAGGER_SPEC).validated
 	./daemon/kmd/lib/kmdapi/bundle_swagger_json.sh
 
 # generated files we should make sure we clean
 GENERATED_FILES := \
 	$(KMD_API_SWAGGER_INJECT) \
 	$(KMD_API_SWAGGER_SPEC) $(KMD_API_SWAGGER_SPEC).validated
 
-rebuild_kmd_swagger: deps
+rebuild_kmd_swagger:
 	rm -f $(GENERATED_FILES)
 	# we need to invoke the make here since we want to ensure that the deletion and re-creating are sequential
 	make $(KMD_API_SWAGGER_INJECT)
@@ -306,7 +301,7 @@ build-e2e: check-go-version crypto/libs/$(OS_TYPE)/$(ARCH)/lib/libsodium.a
 	wait
 	cp $(GOBIN)/kmd $(GOBIN)-race
 
-NONGO_BIN_FILES=$(GOBIN)/find-nodes.sh $(GOBIN)/update.sh $(GOBIN)/COPYING $(GOBIN)/ddconfig.sh
+NONGO_BIN_FILES=$(GOBIN)/find-nodes.sh $(GOBIN)/update.sh $(GOBIN)/COPYING
 
 NONGO_BIN: $(NONGO_BIN_FILES)
 
@@ -316,8 +311,6 @@ $(GOBIN)/update.sh: cmd/updater/update.sh
 
 $(GOBIN)/COPYING: COPYING
 
-$(GOBIN)/ddconfig.sh: scripts/ddconfig.sh
-
 $(GOBIN)/%:
 	cp -f $< $@
 
@@ -415,14 +408,13 @@ dump: $(addprefix gen/,$(addsuffix /genesis.dump, $(NETWORKS)))
 install: build
 	scripts/dev_install.sh -p $(GOBIN)
 
-.PHONY: default fmt lint check_shell sanity cover prof deps build build-race build-e2e test fulltest shorttest clean cleango deploy node_exporter install %gen gen NONGO_BIN check-go-version rebuild_kmd_swagger universal libsodium modernize
+.PHONY: default fmt lint check_shell sanity cover prof build build-race build-e2e test fulltest shorttest clean cleango deploy node_exporter install %gen gen NONGO_BIN check-go-version rebuild_kmd_swagger universal libsodium modernize
 
 ###### TARGETS FOR CICD PROCESS ######
 include ./scripts/release/mule/Makefile.mule
 
 archive:
 	aws s3 cp tmp/node_pkgs s3://algorand-internal/channel/$(CHANNEL)/$(FULLBUILDNUMBER) --recursive --exclude "*" --include "*$(FULLBUILDNUMBER)*"
 
-build_custom_linters:
+custom-golangci-lint: .custom-gcl.yml
 	golangci-lint custom -v
-	./custom-golangci-lint --version

README.md

@@ -31,7 +31,6 @@ We currently strive to support Debian-based distributions, with Ubuntu 24.04 as
 git clone https://github.com/algorand/go-algorand
 cd go-algorand
 ./scripts/configure_dev.sh
-./scripts/buildtools/install_buildtools.sh
 ```
 
 At this point, you are ready to build go-algorand. We use `make` and have several targets to automate common tasks.
@@ -136,7 +135,6 @@ Contains the two daemons that provide Algorand clients with services:
 Enables developers to interface with the Algorand system:
 
 - **cmd**: Contains the primary commands defining entry points into the system.
-  - **cmd/catchupsrv** ([README](cmd/catchupsrv/README.md)): A tool to assist with processing historic blocks on a new node.
 - **libgoal**: Exports a Go interface useful for developers of Algorand clients.
 - **tools** ([README](tools/README.md)): Various tools and utilities that don’t have a better place to go.
 - **tools/debug**: Holds secondary commands that assist developers during debugging.
@@ -148,8 +146,6 @@ Helps Algorand developers deploy networks of their own:
 
 - **nodecontrol**
 - **docker**
-- **commandandcontrol** ([README](test/commandandcontrol/README.md)): A tool to automate a network of `algod` instances.
-- **components**
 - **netdeploy**
 
 ### Utilities
@@ -169,5 +165,5 @@ Provides utilities for the various components:
 
 Please see the [COPYING_FAQ](COPYING_FAQ) for details on how to apply our license.
 
-Copyright (C) 2019-2025, Algorand Inc.
+Copyright (C) 2019-2026, Algorand Inc.