Update minimum golang version to v1.21.7

.github/workflows/build-linux-binaries.yml

@@ -11,7 +11,7 @@ on:
       - "*"
 
 env:
-  go_version: '~1.20.12'
+  go_version: '~1.21.7'
 
 jobs:
   build-x86_64-binaries-tarball:

.github/workflows/build-macos-release.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.20.12'
+          go-version: '~1.21.7'
           check-latest: true
       - run: go version
 

.github/workflows/build-public-ami.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.20.12'
+          go-version: '~1.21.7'
           check-latest: true
       - run: go version
 

.github/workflows/build-ubuntu-amd64-release.yml

@@ -11,7 +11,7 @@ on:
       - "*"
 
 env:
-  go_version: '~1.20.12'
+  go_version: '~1.21.7'
 
 jobs:
   build-jammy-amd64-package:

.github/workflows/build-ubuntu-arm64-release.yml

@@ -11,7 +11,7 @@ on:
       - "*"
 
 env:
-  go_version: '~1.20.12'
+  go_version: '~1.21.7'
 
 jobs:
   build-jammy-arm64-package:

.github/workflows/build-win-release.yml

@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.20.12'
+          go-version: '~1.21.7'
           check-latest: true
 
       - run: go version

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  go_version: '~1.20.12'
+  go_version: '~1.21.7'
   tmpnet_data_path: ~/.tmpnet/networks/1000
 
 jobs:

.github/workflows/fuzz.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '~1.20.12'
+          go-version: '~1.21.7'
           check-latest: true
       - name: Run fuzz tests
         shell: bash

.github/workflows/fuzz_merkledb.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '~1.20.12'
+          go-version: '~1.21.7'
           check-latest: true
       - name: Run merkledb fuzz tests
         shell: bash

CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 To start developing on AvalancheGo, you'll need a few things installed.
 
-- Golang version >= 1.20.12
+- Golang version >= 1.21.7
 - gcc
 - g++
 

Dockerfile

@@ -4,7 +4,7 @@
 # README.md
 # go.mod
 # ============= Compilation Stage ================
-FROM golang:1.20.12-bullseye AS builder
+FROM golang:1.21.7-bullseye AS builder
 
 WORKDIR /build
 # Copy and download avalanche dependencies using go mod

README.md

@@ -23,7 +23,7 @@ The minimum recommended hardware specification for nodes connected to Mainnet is
 
 If you plan to build AvalancheGo from source, you will also need the following software:
 
