Merge branch 'main' into demote-relayer

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Setup
 
-To start developing on AWM Relayer, you'll need Golang v1.21.13.
+To start developing on AWM Relayer, you'll need Golang v1.22.6.
 
 ## Issues
 

database/json_file_storage_test.go

@@ -50,10 +50,9 @@ func TestConcurrentWriteReadSingleChain(t *testing.T) {
 	wg := sync.WaitGroup{}
 	for i := 0; i < 10; i++ {
 		wg.Add(1)
-		idx := i
 		go func() {
 			defer wg.Done()
-			testWrite(jsonStorage, relayerIDs[0], uint64(idx))
+			testWrite(jsonStorage, relayerIDs[0], uint64(i))
 		}()
 	}
 	wg.Wait()
@@ -94,10 +93,9 @@ func TestConcurrentWriteReadMultipleChains(t *testing.T) {
 	wg := sync.WaitGroup{}
 	for i := 0; i < 3; i++ {
 		wg.Add(1)
-		index := i
 		go func() {
 			defer wg.Done()
-			testWrite(jsonStorage, relayerIDs[index], uint64(index))
+			testWrite(jsonStorage, relayerIDs[i], uint64(i))
 		}()
 	}
 	wg.Wait()

go.mod

@@ -1,6 +1,6 @@
 module github.com/ava-labs/awm-relayer
 
-go 1.21.13
+go 1.22.6
 
 require (
 	github.com/ava-labs/avalanchego v1.11.10

relayer/application_relayer.go

@@ -148,11 +148,8 @@ func (r *ApplicationRelayer) ProcessHeight(
 ) {
 	var eg errgroup.Group
 	for _, handler := range handlers {
-		// Copy the loop variable to a local variable to avoid the loop variable being captured by the
-		// goroutine. Once we upgrade to Go 1.22, we can use the loop variable directly in the goroutine.
-		h := handler
 		eg.Go(func() error {
-			_, err := r.ProcessMessage(h)
+			_, err := r.ProcessMessage(handler)
 			return err
 		})
 	}

scripts/versions.sh

@@ -25,4 +25,4 @@ GINKGO_VERSION=${GINKGO_VERSION:-$(getDepVersion github.com/onsi/ginkgo/v2)}
 SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-update-avago-teleporter}
 
 # Set golangci-lint version
-GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.55'}
+GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.60'}