merge latest master to soroban-xdr-next-next (#4937)

* all: enforce simplified Golang code (#4852) * Update completed sprint on issue/pr closed (#4857) * Bump core image to latest stable release v19.10.0 * Add a simple test for asset case sorting in ascii (#4876) * services/horizon: Suppress Core timeout error (#4860) Suppress Core timeout error when ingestion state machine is in build state. * Update CHANGELOG.md for latest release (#4828) * Bump core image to latest release v19.11.0 (#4885) * services/horizon: Protect 'currentState' variable using Mutex to prevent race condition. (#4889) * services/horizon: Update default for --captive-core-use-db to true (#4877) * 4856: Update default for --captive-core-use-db to true * Update CHANGELOG.md * services/horizon: Improve error handling for when stellar-core crashes (#4893) * Parse LIMIT_TX_QUEUE_SOURCE_ACCOUNT in core config * updated changelog for 2.26.0 release notes * Pinning and updates golang and ubuntu images * services/horizon: Fix ledger endpoint url in HAL (#4928) * Goreplay middleware (#4932) * tools/goreplay-middleware: Add goreplay middleware * Fix linter errors --------- Co-authored-by: Bartek Nowotarski <[email protected]> * all: Fix improper use of errors.Wrap (#4926) * all: Fix improper use of errors.Wrap `errors.Wrap` method returns nil if the first argument passed is also nil. If `errors.Wrap` is copied from a condition like `if err != nil` to another one which also returns `errors.Wrap` but does not overwrite `err` before the returned value will always be `nil`. * Update services/horizon/internal/db2/history/claimable_balances.go Co-authored-by: George <[email protected]> --------- Co-authored-by: George <[email protected]> Co-authored-by: Tsachi Herman <[email protected]> * fix apt repo reference to focal now (#4929) * fixed go fmt on bindata * fixed merge conflict snippet * fixed manual merge commit omition --------- Co-authored-by: Alfonso Acosta <[email protected]> Co-authored-by: Paul Bellamy <[email protected]> Co-authored-by: Mehmet <[email protected]> Co-authored-by: mlo <[email protected]> Co-authored-by: urvisavla <[email protected]> Co-authored-by: stellarsaur <[email protected]> Co-authored-by: Molly Karcher <[email protected]> Co-authored-by: Bartek Nowotarski <[email protected]> Co-authored-by: George <[email protected]> Co-authored-by: Tsachi Herman <[email protected]>
stellar · Jul 3, 2023 · e8fd4ce · e8fd4ce
1 parent 8e85b8e
commit e8fd4ce
Show file tree

Hide file tree

Showing 33 changed files with 567 additions and 72 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -9,17 +9,16 @@ jobs:
   complete:
     if: always()
     needs: [check, build, test]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
       run: exit 1
 
   check:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        # lmao semvers aren't floats never 4get
-        go: ["1.19.6", "1.20.1"]
+        os: [ubuntu-22.04]
+        go: ["1.20"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -38,8 +37,8 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        go: ["1.19.6", "1.20.1"]
+        os: [ubuntu-22.04]
+        go: ["1.19", "1.20"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -56,8 +55,8 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        go: ["1.19.6", "1.20.1"]
+        os: [ubuntu-22.04]
+        go: ["1.19", "1.20"]
         pg: [9.6.5, 10]
     runs-on: ${{ matrix.os }}
     services:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   golangci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # version v3.0.2

diff --git a/.github/workflows/horizon-master.yml b/.github/workflows/horizon-master.yml
@@ -8,7 +8,7 @@ jobs:
 
   push-state-diff-image:
     name: Push stellar/ledger-state-diff:{sha,latest} to DockerHub
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/horizon-release.yml b/.github/workflows/horizon-release.yml
@@ -7,7 +7,7 @@ on:
 jobs:
 
   publish-artifacts:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Upload artifacts to GitHub release
     steps:
       - name: Run deprecation tests
@@ -22,7 +22,7 @@ jobs:
 
       - uses: ./.github/actions/setup-go
         with:
-          go-version: "1.20.1"
+          go-version: "1.20"
 
       - name: Check dependencies
         run: ./gomod.sh

diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -11,8 +11,8 @@ jobs:
     name: Integration tests
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        go: ["1.19.6", "1.20.1"]
+        os: [ubuntu-20.04, ubuntu-22.04]
+        go: ["1.19", "1.20"]
         pg: [9.6.5]
         ingestion-backend: [db, captive-core, captive-core-remote-storage]
         protocol-version: [19, 20]
@@ -36,8 +36,8 @@ jobs:
       HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
       PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.11.1-1357.e38ee728d.focal~sorobanP10
       PROTOCOL_20_CORE_DOCKER_IMG: chowbao/stellar-core:19.11.1-1357.e38ee728d.focal-sorobanP10
-      PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.5.0-1108.ca2fb0605.focal
-      PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.5.0-1108.ca2fb0605.focal
+      PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.11.0-1323.7fb6d5e88.focal
+      PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.11.0-1323.7fb6d5e88.focal
       PGHOST: localhost
       PGPORT: 5432
       PGUSER: postgres
@@ -108,9 +108,9 @@ jobs:
 
   verify-range:
     name: Test (and push) verify-range image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
-      STELLAR_CORE_VERSION: 19.10.0-1275.bff2c2b37.focal
+      STELLAR_CORE_VERSION: 19.11.0-1323.7fb6d5e88.focal
       CAPTIVE_CORE_STORAGE_PATH: /tmp
     steps:
     - uses: actions/checkout@v3

diff --git a/clients/horizonclient/CHANGELOG.md b/clients/horizonclient/CHANGELOG.md
@@ -5,6 +5,8 @@ file.  This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [v11.0.0](https://github.com/stellar/go/releases/tag/horizonclient-v11.0.0) - 2023-03-29
+
 * Type of `AccountSequence` field in `protocols/horizon.Account` was changed to `int64`.
 
 ## [v10.0.0](https://github.com/stellar/go/releases/tag/horizonclient-v10.0.0) - 2022-04-18

diff --git a/exp/services/recoverysigner/docker/Dockerfile b/exp/services/recoverysigner/docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.19 as build
+FROM golang:1.20-bullseye as build
 
 ADD . /src/recoverysigner
 WORKDIR /src/recoverysigner
 RUN go build -o /bin/recoverysigner ./exp/services/recoverysigner
 
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
 COPY --from=build /bin/recoverysigner /app/

diff --git a/exp/services/webauth/docker/Dockerfile b/exp/services/webauth/docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.19 as build
+FROM golang:1.20-bullseye as build
 
 ADD . /src/webauth
 WORKDIR /src/webauth
 RUN go build -o /bin/webauth ./exp/services/webauth
 
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates
 COPY --from=build /bin/webauth /app/

diff --git a/exp/tools/dump-ledger-state/Dockerfile b/exp/tools/dump-ledger-state/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ENV STELLAR_CORE_VERSION=19.10.0-1275.bff2c2b37.focal
+ENV STELLAR_CORE_VERSION=19.11.0-1323.7fb6d5e88.focal
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl wget gnupg apt-utils

diff --git a/go.mod b/go.mod
@@ -65,6 +65,7 @@ require (
 	cloud.google.com/go/storage v1.10.0 // indirect
 	github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f // indirect
 	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
+	github.com/buger/goreplay v1.3.2
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/structs v1.0.0 // indirect
 	github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955 // indirect
@@ -82,7 +83,7 @@ require (
 	github.com/jstemmer/go-junit-report v0.9.1 // indirect
 	github.com/klauspost/compress v1.15.0 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
+	github.com/kr/pretty v0.2.0 // indirect
 	github.com/kr/text v0.1.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -97,7 +98,6 @@ require (
 	github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 // indirect
 	github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 // indirect
 	github.com/sergi/go-diff v0.0.0-20161205080420-83532ca1c1ca // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
 	github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94 // indirect
 	github.com/spf13/jwalterweatherman v0.0.0-20141219030609-3d60171a6431 // indirect
 	github.com/stretchr/objx v0.3.0 // indirect