-- [Go](https://golang.org/doc/install) version >= 1.20.12
+- [Go](https://golang.org/doc/install) version >= 1.21.7
 - [gcc](https://gcc.gnu.org/)
 - g++
 

api/health/worker.go

@@ -7,16 +7,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
+	"slices"
 	"sync"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 
 	"go.uber.org/zap"
 
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
@@ -167,7 +166,7 @@ func (w *worker) Results(tags ...string) (map[string]Result, bool) {
 
 func (w *worker) Start(ctx context.Context, freq time.Duration) {
 	w.startOnce.Do(func() {
-		detachedCtx := utils.Detach(ctx)
+		detachedCtx := context.WithoutCancel(ctx)
 		w.wg.Add(1)
 		go func() {
 			ticker := time.NewTicker(freq)

api/metrics/multi_gatherer.go

@@ -4,17 +4,16 @@
 package metrics
 
 import (
+	"cmp"
 	"errors"
 	"fmt"
+	"slices"
 	"sync"
 
 	"github.com/prometheus/client_golang/prometheus"
 
 	dto "github.com/prometheus/client_model/go"
 
-	"golang.org/x/exp/slices"
-
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/metric"
 )
 
@@ -91,6 +90,6 @@ func (g *multiGatherer) Register(namespace string, gatherer prometheus.Gatherer)
 
 func sortMetrics(m []*dto.MetricFamily) {
 	slices.SortFunc(m, func(i, j *dto.MetricFamily) int {
-		return utils.Compare(*i.Name, *j.Name)
+		return cmp.Compare(*i.Name, *j.Name)
 	})
 }

chains/atomic/state.go

@@ -7,8 +7,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/linkeddb"

codec/reflectcodec/type_codec.go

@@ -9,10 +9,9 @@ import (
 	"fmt"
 	"math"
 	"reflect"
+	"slices"
 	"time"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/wrappers"

database/batch.go

@@ -7,7 +7,7 @@
 
 package database
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 // Batch is a write-only database that commits changes to its host database
 // when Write is called. A batch cannot be used concurrently.

database/encdb/db.go

@@ -7,12 +7,11 @@ import (
 	"context"
 	"crypto/cipher"
 	"crypto/rand"
+	"slices"
 	"sync"
 
 	"golang.org/x/crypto/chacha20poly1305"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/utils/hashing"
 )

database/helpers_test.go

@@ -5,13 +5,12 @@ package database
 
 import (
 	"math/rand"
+	"slices"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/utils"
 )
 

database/leveldb/db.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
+	"slices"
 	"sync"
 	"time"
 
@@ -23,8 +24,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/logging"

database/linkeddb/linkeddb.go

@@ -4,11 +4,9 @@
 package linkeddb
 
 import (
+	"slices"
 	"sync"
 
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/cache"
 	"github.com/ava-labs/avalanchego/database"
 )
@@ -339,7 +337,7 @@ func (ldb *linkedDB) deleteNode(key []byte) error {
 
 func (ldb *linkedDB) resetBatch() {
 	ldb.headKeyIsUpdated = false
-	maps.Clear(ldb.updatedNodes)
+	clear(ldb.updatedNodes)
 	ldb.batch.Reset()
 }
 

database/memdb/db.go

@@ -5,11 +5,10 @@ package memdb
 
 import (
 	"context"
+	"slices"
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/database"
 )
 

database/pebble/db.go

@@ -8,14 +8,13 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"slices"
 	"sync"
 
 	"github.com/cockroachdb/pebble"
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"golang.org/x/exp/slices"
-
 	"go.uber.org/zap"
 
 	"github.com/ava-labs/avalanchego/database"

database/pebble/iterator.go

@@ -6,12 +6,11 @@ package pebble
 import (
 	"errors"
 	"fmt"
+	"slices"
 	"sync"
 
 	"github.com/cockroachdb/pebble"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/database"
 )
 

database/prefixdb/db.go

@@ -5,10 +5,9 @@ package prefixdb
 
 import (
 	"context"
+	"slices"
 	"sync"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/utils/hashing"
 )

database/test_database.go

@@ -8,14 +8,14 @@ import (
 	"io"
 	"math"
 	"math/rand"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
 	"go.uber.org/mock/gomock"
 
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 
 	"golang.org/x/sync/errgroup"
 

database/versiondb/db.go

@@ -5,12 +5,10 @@ package versiondb
 
 import (
 	"context"
+	"slices"
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
-
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/memdb"
 )
@@ -210,7 +208,7 @@ func (db *Database) Abort() {
 }
 
 func (db *Database) abort() {
-	maps.Clear(db.mem)
+	clear(db.mem)
 }
 
 // CommitBatch returns a batch that contains all uncommitted puts/deletes.

genesis/bootstrappers.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/ips"
-	"github.com/ava-labs/avalanchego/utils/math"
 	"github.com/ava-labs/avalanchego/utils/sampler"
 )
 
@@ -45,7 +44,7 @@ func GetBootstrappers(networkID uint32) []Bootstrapper {
 // SampleBootstrappers returns the some beacons this node should connect to
 func SampleBootstrappers(networkID uint32, count int) []Bootstrapper {
 	bootstrappers := GetBootstrappers(networkID)
-	count = math.Min(count, len(bootstrappers))
+	count = min(count, len(bootstrappers))
 
 	s := sampler.NewUniform()
 	s.Initialize(uint64(len(bootstrappers)))

genesis/config.go

@@ -4,6 +4,7 @@
 package genesis
 
 import (
+	"cmp"
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
@@ -54,7 +55,7 @@ func (a Allocation) Unparse(networkID uint32) (UnparsedAllocation, error) {
 }
 
 func (a Allocation) Compare(other Allocation) int {
-	if amountCmp := utils.Compare(a.InitialAmount, other.InitialAmount); amountCmp != 0 {
+	if amountCmp := cmp.Compare(a.InitialAmount, other.InitialAmount); amountCmp != 0 {
 		return amountCmp
 	}
 	return a.AVAXAddr.Compare(other.AVAXAddr)