Merge pull request #654 from ava-labs/bump-avago-1.10.10

Bump avago 1.10.10

Author: felipemadero

.github/workflows/build-test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.19'
+          go-version: '~1.20.8'
           check-latest: true
       - name: Run static analysis tests
         shell: bash
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.19'
+          go-version: '~1.20.8'
       - run: go test -v -timeout 10m -race ./...
         env:
           CGO_CFLAGS: "-O -D__BLST_PORTABLE__" # Set the CGO flags to use the portable version of BLST
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.19'
+          go-version: '~1.20.8'
       - name: Run e2e tests
         shell: bash
         run: scripts/tests.e2e.sh

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.19'
+          go-version: '~1.20.8'
       - name: Set up arm64 cross compiler
         run: |
           sudo apt-get -y update

.gitignore

@@ -27,3 +27,5 @@ bin/
 
 # Ignore Markdown linting configuration for VSCode
 .markdownlint.json
+
+build/

.golangci.yml

@@ -95,7 +95,7 @@ linters-settings:
       - name: useless-break
         disabled: false
   staticcheck:
-    go: "1.19"
+    go: '~1.20.8'
     # https://staticcheck.io/docs/options#checks
     checks:
       - "all"

go.mod

@@ -1,10 +1,10 @@
 module github.com/ava-labs/avalanche-network-runner
 
-go 1.19
+go 1.20
 
 require (
-	github.com/ava-labs/avalanchego v1.10.9
-	github.com/ava-labs/coreth v0.12.5-rc.3
+	github.com/ava-labs/avalanchego v1.10.10
+	github.com/ava-labs/coreth v0.12.5-rc.6
 	github.com/ethereum/go-ethereum v1.12.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
 	github.com/onsi/ginkgo/v2 v2.8.1

go.sum

@@ -59,10 +59,10 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/ava-labs/avalanchego v1.10.9 h1:qxhp3YoD2Wm/iIKP6Wb1isbkUPWmIrJxWgivDoL0obM=
-github.com/ava-labs/avalanchego v1.10.9/go.mod h1:C8R5uiltpc8MQ62ixxgODR+15mesWF0aAw3H+Qrl9Iw=
-github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
-github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
+github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
+github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
+github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
+github.com/ava-labs/coreth v0.12.5-rc.6/go.mod h1:s5wVyy+5UCCk2m0Tq3jVmy0UqOpKBDYqRE13gInCJVs=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

scripts/lint.sh

@@ -21,22 +21,22 @@ fi
 TESTS=${TESTS:-"golangci_lint"}
 
 function test_golangci_lint {
-  go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
+  go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
   golangci-lint run --config .golangci.yml
 }
 
 # find_go_files [package]
 # all go files except generated ones
 function find_go_files {
   local target="${1}"
-  go fmt -n "${target}"  | grep -Eo "([^ ]*)$" | grep -vE "(\\.pb\\.go|\\.pb\\.gw.go)"
+  go fmt -n "${target}" | grep -Eo "([^ ]*)$" | grep -vE "(\\.pb\\.go|\\.pb\\.gw.go)"
 }
 
 function run {
   local test="${1}"
   shift 1
   echo "START: '${test}' at $(date)"
-  if "test_${test}" "$@" ; then
+  if "test_${test}" "$@"; then
     echo "SUCCESS: '${test}' completed at $(date)"
   else
     echo "FAIL: '${test}' failed at $(date)"

scripts/tests.e2e.sh

@@ -12,9 +12,9 @@ fi
 
 ANR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 
-DEFAULT_VERSION_1=v1.10.9
+DEFAULT_VERSION_1=v1.10.10
 DEFAULT_VERSION_2=v1.10.9
-DEFAULT_SUBNET_EVM_VERSION=4f24c8de30749bca33aa56533a2c32cafc1cfccc
+DEFAULT_SUBNET_EVM_VERSION=v0.5.5
 
 if [ $# == 0 ]; then
     VERSION_1=$DEFAULT_VERSION_1

server/network.go

@@ -34,11 +34,11 @@ const (
 scrape_configs:
   - job_name: prometheus
     static_configs:
-      - targets: 
+      - targets:
         - localhost:9090
   - job_name: avalanchego-machine
     static_configs:
-     - targets: 
+     - targets:
        - localhost:9100
        labels:
          alias: machine
@@ -608,7 +608,7 @@ func (lc *localNetwork) updateSubnetInfo(ctx context.Context) error {
 
 		isElastic := false
 		elasticSubnetID := ids.Empty
-		if _, err := node.GetAPIClient().PChainAPI().GetCurrentSupply(ctx, subnetID); err == nil {
+		if _, _, err := node.GetAPIClient().PChainAPI().GetCurrentSupply(ctx, subnetID); err == nil {
 			isElastic = true
 			elasticSubnetID, err = lc.nw.GetElasticSubnetID(ctx, subnetID)
 			if err != nil {