From 89a054cdfbcebcd1af67ba9f588cbb9c5a0ffc76 Mon Sep 17 00:00:00 2001
From: tbjump <unknown>
Date: Wed, 7 Jun 2023 01:49:38 +0000
Subject: [PATCH] node: update golang to 1.20.5 from 1.20.4

---
 .github/workflows/build.yml | 10 +++++-----
 DEVELOP.md                  |  2 +-
 Dockerfile.proto            |  4 ++--
 node/Dockerfile             |  2 +-
 scripts/Dockerfile.lint     |  2 +-
 scripts/dev-setup.sh        |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbd4b48ed..6f86ae9d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.20.4"
+          go-version: "1.20.5"
       - run: make node
 
   algorand:
@@ -269,9 +269,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.20.4"
+          go-version: "1.20.5"
       - run: cd sdk/vaa && go test && go test -v -fuzz FuzzCalculateQuorum -run FuzzCalculateQuorum -fuzztime 15s
-  
+
   # Run Go linters
   node-lint:
     # The linter is slow enough that we want to run it on the self-hosted runner
@@ -286,7 +286,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.20.4"
+          go-version: "1.20.5"
       - name: Install formatter
         run: go install golang.org/x/tools/cmd/goimports@v0.8.0
       - name: Formatting checks
@@ -315,7 +315,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.20.4"
+          go-version: "1.20.5"
       # The go-ethereum and celo-blockchain packages both implement secp256k1 using the exact same header, but that causes duplicate symbols.
       - name: Run golang tests
         run: cd node && go test -v -timeout 1m -race -ldflags '-extldflags "-Wl,--allow-multiple-definition" ' ./...
diff --git a/DEVELOP.md b/DEVELOP.md
index fc37d6c5e..6fd92fb57 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -4,7 +4,7 @@
 
 The following dependencies are required for local development:
 
-- [Go](https://golang.org/dl/) >= 1.20.3
+- [Go](https://golang.org/dl/) >= 1.20.x (latest minor release is recommended)
 - [Tilt](http://tilt.dev/) >= 0.20.8
 - Any of the local Kubernetes clusters supported by Tilt.
   We strongly recommend [minikube](https://kubernetes.io/docs/setup/learning-environment/minikube/) >=
diff --git a/Dockerfile.proto b/Dockerfile.proto
index 0e8642353..b87a3e82d 100644
--- a/Dockerfile.proto
+++ b/Dockerfile.proto
@@ -1,5 +1,5 @@
 # syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
-FROM docker.io/golang:1.20.4@sha256:6dd5c5f8936d7d4487802fb10a77f31b1776740be0fc17ada1acb74ac958f7be AS go-tools
+FROM docker.io/golang:1.20.5@sha256:4b1fc02d16fca272e5e6e6adc98396219b43ef663a377eef4a97e881d364393f AS go-tools
 
 # Support additional root CAs
 COPY README.md cert.pem* /certs/
@@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache --mount=type=cache,target=/go \
 	cd /app/tools && CGO_ENABLED=0 ./build.sh
 
 # syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
-FROM docker.io/golang:1.20.4@sha256:6dd5c5f8936d7d4487802fb10a77f31b1776740be0fc17ada1acb74ac958f7be AS go-build
+FROM docker.io/golang:1.20.5@sha256:4b1fc02d16fca272e5e6e6adc98396219b43ef663a377eef4a97e881d364393f AS go-build
 
 # Support additional root CAs
 COPY README.md cert.pem* /certs/
diff --git a/node/Dockerfile b/node/Dockerfile
index 604b031c6..29e3d9c1a 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
-FROM --platform=linux/amd64 docker.io/golang:1.20.4@sha256:6dd5c5f8936d7d4487802fb10a77f31b1776740be0fc17ada1acb74ac958f7be AS build
+FROM --platform=linux/amd64 docker.io/golang:1.20.5@sha256:4b1fc02d16fca272e5e6e6adc98396219b43ef663a377eef4a97e881d364393f AS build
 # libwasmvm.so is not compatible with arm
 
 # Support additional root CAs
diff --git a/scripts/Dockerfile.lint b/scripts/Dockerfile.lint
index 547afbdeb..202190709 100644
--- a/scripts/Dockerfile.lint
+++ b/scripts/Dockerfile.lint
@@ -1,5 +1,5 @@
 # syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
-FROM docker.io/golang:1.20.4@sha256:6dd5c5f8936d7d4487802fb10a77f31b1776740be0fc17ada1acb74ac958f7be
+FROM docker.io/golang:1.20.5@sha256:4b1fc02d16fca272e5e6e6adc98396219b43ef663a377eef4a97e881d364393f
 
 RUN useradd -u 1000 -U -m -d /home/lint lint
 USER 1000
diff --git a/scripts/dev-setup.sh b/scripts/dev-setup.sh
index f5751d9bb..98d658e00 100755
--- a/scripts/dev-setup.sh
+++ b/scripts/dev-setup.sh
@@ -63,7 +63,7 @@ esac
 
 # Install Go
 ARCH=amd64
-GO=1.20.4
+GO=1.20.5
 
 (
   if [[ -d /usr/local/go ]]; then