Update AvalancheGo dep to include latest + ACP-118

.golangci.yml

@@ -15,11 +15,6 @@ run:
   # By default, it isn't set.
   modules-download-mode: readonly
 
-output:
-  # Make issues output unique by line.
-  # Default: true
-  uniq-by-line: false
-
 issues:
   # Maximum issues count per one linter.
   # Set to 0 to disable.
@@ -36,6 +31,10 @@ issues:
   # Default: true
   exclude-dirs-use-default: false
 
+  # Make issues output unique by line.
+  # Default: true
+  uniq-by-line: false
+
 linters:
   disable-all: true
   enable:
@@ -45,7 +44,7 @@ linters:
     - dupword
     - errcheck
     - errorlint
-    - exportloopref
+    - copyloopvar
     - forbidigo
     - gci
     - goconst
@@ -121,6 +120,7 @@ linters-settings:
   gosec:
     excludes:
       - G107 # Url provided to HTTP request as taint input https://securego.io/docs/rules/g107
+      - G115 # TODO Enable this ruleset in a follow-up PR
   importas:
     # Do not allow unaliased imports of aliased packages.
     no-unaliased: false

Dockerfile

@@ -3,7 +3,7 @@
 ARG AVALANCHEGO_NODE_IMAGE="invalid-image" # This value is not intended to be used but silences a warning
 
 # ============= Compilation Stage ================
-FROM --platform=$BUILDPLATFORM golang:1.22.12-bullseye AS builder
+FROM --platform=$BUILDPLATFORM golang:1.23.7-bullseye AS builder
 
 WORKDIR /build
 

api/ws/server.go

@@ -153,15 +153,14 @@ func (w *WebSocketServer) expireTx(txID ids.ID) {
 	// [expiringTxs] will be cleared eventually (does not support removal)
 }
 
