all: upgrade golangci-lint and formatters (#240)

script/bootstrap

@@ -4,7 +4,7 @@
 go install ./internal/cmd/asmvet
 
 # Install golangci-lint
-golangci_lint_version='v1.23.6'
+golangci_lint_version='v1.45.2'
 golangci_install_script="https://raw.githubusercontent.com/golangci/golangci-lint/${golangci_lint_version}/install.sh"
 curl -sfL "${golangci_install_script}" | sh -s -- -b "$GOPATH/bin" "${golangci_lint_version}"
 
@@ -17,5 +17,8 @@ go install github.com/dlespiau/covertool@v0.0.0-20180314162135-b0c4c6d0583a
 # asmfmt for enforcing assembly style
 go install github.com/klauspost/asmfmt/cmd/asmfmt@v1.3.1
 
-# gofumports for stricter formatting
-go install mvdan.cc/gofumpt/gofumports@v0.0.0-20200412215918-a91da47f375c
+# goimports for import grouping.
+go install golang.org/x/tools/cmd/goimports@v0.1.10
+
+# gofumpt for stricter formatting.
+go install mvdan.cc/gofumpt@v0.2.1

script/fmt

@@ -8,8 +8,11 @@ files=$(find . -name '*.go' -not -path '*/stadtx/*')
 
 # Remove blank lines in import blocks. This will force formatting to group
 # imports correctly.
-sed -i.fmtbackup '/^import (/,/)/ { /^$$/ d; }' ${files}
+sed -i.fmtbackup '/^import (/,/)/ { /^[ \t]*$/ d; }' ${files}
 find . -name '*.fmtbackup' -delete
 
-# gofumports is goimports with stricter formatting.
-gofumports -w -local ${repo} ${files}
+# goimports for import grouping.
+goimports -w -local "${repo}" ${files}
+
+# gofumpt for stricter gofmt-compatible format.
+gofumpt -w ${files}