From 0089fd794c170d841ba0f79e3ea1433a93462a1a Mon Sep 17 00:00:00 2001
From: tamirms <tamirms@gmail.com>
Date: Wed, 15 Feb 2023 07:52:02 +0000
Subject: [PATCH] Bump go version for Horizon

---
 .github/workflows/go.yml              |  6 ++--
 .github/workflows/golangci-lint.yml   |  2 +-
 .github/workflows/horizon-release.yml |  2 +-
 .github/workflows/horizon.yml         |  2 +-
 .github/workflows/soroban-rpc.yml     | 52 ---------------------------
 services/horizon/CHANGELOG.md         |  5 +++
 staticcheck.sh                        |  2 +-
 7 files changed, 12 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/soroban-rpc.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index d51aa03def..795ff54318 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        go: [1.19.4]
+        go: [1.20.1]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        go: [1.18.6, 1.19.4]
+        go: [1.19.6, 1.20.1]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        go: [1.18.6, 1.19.4]
+        go: [1.19.6, 1.20.1]
         pg: [9.6.5, 10]
     runs-on: ${{ matrix.os }}
     services:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 6213c47cf6..4f48b972a2 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc # version v3.2.0
         with:
-          version: v1.49.0 # this is the golangci-lint version
+          version: v1.51.1 # this is the golangci-lint version
           args: --issues-exit-code=0 # exit without errors for now - won't fail the build
           github-token: ${{ secrets.GITHUB_TOKEN }}
           only-new-issues: true
diff --git a/.github/workflows/horizon-release.yml b/.github/workflows/horizon-release.yml
index 7909d6a98e..aacdcea849 100644
--- a/.github/workflows/horizon-release.yml
+++ b/.github/workflows/horizon-release.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: ./.github/actions/setup-go
         with:
-          go-version: 1.19.4
+          go-version: 1.20.1
 
       - name: Check dependencies
         run: ./gomod.sh
diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
index 6723863232..2394f72d28 100644
--- a/.github/workflows/horizon.yml
+++ b/.github/workflows/horizon.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        go: [1.18.6, 1.19.4]
+        go: [1.19.6, 1.20.1]
         pg: [9.6.5]
         ingestion-backend: [db, captive-core, captive-core-remote-storage]
         protocol-version: [18, 19]
diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
deleted file mode 100644
index 7786934145..0000000000
--- a/.github/workflows/soroban-rpc.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Soroban RPC
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-jobs:
-
-  integration:
-    name: Integration tests
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        go: [1.19.4]
-    runs-on: ${{ matrix.os }}
-    env:
-      SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
-      SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
-      PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.5.0-1108.ca2fb0605.focal
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          # For pull requests, build and test the PR head not a merge of the PR with the destination.
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-          # We need to full history for git-restore-mtime to know what modification dates to use.
-          # Otherwise, the Go test cache will fail (due to the modification time of fixtures changing).
-          fetch-depth: '0'
-
-      - uses: ./.github/actions/setup-go
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Install Captive Core
-        run: |
-          # Workaround for https://github.com/actions/virtual-environments/issues/5245,
-          # libc++1-8 won't be installed if another version is installed (but apt won't give you a helpul
-          # message about why the installation fails)
-          sudo apt-get remove -y libc++1-10 libc++abi1-10 || true
-          
-          sudo wget -qO - https://apt.stellar.org/SDF.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true sudo apt-key add -
-          sudo bash -c 'echo "deb https://apt.stellar.org focal unstable" > /etc/apt/sources.list.d/SDF-unstable.list'
-          sudo apt-get update && sudo apt-get install -y stellar-core="$PROTOCOL_19_CORE_DEBIAN_PKG_VERSION"
-          echo "Using stellar core version $(stellar-core version)"
-
-      - name: Build Soroban RPC reproducible build
-        run: |
-          go build -v -trimpath -buildvcs=false ./exp/services/soroban-rpc
-          touch empty
-
-      - name: Run Soroban RPC Tests
-        run: go test -race -timeout 25m -v ./exp/services/soroban-rpc/internal/test/...
\ No newline at end of file
diff --git a/services/horizon/CHANGELOG.md b/services/horizon/CHANGELOG.md
index 066e97fac2..d49fc4f489 100644
--- a/services/horizon/CHANGELOG.md
+++ b/services/horizon/CHANGELOG.md
@@ -6,6 +6,11 @@ file. This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 2.24.1
+
+### Changes
+
+- Bump Go to the latest version (1.20.1), including crypto/tls, mime/multipart, net/http, and path/filepath security fixes.
 
 ## 2.24.0
 
diff --git a/staticcheck.sh b/staticcheck.sh
index 139ccb6e45..539641a4b3 100755
--- a/staticcheck.sh
+++ b/staticcheck.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 set -e
 
-version='2022.1'
+version='2023.1.1'
 
 staticcheck='go run honnef.co/go/tools/cmd/staticcheck@'"$version"