-func (w *WebSocketServer) setMinTx(t int64) error {
+func (w *WebSocketServer) setMinTx(t int64) {
 	expired := w.expiringTxs.SetMin(t)
 	for _, id := range expired {
 		w.expireTx(id)
 	}
 	if exp := len(expired); exp > 0 {
 		w.logger.Debug("expired listeners", zap.Int("count", exp))
 	}
-	return nil
 }
 
 func (w *WebSocketServer) AcceptBlock(_ context.Context, b *chain.ExecutedBlock) error {
@@ -194,7 +193,8 @@ func (w *WebSocketServer) AcceptBlock(_ context.Context, b *chain.ExecutedBlock)
 		delete(w.txListeners, txID)
 		// [expiringTxs] will be cleared eventually (does not support removal)
 	}
-	return w.setMinTx(b.Block.Tmstmp)
+	w.setMinTx(b.Block.Tmstmp)
+	return nil
 }
 
 func (w *WebSocketServer) MessageCallback() pubsub.Callback {

auth/bls.go

@@ -113,7 +113,11 @@ func NewBLSFactory(priv *bls.PrivateKey) *BLSFactory {
 }
 
 func (b *BLSFactory) Sign(msg []byte) (chain.Auth, error) {
-	return &BLS{Signer: bls.PublicFromPrivateKey(b.priv), Signature: bls.Sign(msg, b.priv)}, nil
+	signature, err := bls.Sign(msg, b.priv)
+	if err != nil {
+		return nil, err
+	}
+	return &BLS{Signer: bls.PublicFromPrivateKey(b.priv), Signature: signature}, nil
 }
 
 func (*BLSFactory) MaxUnits() (uint64, uint64) {

chain/builder.go

@@ -144,7 +144,7 @@ func (c *Builder) BuildBlock(ctx context.Context, pChainCtx *block.Context, pare
 			c.metrics.clearedMempool.Inc()
 			break
 		}
-		ctx, executeSpan := c.tracer.Start(ctx, "Chain.BuildBlock.Execute") //nolint:spancheck
+		ctx, executeSpan := c.tracer.Start(ctx, "Chain.BuildBlock.Execute")
 
 		// Perform a batch repeat check
 		// IsRepeat only returns an error if we fail to fetch the full validity window of blocks.
@@ -276,7 +276,7 @@ func (c *Builder) BuildBlock(ctx context.Context, pChainCtx *block.Context, pare
 					// Ignore the error and drop the transaction.
 					// We don't need to rollback [tsv] here because it will never
 					// be committed.
-					return nil //nolint:nilerr
+					return nil
 				}
 				result, err := tx.Execute(
 					ctx,
@@ -371,7 +371,7 @@ func (c *Builder) BuildBlock(ctx context.Context, pChainCtx *block.Context, pare
 	// Perform basic validity checks to make sure the block is well-formatted
 	if len(blockTransactions) == 0 {
 		if nextTime < parent.Tmstmp+r.GetMinEmptyBlockGap() {
-			return nil, nil, fmt.Errorf("%w: allowed in %d ms", ErrNoTxs, parent.Tmstmp+r.GetMinEmptyBlockGap()-nextTime) //nolint:spancheck
+			return nil, nil, fmt.Errorf("%w: allowed in %d ms", ErrNoTxs, parent.Tmstmp+r.GetMinEmptyBlockGap()-nextTime)
 		}
 		c.metrics.emptyBlockBuilt.Inc()
 	}

cli/key.go

@@ -60,11 +60,11 @@ func (h *Handler) Balance(checkAllChains bool) error {
 		return err
 	}
 
-	max := len(uris)
+	maxURIs := len(uris)
 	if !checkAllChains {
-		max = 1
+		maxURIs = 1
 	}
-	for _, uri := range uris[:max] {
+	for _, uri := range uris[:maxURIs] {
 		utils.Outf("{{yellow}}uri:{{/}} %s\n", uri)
 		balance, err := h.c.LookupBalance(addr, uris[0])
 		if err != nil {

cli/prompt/prompt.go

@@ -61,14 +61,14 @@ func Address(label string) (codec.Address, error) {
 	return codec.StringToAddress(recipient)
 }
 
-func String(label string, min int, max int) (string, error) {
+func String(label string, minLen int, maxLen int) (string, error) {
 	promptText := promptui.Prompt{
 		Label: label,
 		Validate: func(input string) error {
-			if len(input) < min {
+			if len(input) < minLen {
 				return ErrInputEmpty
 			}
-			if len(input) > max {
+			if len(input) > maxLen {
 				return ErrInputTooLarge
 			}
 			return nil
@@ -151,9 +151,9 @@ func Amount(
 
 func Int(
 	label string,
-	max int,
+	maxValue int,
 ) (int, error) {
-	stringToInt := func(input string, max int) (int, error) {
+	stringToInt := func(input string, maxValue int) (int, error) {
 		input = strings.TrimSpace(input)
 
 		if len(input) == 0 {
@@ -166,31 +166,31 @@ func Int(
 		if amount <= 0 {
 			return 0, fmt.Errorf("%d must be > 0", amount)
 		}
-		if amount > max {
-			return 0, fmt.Errorf("%d must be <= %d", amount, max)
+		if amount > maxValue {
+			return 0, fmt.Errorf("%d must be <= %d", amount, maxValue)
 		}
 		return amount, nil
 	}
 
 	promptText := promptui.Prompt{
 		Label: label,
 		Validate: func(input string) error {
-			_, err := stringToInt(input, max)
+			_, err := stringToInt(input, maxValue)
 			return err
 		},
 	}
 	rawAmount, err := promptText.Run()
 	if err != nil {
 		return 0, err
 	}
-	return stringToInt(rawAmount, max)
+	return stringToInt(rawAmount, maxValue)
 }
 
 func Uint(
 	label string,
-	max uint,
+	maxValue uint,
 ) (uint, error) {
-	stringToUint := func(input string, max uint) (uint, error) {
+	stringToUint := func(input string, maxValue uint) (uint, error) {
 		input = strings.TrimSpace(input)
 
 		if len(input) == 0 {
@@ -203,29 +203,29 @@ func Uint(
 		if amount > math.MaxUint {
 			return 0, fmt.Errorf("%d exceeds the maximum value for uint", amount)
 		}
-		if uint(amount) > max {
-			return 0, fmt.Errorf("%d must be <= %d", amount, max)
+		if uint(amount) > maxValue {
+			return 0, fmt.Errorf("%d must be <= %d", amount, maxValue)
 		}
 		return uint(amount), nil
 	}
 
 	promptText := promptui.Prompt{
 		Label: label,
 		Validate: func(input string) error {
-			_, err := stringToUint(input, max)
+			_, err := stringToUint(input, maxValue)
 			return err
 		},
 	}
 	rawAmount, err := promptText.Run()
 	if err != nil {
 		return 0, err
 	}
-	return stringToUint(rawAmount, max)
+	return stringToUint(rawAmount, maxValue)
 }
 
 func Float(
 	label string,
-	max float64,
+	maxValue float64,
 ) (float64, error) {
 	promptText := promptui.Prompt{
 		Label: label,
@@ -240,8 +240,8 @@ func Float(
 			if amount <= 0 {
 				return fmt.Errorf("%f must be > 0", amount)
 			}
-			if amount > max {
-				return fmt.Errorf("%f must be <= %f", amount, max)
+			if amount > maxValue {
+				return fmt.Errorf("%f must be <= %f", amount, maxValue)
 			}
 			return nil
 		},
@@ -254,8 +254,8 @@ func Float(
 	return strconv.ParseFloat(rawAmount, 64)
 }
 
-func Choice(label string, max int) (int, error) {
-	if max == 1 {
+func Choice(label string, maxChoice int) (int, error) {
+	if maxChoice == 1 {
 		utils.Outf("{{yellow}}%s:{{/}} 0 [auto-selected]\n", label)
 		return 0, nil
 	}
@@ -269,7 +269,7 @@ func Choice(label string, max int) (int, error) {
 			if err != nil {
 				return err
 			}
-			if index >= max || index < 0 {
+			if index >= maxChoice || index < 0 {
 				return ErrIndexOutOfRange
 			}
 			return nil

crypto/bls/private.go

@@ -6,6 +6,7 @@ package bls
 import (
 	"errors"
 
+	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 
 	blst "github.com/supranational/blst/bindings/go"
@@ -37,6 +38,6 @@ func PublicFromPrivateKey(pk *PrivateKey) *PublicKey {
 	return pk.PublicKey()
 }
 
-func Sign(msg []byte, pk *PrivateKey) *Signature {
+func Sign(msg []byte, pk *PrivateKey) (*bls.Signature, error) {
 	return pk.Sign(msg)
 }

crypto/bls/private_test.go

@@ -34,12 +34,14 @@ func TestPrivateKeyBytes(t *testing.T) {
 
 	sk, err := GeneratePrivateKey()
 	require.NoError(err)
-	sig := Sign(msg, sk)
+	sig, err := Sign(msg, sk)
+	require.NoError(err)
 	skBytes := PrivateKeyToBytes(sk)
 
 	sk2, err := PrivateKeyFromBytes(skBytes)
 	require.NoError(err)
-	sig2 := Sign(msg, sk2)
+	sig2, err := Sign(msg, sk2)
+	require.NoError(err)
 	sk2Bytes := PrivateKeyToBytes(sk2)
 
 	require.Equal(sk, sk2)

crypto/bls/public_test.go

@@ -75,8 +75,10 @@ func TestAggregatePublicKeys(t *testing.T) {
 	require.NoError(err)
 
 	// Aggregates 2 signatures
-	sig1 := Sign(msg, sk1)
-	sig2 := Sign(msg, sk2)
+	sig1, err := Sign(msg, sk1)
+	require.NoError(err)
+	sig2, err := Sign(msg, sk2)
+	require.NoError(err)
 	aggSigs, err := AggregateSignatures([]*Signature{sig1, sig2})
 	require.NoError(err)
 

crypto/bls/signature_test.go

@@ -17,7 +17,8 @@ func TestSignatureBytes(t *testing.T) {
 
 	sk, err := GeneratePrivateKey()
 	require.NoError(err)
-	sig := Sign(msg, sk)
+	sig, err := Sign(msg, sk)
+	require.NoError(err)
 	sigBytes := SignatureToBytes(sig)
 
 	sig2, err := SignatureFromBytes(sigBytes)
@@ -36,7 +37,8 @@ func TestAggregateSignaturesNoop(t *testing.T) {
 	sk, err := GeneratePrivateKey()
 	require.NoError(err)
 
-	sig := Sign(msg, sk)
+	sig, err := Sign(msg, sk)
+	require.NoError(err)
 	sigBytes := SignatureToBytes(sig)
 
 	aggSig, err := AggregateSignatures([]*Signature{sig})

examples/morpheusvm/.golangci.yml

@@ -22,7 +22,7 @@ linters:
     - depguard
     - errcheck
     - errorlint
-    - exportloopref
+    - copyloopvar
     - goconst
     - gocritic
     - gofmt
@@ -45,11 +45,9 @@ linters:
     - whitespace
     - staticcheck
     - bodyclose
-    - structcheck
       # - lll
       # - gomnd
     - goprintffuncname
-    - interfacer
     - typecheck
       # - goerr113
     - noctx
@@ -107,6 +105,7 @@ linters-settings:
   gosec:
     excludes:
       - G107 # https://securego.io/docs/rules/g107.html
+      - G115 # TODO Enable this ruleset in a follow-up PR
   depguard:
     rules:
       packages:

examples/morpheusvm/cmd/morpheus-cli/cmd/chain.go

@@ -30,7 +30,7 @@ var setChainCmd = &cobra.Command{
 
 var importAvalancheCliChainCmd = &cobra.Command{
 	Use: "import-cli [path]",
-	PreRunE: func(cmd *cobra.Command, args []string) error {
+	PreRunE: func(_ *cobra.Command, args []string) error {
 		if len(args) != 1 {
 			return ErrInvalidArgs
 		}
@@ -50,7 +50,7 @@ var chainInfoCmd = &cobra.Command{
 
 var watchChainCmd = &cobra.Command{
 	Use: "watch",
-	RunE: func(_ *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		return handler.Root().WatchChain(hideTxs)
 	},
 }

examples/morpheusvm/cmd/morpheus-cli/cmd/prometheus.go

@@ -17,7 +17,7 @@ var prometheusCmd = &cobra.Command{
 
 var generatePrometheusCmd = &cobra.Command{
 	Use: "generate",
-	RunE: func(_ *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		return handler.Root().GeneratePrometheus(prometheusBaseURI, prometheusOpenBrowser, startPrometheus, prometheusFile, prometheusData)
 	},
 }