From 9f67616b63a14dc9658703dc55346bc257d13b91 Mon Sep 17 00:00:00 2001
From: Siddarth Kumar <siddarthkay@gmail.com>
Date: Thu, 30 May 2024 17:08:31 +0530
Subject: [PATCH] chore: bump go to 1.21 (#14946)

---
 ci/Dockerfile                   | 4 ++--
 ci/Jenkinsfile.linux            | 2 +-
 ci/Jenkinsfile.macos            | 2 +-
 ci/Jenkinsfile.windows          | 2 +-
 scripts/windows_build_setup.ps1 | 2 +-
 shell.nix                       | 2 +-
 vendor/status-go                | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 7fbd51e53..44aefc3be 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -81,8 +81,8 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1
 ENV PATH="/opt/cmake/bin:${PATH}"
 
 # Installing Golang
-RUN GOLANG_SHA256="698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd" \
- && GOLANG_TARBALL="go1.20.4.linux-amd64.tar.gz" \
+RUN GOLANG_SHA256="e330e5d977bf4f3bdc157bc46cf41afa5b13d66c914e12fd6b694ccda65fcf92" \
+ && GOLANG_TARBALL="go1.21.10.linux-amd64.tar.gz" \
  && wget -q "https://dl.google.com/go/${GOLANG_TARBALL}" \
  && echo "${GOLANG_SHA256} ${GOLANG_TARBALL}" | sha256sum -c \
  && sudo tar -C /usr/local -xzf "${GOLANG_TARBALL}" \
diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index 4cac912d9..cf4024e4f 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -9,7 +9,7 @@ pipeline {
     /* Necessary image with Ubuntu 20.04 for older Glibc. */
     docker {
       label 'linux'
-      image 'statusteam/nim-status-client-build:1.4.0-qt5.15.2'
+      image 'statusteam/nim-status-client-build:1.4.1-qt5.15.2'
       /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */
       args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse'
     }
diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos
index a386cff70..bfe80d436 100644
--- a/ci/Jenkinsfile.macos
+++ b/ci/Jenkinsfile.macos
@@ -7,7 +7,7 @@ def isPRBuild = utils.isPRBuild()
 pipeline {
   /* This way we run the same Jenkinsfile on different platforms. */
   agent {
-    label "${getAgentLabels().join(' && ')} && qt-5.15 && go-1.20"
+    label "${getAgentLabels().join(' && ')} && qt-5.15 && go-1.21"
   }
 
   parameters {
diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows
index 2fc413c6b..75208b3de 100644
--- a/ci/Jenkinsfile.windows
+++ b/ci/Jenkinsfile.windows
@@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.8.13'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'windows && x86_64 && qt-5.15.2 && go-1.20' }
+  agent { label 'windows && x86_64 && qt-5.15.2 && go-1.21' }
 
   parameters {
     booleanParam(
diff --git a/scripts/windows_build_setup.ps1 b/scripts/windows_build_setup.ps1
index 463bcfb9c..852e7ba06 100644
--- a/scripts/windows_build_setup.ps1
+++ b/scripts/windows_build_setup.ps1
@@ -18,7 +18,7 @@ function Install-Dependencies {
     if (!(scoop bucket list | Where { $_.Name -eq "extras" })) {
         scoop bucket add extras
     }
-    scoop install --global go@1.20.4
+    scoop install --global go@1.21.10
     scoop install --global vcredist2022
     scoop install --global `
         7zip git dos2unix findutils `
diff --git a/shell.nix b/shell.nix
index ebf89cc73..ad98058e0 100644
--- a/shell.nix
+++ b/shell.nix
@@ -20,7 +20,7 @@ in pkgs.mkShell {
     qt5Full
     bash curl wget git file unzip jq lsb-release
     cmake gnumake pkg-config gnugrep qtCustom
-    go_1_19
+    go_1_21
     pcre nss pcsclite extra-cmake-modules
     xorg.libxcb xorg.libX11 libxkbcommon
   ] ++ (with gst_all_1; [
diff --git a/vendor/status-go b/vendor/status-go
index e06c490ec..fb88f541f 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit e06c490ec870a70ae72ede2b37f1235a3d903ed8
+Subproject commit fb88f541f25017bbc78d373543b629aebe4d2e99