From e31b4ff8c60e4774916ec566786d999d5c68cdd4 Mon Sep 17 00:00:00 2001
From: Bartek Nowotarski <bartek@nowotarski.info>
Date: Wed, 13 Apr 2022 13:16:55 +0200
Subject: [PATCH 1/2] Horizon v2.16.1 CHANGELOG

---
 services/horizon/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/horizon/CHANGELOG.md b/services/horizon/CHANGELOG.md
index 83089ed213..b375bc3ad6 100644
--- a/services/horizon/CHANGELOG.md
+++ b/services/horizon/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this
 file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## V2.16.1
+
+* v2.16.0 rebuilt using Golang 1.18.1 with security fixes for CVE-2022-24675, CVE-2022-28327 and CVE-2022-27536.
+
 ## V2.16.0
 
 * Replace keybase with publicnode in the stellar core config. ([4291](https://github.com/stellar/go/pull/4291))

From c83df6ac76491659c175796e6731a0e7196ece3c Mon Sep 17 00:00:00 2001
From: Bartek Nowotarski <bartek@nowotarski.info>
Date: Wed, 13 Apr 2022 13:29:24 +0200
Subject: [PATCH 2/2] Pin go versions temporarily

---
 .github/workflows/go.yml      | 6 +++---
 .github/workflows/horizon.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index ce363b9d58..a7ccae9833 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        go: [1.18]
+        go: [1.18.1]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        go: [1.17, 1.18]
+        go: [1.17.9, 1.18.1]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        go: [1.17, 1.18]
+        go: [1.17.9, 1.18.1]
         pg: [9.6.5, 10]
     runs-on: ${{ matrix.os }}
     services:
diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
index a8fd3ab977..9ca2d79302 100644
--- a/.github/workflows/horizon.yml
+++ b/.github/workflows/horizon.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        go: [1.17, 1.18]
+        go: [1.17.9, 1.18.1]
         pg: [9.6.5]
         ingestion-backend: [db, captive-core, captive-core-remote-storage]
         captive-core: [18.5.0-873.rc1.d387c6a71.focal]